#----------------------------------------------------------------------
VER_MAJOR = 2 # The first three must match wxWidgets
-VER_MINOR = 7
+VER_MINOR = 9
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_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.
# cause the two strings to be combined and output
# as the full docstring.
-UNICODE = 0 # This will pass the 'wxUSE_UNICODE' flag to SWIG and
+UNICODE = 1 # This will pass the 'wxUSE_UNICODE' flag to SWIG and
# will ensure that the right headers are found and the
# right libs are linked.
#----------------------------------------------------------------------
# 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',
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
#----------------------------------------------------------------------
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)
return [libname]
+def findLib(name, libdirs):
+ name = makeLibName(name)[0]
+ if os.name == 'posix':
+ dirs = libdirs + ['/usr/lib', '/usr/local/lib']
+ name = 'lib'+name
+ else:
+ dirs = libdirs[:]
+ for d in dirs:
+ p = os.path.join(d, name)
+ if glob.glob(p+'*') != []:
+ return True
+ return False
+
def adjustCFLAGS(cflags, defines, includes):
'''Extract the raw -I, -D, and -U flags and put them into
-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') ]
if shortVer:
# short version, just Major.Minor
ep = "wx-%d.%d" % (VER_MAJOR, VER_MINOR)
-
+
# plus release if minor is odd
if VER_MINOR % 2 == 1:
ep += ".%d" % VER_RELEASE
+ ##ep = "wx-%d.%d.%d" % (VER_MAJOR, VER_MINOR, VER_RELEASE)
+
else:
# long version, full version
ep = "wx-%d.%d.%d.%d" % (VER_MAJOR, VER_MINOR, VER_RELEASE, VER_SUBREL)
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 UNICODE:
BUILD_BASE = BUILD_BASE + '.unicode'
- ##VER_FLAGS += 'u'
if os.path.exists('DAILY_BUILD'):
-
VER_FLAGS += '.' + open('DAILY_BUILD').read().strip()
VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
projects / wxWidgets.git / blobdiff