Version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#----------------------------------------------------------------------
|
#----------------------------------------------------------------------
|
||||||
|
|
||||||
import sys, os, glob, fnmatch
|
import sys, os, glob, fnmatch, tempfile
|
||||||
from distutils.core import setup, Extension
|
from distutils.core import setup, Extension
|
||||||
from distutils.file_util import copy_file
|
from distutils.file_util import copy_file
|
||||||
from distutils.dir_util import mkpath
|
from distutils.dir_util import mkpath
|
||||||
@@ -17,7 +17,7 @@ VER_MAJOR = 2 # The first three must match wxWindows
|
|||||||
VER_MINOR = 5
|
VER_MINOR = 5
|
||||||
VER_RELEASE = 1
|
VER_RELEASE = 1
|
||||||
VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWindows
|
VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWindows
|
||||||
VER_FLAGS = "p4" # release flags, such as prerelease num, unicode, etc.
|
VER_FLAGS = "p5" # release flags, such as prerelease num, unicode, etc.
|
||||||
|
|
||||||
DESCRIPTION = "Cross platform GUI toolkit for Python"
|
DESCRIPTION = "Cross platform GUI toolkit for Python"
|
||||||
AUTHOR = "Robin Dunn"
|
AUTHOR = "Robin Dunn"
|
||||||
@@ -272,30 +272,28 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=
|
|||||||
#i_file = opj(i_file) #'/'.join(i_file.split('\\'))
|
#i_file = opj(i_file) #'/'.join(i_file.split('\\'))
|
||||||
|
|
||||||
if BUILD_RENAMERS:
|
if BUILD_RENAMERS:
|
||||||
#info_file = "./distrib/swig_info"
|
#tempfile.tempdir = sourcePath
|
||||||
#info_dict = { 'cmd' : swig_cmd,
|
xmltemp = tempfile.mktemp('.xml')
|
||||||
# 'args' : swig_args + ['-I'+dir]
|
|
||||||
# }
|
|
||||||
#open(info_file, "w").write(str(args_dict))
|
|
||||||
|
|
||||||
# First run swig to produce the XML file, adding
|
# First run swig to produce the XML file, adding
|
||||||
# an extra -D that prevents the old rename
|
# an extra -D that prevents the old rename
|
||||||
# directives from being used
|
# directives from being used
|
||||||
cmd = [ swig_cmd ] + swig_args + \
|
cmd = [ swig_cmd ] + swig_args + \
|
||||||
[ '-DBUILDING_RENAMERS', '-xmlout', xml_file ] + \
|
[ '-DBUILDING_RENAMERS', '-xmlout', xmltemp ] + \
|
||||||
['-I'+dir, '-o', cpp_file, i_file]
|
['-I'+dir, '-o', cpp_file, i_file]
|
||||||
msg(' '.join(cmd))
|
msg(' '.join(cmd))
|
||||||
spawn(cmd)
|
spawn(cmd)
|
||||||
|
|
||||||
# Next run build_renamers to process the XML
|
# Next run build_renamers to process the XML
|
||||||
cmd = [ sys.executable, '-u',
|
cmd = [ sys.executable, '-u',
|
||||||
'./distrib/build_renamers.py', dir, basefile, xml_file]
|
'./distrib/build_renamers.py', dir, basefile, xmltemp]
|
||||||
msg(' '.join(cmd))
|
msg(' '.join(cmd))
|
||||||
spawn(cmd)
|
spawn(cmd)
|
||||||
#os.remove(info_file)
|
os.remove(xmltemp)
|
||||||
|
|
||||||
# Then run swig for real
|
# Then run swig for real
|
||||||
cmd = [ swig_cmd ] + swig_args + ['-I'+dir, '-o', cpp_file, i_file]
|
cmd = [ swig_cmd ] + swig_args + ['-I'+dir, '-o', cpp_file,
|
||||||
|
'-xmlout', xml_file, i_file]
|
||||||
msg(' '.join(cmd))
|
msg(' '.join(cmd))
|
||||||
spawn(cmd)
|
spawn(cmd)
|
||||||
|
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
# This file was generated by setup.py...
|
# This file was generated by setup.py...
|
||||||
|
|
||||||
VERSION_STRING = '2.5.1.0p4'
|
VERSION_STRING = '2.5.1.0p5'
|
||||||
MAJOR_VERSION = 2
|
MAJOR_VERSION = 2
|
||||||
MINOR_VERSION = 5
|
MINOR_VERSION = 5
|
||||||
RELEASE_VERSION = 1
|
RELEASE_VERSION = 1
|
||||||
SUBREL_VERSION = 0
|
SUBREL_VERSION = 0
|
||||||
|
|
||||||
VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION,
|
VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION,
|
||||||
SUBREL_VERSION, 'p4')
|
SUBREL_VERSION, 'p5')
|
||||||
|
|
||||||
RELEASE_NUMBER = RELEASE_VERSION # for compatibility
|
RELEASE_NUMBER = RELEASE_VERSION # for compatibility
|
||||||
|
Reference in New Issue
Block a user