VER_MAJOR = 2 # The first three must match wxWidgets
VER_MINOR = 7
-VER_RELEASE = 0
-VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS = "pre" # release flags, such as prerelease or RC num, etc.
+VER_RELEASE = 1
+VER_SUBREL = 3 # wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS = "" # release flags, such as prerelease or RC num, etc.
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
BUILD_OGL = 0 # If true, build the contrib/ogl extension module
BUILD_STC = 1 # If true, build the contrib/stc extension module
BUILD_GIZMOS = 1 # Build a module for the gizmos contrib library
-BUILD_ANIMATE = 1 # Build a module for the animate contrib library
BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
# to be loaded from a DLL and to be used from Python.
SWIG = "swig" # The swig executable to use.
-BUILD_RENAMERS = 1 # Should we build the renamer modules too?
+BUILD_RENAMERS = 0 # Should we build the renamer modules too?
FULL_DOCS = 0 # Some docstrings are split into a basic docstring and a
# details string. Setting this flag to 1 will
# Some MSW build settings
-MONOLITHIC = 1 # The core wxWidgets lib can be built as either a
+MONOLITHIC = 0 # The core wxWidgets lib can be built as either a
# single monolithic DLL or as a collection of DLLs.
# This flag controls which set of libs will be used
# on Windows. (For other platforms it is automatic
#----------------------------------------------------------------------
# Boolean (int) flags
-for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
+for flag in [ 'BUILD_ACTIVEX', 'BUILD_DLLWIDGET',
'BUILD_GIZMOS', 'BUILD_GLCANVAS',
'BUILD_OGL', 'BUILD_STC',
'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
# String options
for option in ['WX_CONFIG', 'SYS_WX_CONFIG', 'WXDLLVER', 'BUILD_BASE',
- 'WXPORT', 'SWIG', 'CONTRIBS_INC', 'WXPY_SRC', 'FLAVOUR',
+ 'WXPORT', 'SWIG', 'CONTRIBS_INC', 'WXPY_SRC', 'FLAVOUR',
+ 'VER_FLAGS',
]:
for x in range(len(sys.argv)):
if sys.argv[x].find(option) == 0:
sys.argv = filter(None, sys.argv)
-#----------------------------------------------------------------------
-# build options file
-#----------------------------------------------------------------------
-
-if SYS_WX_CONFIG is None:
- SYS_WX_CONFIG = WX_CONFIG
-
-build_options_template = """
-UNICODE=%d
-UNDEF_NDEBUG=%d
-INSTALL_MULTIVERSION=%d
-FLAVOUR="%s"
-EP_ADD_OPTS=%d
-EP_FULL_VER=%d
-WX_CONFIG="%s"
-WXPORT="%s"
-MONOLITHIC=%d
-FINAL=%d
-HYBRID=%d
-""" % (UNICODE, UNDEF_NDEBUG, INSTALL_MULTIVERSION, FLAVOUR, EP_ADD_OPTS,
- EP_FULL_VER, SYS_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
#----------------------------------------------------------------------
if USE_SWIG and not os.path.exists(os.path.join(dir, gendir)):
os.mkdir(os.path.join(dir, gendir))
- if USE_SWIG and not os.path.exists(os.path.join("docs", "xml-raw")):
- if not os.path.exists("docs"):
- os.mkdir("docs")
- os.mkdir(os.path.join("docs", "xml-raw"))
-
sources = []
if add_under: pre = '_'
i_file = os.path.join(dir, file)
py_file = os.path.join(dir, gendir, pre+basefile+'.py')
cpp_file = os.path.join(dir, gendir, pre+basefile+'_wrap.cpp')
- xml_file = os.path.join("docs", "xml-raw", basefile+pre+'_swig.xml')
if add_under:
interface = ['-interface', '_'+basefile+'_']
# Then run swig for real
cmd = [ swig_cmd ] + swig_args + interface + \
- ['-I'+dir, '-o', cpp_file, '-xmlout', xml_file, i_file]
+ ['-I'+dir, '-o', cpp_file, i_file]
msg(' '.join(cmd))
spawn(cmd)
moFiles = glob.glob(opj(WXDIR, 'locale', '*.mo'))
for src in moFiles:
lang = os.path.splitext(os.path.basename(src))[0]
+ #dest = opj(destdir, lang)
dest = opj(destdir, lang, 'LC_MESSAGES')
mkpath(dest, verbose=verbose)
copy_file(src, opj(dest, 'wxstd.mo'), update=1, verbose=verbose)
-def adjustLFLAGS(lfags, libdirs, libs):
+def adjustLFLAGS(lflags, libdirs, libs):
'''Extract the -L and -l flags and put them in libdirs and libs as needed'''
newLFLAGS = []
for flag in lflags:
else:
newLFLAGS.append(flag)
- return newLFLAGS
+ # remove any flags for universal binaries, we'll get those from
+ # distutils instead
+ return [flag for flag in newLFLAGS
+ if flag not in ['-isysroot', '-arch', 'ppc', 'i386'] and
+ not flag.startswith('/Developer') ]
BUILD_GIZMOS = 0
BUILD_DLLWIDGET = 0
BUILD_ACTIVEX = 0
- BUILD_ANIMATE = 0
if debug:
FINAL = 0
makeLibName('core')[0],
makeLibName('adv')[0],
makeLibName('html')[0],
- makeLibName('xrc')[0],
]
libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
cflags.append('-O3')
lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
+ MONOLITHIC = (lflags.find("_xrc") == -1)
lflags = lflags.split()
WXBASENAME = os.popen(WX_CONFIG + ' --basename').read()[:-1]
raise 'Sorry, platform not supported...'
+#----------------------------------------------------------------------
+# build options file
+#----------------------------------------------------------------------
+
+if SYS_WX_CONFIG is None:
+ SYS_WX_CONFIG = WX_CONFIG
+
+build_options_template = """
+UNICODE=%d
+UNDEF_NDEBUG=%d
+INSTALL_MULTIVERSION=%d
+FLAVOUR="%s"
+EP_ADD_OPTS=%d
+EP_FULL_VER=%d
+WX_CONFIG="%s"
+WXPORT="%s"
+MONOLITHIC=%d
+FINAL=%d
+HYBRID=%d
+""" % (UNICODE, UNDEF_NDEBUG, INSTALL_MULTIVERSION, FLAVOUR, EP_ADD_OPTS,
+ EP_FULL_VER, SYS_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."
+
+
#----------------------------------------------------------------------
# post platform setup checks and tweaks, create the full version string
#----------------------------------------------------------------------
if os.path.exists('DAILY_BUILD'):
- VER_FLAGS += '.' + open('DAILY_BUILD').read().strip()
+ VER_FLAGS += '-' + open('DAILY_BUILD').read().strip()
VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
VER_SUBREL, VER_FLAGS)
projects / wxWidgets.git / blobdiff