update version number, add build_options patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
parent
807f503834
commit
f35d1a03b2
@ -38,8 +38,8 @@ import distutils.command.clean
|
||||
|
||||
VER_MAJOR = 2 # The first three must match wxWidgets
|
||||
VER_MINOR = 5
|
||||
VER_RELEASE = 3
|
||||
VER_SUBREL = 3 # wxPython release num for x.y.z release of wxWidgets
|
||||
VER_RELEASE = 4
|
||||
VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWidgets
|
||||
VER_FLAGS = "pre" # release flags, such as prerelease num, unicode, etc.
|
||||
|
||||
DESCRIPTION = "Cross platform GUI toolkit for Python"
|
||||
@ -266,6 +266,37 @@ for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'SWIG',
|
||||
sys.argv = filter(None, sys.argv)
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# build options file
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
build_options_template = """
|
||||
UNICODE=%d
|
||||
UNDEF_NDEBUG=%d
|
||||
INSTALL_MULTIVERSION=%d
|
||||
FLAVOUR="%s"
|
||||
EP_ADD_OPTS=%d
|
||||
WX_CONFIG="%s"
|
||||
WXPORT="%s"
|
||||
MONOLITHIC=%d
|
||||
FINAL=%d
|
||||
HYBRID=%d
|
||||
""" % (UNICODE, UNDEF_NDEBUG, INSTALL_MULTIVERSION, FLAVOUR, EP_ADD_OPTS,
|
||||
WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
|
||||
|
||||
try:
|
||||
from build_options import *
|
||||
except:
|
||||
build_options_file = os.path.join(os.path.dirname(__file__), "build_options.py")
|
||||
if not os.path.exists(build_options_file):
|
||||
try:
|
||||
myfile = open(build_options_file, "w")
|
||||
myfile.write(build_options_template)
|
||||
myfile.close()
|
||||
except:
|
||||
print "WARNING: Unable to create build_options.py."
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# some helper functions
|
||||
#----------------------------------------------------------------------
|
||||
@ -337,9 +368,14 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
|
||||
|
||||
if not cleaning and USE_SWIG:
|
||||
for dep in swig_deps:
|
||||
if newer(dep, py_file) or newer(dep, cpp_file):
|
||||
force = 1
|
||||
break
|
||||
# this may fail for external builds, but it's not
|
||||
# a fatal error, so keep going.
|
||||
try:
|
||||
if newer(dep, py_file) or newer(dep, cpp_file):
|
||||
force = 1
|
||||
break
|
||||
except:
|
||||
pass
|
||||
|
||||
if force or newer(i_file, py_file) or newer(i_file, cpp_file):
|
||||
## we need forward slashes here even on win32
|
||||
@ -585,8 +621,6 @@ def getExtraPath(shortVer=True, addOpts=False):
|
||||
|
||||
return ep
|
||||
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# sanity checks
|
||||
|
||||
@ -631,7 +665,7 @@ if os.name == 'nt':
|
||||
WXDIR = '..' # assumes in CVS tree
|
||||
WXPLAT = '__WXMSW__'
|
||||
GENDIR = 'msw'
|
||||
|
||||
|
||||
includes = ['include', 'src',
|
||||
opj(WXDIR, 'lib', 'vc_dll', 'msw' + libFlag()),
|
||||
opj(WXDIR, 'include'),
|
||||
@ -800,6 +834,23 @@ VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
|
||||
# SWIG defaults
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
# i files could live in the wxWidgets/wxPython/src dir, or in
|
||||
# a subdirectory of the devel package. Let's specify both
|
||||
# dirs as includes so we don't have to guess which is correct.
|
||||
|
||||
wxfilesdir = ""
|
||||
i_subdir = opj("include", "wx", "wxPython", "i_files")
|
||||
if os.name != "nt":
|
||||
wxfilesdir = opj(WXPREFIX, i_subdir)
|
||||
else:
|
||||
wxfilesdir = opj(WXPY_SRC, i_subdir)
|
||||
|
||||
i_files_includes = [ '-I' + opj(WXPY_SRC, 'src'),
|
||||
'-I' + wxfilesdir ]
|
||||
|
||||
if wxfilesdir != "":
|
||||
i_files_includes.append(wxfilesdir)
|
||||
|
||||
swig_cmd = SWIG
|
||||
swig_force = force
|
||||
swig_args = ['-c++',
|
||||
@ -810,10 +861,9 @@ swig_args = ['-c++',
|
||||
'-keyword',
|
||||
'-new_repr',
|
||||
'-modern',
|
||||
|
||||
'-I' + opj(WXPY_SRC, 'src'),
|
||||
'-D'+WXPLAT,
|
||||
]
|
||||
] + i_files_includes
|
||||
|
||||
if UNICODE:
|
||||
swig_args.append('-DwxUSE_UNICODE')
|
||||
|
||||
@ -847,7 +897,6 @@ except ImportError:
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
|
||||
renamerTemplateStart = """\
|
||||
// A bunch of %rename directives generated by BuildRenamers in config.py
|
||||
// in order to remove the wx prefix from all global scope names.
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
# Licence: wxWindows license
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
import sys
|
||||
import sys, os
|
||||
|
||||
|
||||
# The full contents of the wx.build.config module used to be located
|
||||
@ -29,6 +29,14 @@ import sys
|
||||
# config .py in the same place as setup.py, and then copy it to
|
||||
# wx/build as needed below.
|
||||
|
||||
# To fully support external builds, we need to have a build options
|
||||
# file that is created whenever a new wxPython build is performed.
|
||||
# We happen to be doing that in this script, so make sure to remove
|
||||
# the build_options.py file, so that config.py will recreate it.
|
||||
|
||||
if os.path.exists("build_options.py"):
|
||||
os.remove("build_options.py")
|
||||
|
||||
sys.setup_is_main = __name__ == "__main__" # an icky hack!
|
||||
from config import *
|
||||
|
||||
@ -38,7 +46,9 @@ from config import *
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
copy_file('config.py', 'wx/build', update=1, verbose=1)
|
||||
copy_file('build_options.py', 'wx/build', update=1, verbose=1)
|
||||
CLEANUP.append('wx/build/config.py')
|
||||
CLEANUP.append('wx/build/build_options.py')
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# Update the version file
|
||||
|
||||
Loading…
Reference in New Issue
Block a user