# flags and values that affect this script
#----------------------------------------------------------------------
-VERSION = "2.3.3pre"
+VERSION = "2.3.3pre3"
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>"
BUILD_STC = 1 # If true, build the contrib/stc extension module
BUILD_XRC = 1 # XML based resource system
BUILD_GIZMOS = 1 # Build a module for the gizmos contrib library
-BUILD_DLLWIDGET = 1# Build a module for that enables unknown wx widgets
- # to be loaded from a DLL to be used from Python.
+BUILD_DLLWIDGET = 1# Build a module that enables unknown wx widgets
+ # to be loaded from a DLL and to be used from Python.
BUILD_IEWIN = 0 # Internet Explorer wrapper (experimental)
# tree, otherwise will assume all needed files are
# available in the wxPython source distribution
+UNDEF_NDEBUG = 1 # Python 2.2 on Unix/Linux by default defines NDEBUG,
+ # and distutils will pick this up and use it on the
+ # compile command-line for the extensions. This could
+ # conflict with how wxWindows was built. If NDEBUG is
+ # set then wxWindows' __WXDEBUG__ setting will be turned
+ # off. If wxWindows was actually built with it turned
+ # on then you end up with mismatched class structures,
+ # and wxPython will crash.
+
WX_CONFIG = "wx-config" # Usually you shouldn't need to touch this,
# but you can set it to pass an alternate
# version of wx-config or alternate flags,
# Check for build flags on the command line
#----------------------------------------------------------------------
+# Boolean (int) flags
for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
'BUILD_GIZMOS', 'BUILD_DLLWIDGET',
- 'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE',
+ 'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE', 'UNDEF_NDEBUG'
'FINAL', 'HYBRID', ]:
for x in range(len(sys.argv)):
if string.find(sys.argv[x], flag) == 0:
vars()[flag] = eval(sys.argv[x][pos:])
sys.argv[x] = ''
-for option in ['WX_CONFIG', 'WXDLLVER', ]:
+# String options
+for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE']:
for x in range(len(sys.argv)):
if string.find(sys.argv[x], option) == 0:
pos = string.find(sys.argv[x], '=') + 1
if UNICODE:
BUILD_BASE = BUILD_BASE + '.unicode'
+ VERSION = VERSION + 'u'
#----------------------------------------------------------------------
elif bcpp_compiling and not FINAL:
cflags = cflags + ['/Od', '/v', '/y']
- lflags = lflags + ['/v', ] ## '/PDB:NONE']
+ lflags = lflags + ['/v', ]
cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1]
cflags = string.split(cflags)
+ if UNDEF_NDEBUG:
+ cflags.append('-UNDEBUG')
lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
lflags = string.split(lflags)
cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + \
os.popen('gtk-config --cflags', 'r').read()[:-1]
cflags = string.split(cflags)
+ if UNDEF_NDEBUG:
+ cflags.append('-UNDEBUG')
lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
lflags = string.split(lflags)
'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
'printfw.i', 'sizers.i', 'clip_dnd.i',
- 'filesys.i', 'streams.i', 'utils.i'
+ 'filesys.i', 'streams.i', 'utils.i', 'fonts.i'
]
swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
-
+ copy_file('src/wxc.pyd.manifest', PKGDIR, update=1, verbose=0)
if IN_CVS_TREE: # update the licence files
mkpath('licence')
other_sources = []
swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
- USE_SWIG, swig_force, swig_args)
+ USE_SWIG, swig_force, swig_args, swig_deps)
gl_libs = []
if os.name == 'posix':
'oglcanvas.i']
swig_sources = run_swig(swig_files, location, '', PKGDIR,
- USE_SWIG, swig_force, swig_args)
+ USE_SWIG, swig_force, swig_args, swig_deps)
if IN_CVS_TREE:
# make sure local copy of contrib files are up to date
swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
USE_SWIG, swig_force,
swig_args + ['-I'+STC_H, '-I'+location],
- [opj(STC_H, 'stc.h')])
+ [opj(STC_H, 'stc.h')] + swig_deps)
# copy a contrib project specific py module to the main package dir
copy_file(opj(location, 'stc.py'), PKGDIR, update=1, verbose=0)
stc_defines = defines[:]
stc_defines.append( ('__WX__', None) )
stc_defines.append( ('SCI_LEXER', None) )
+ stc_defines.append( ('LINK_LEXERS', None) )
ext = Extension('stc_c',
'%s/scintilla/src/LexAda.cxx' % STCLOC,
'%s/scintilla/src/LexAVE.cxx' % STCLOC,
+ '%s/scintilla/src/LexBaan.cxx' % STCLOC,
+ '%s/scintilla/src/LexBullant.cxx' % STCLOC,
'%s/scintilla/src/LexCPP.cxx' % STCLOC,
'%s/scintilla/src/LexConf.cxx' % STCLOC,
'%s/scintilla/src/LexCrontab.cxx' % STCLOC,
'%s/scintilla/src/LexHTML.cxx' % STCLOC,
'%s/scintilla/src/LexLisp.cxx' % STCLOC,
'%s/scintilla/src/LexLua.cxx' % STCLOC,
+ '%s/scintilla/src/LexMatlab.cxx' % STCLOC,
'%s/scintilla/src/LexOthers.cxx' % STCLOC,
'%s/scintilla/src/LexPascal.cxx' % STCLOC,
'%s/scintilla/src/LexPerl.cxx' % STCLOC,
swig_files = ['iewin.i', ]
swig_sources = run_swig(swig_files, location, '', PKGDIR,
- USE_SWIG, swig_force, swig_args)
+ USE_SWIG, swig_force, swig_args, swig_deps)
ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location,
swig_files = ['xrc.i']
swig_sources = run_swig(swig_files, location, '', PKGDIR,
- USE_SWIG, swig_force, swig_args)
+ USE_SWIG, swig_force, swig_args, swig_deps)
xmlres_includes = includes[:]
xmlres_includes.append('%s/expat/xmlparse' % XMLLOC)
swig_files = ['gizmos.i']
swig_sources = run_swig(swig_files, location, '', PKGDIR,
- USE_SWIG, swig_force, swig_args)
+ USE_SWIG, swig_force, swig_args, swig_deps)
gizmos_includes = includes[:]
gizmos_includes.append(GIZMOINC)
swig_files = ['dllwidget_.i']
swig_sources = run_swig(swig_files, location, '', PKGDIR,
- USE_SWIG, swig_force, swig_args)
+ USE_SWIG, swig_force, swig_args, swig_deps)
# copy a contrib project specific py module to the main package dir
copy_file(opj(location, 'dllwidget.py'), PKGDIR, update=1, verbose=0)
projects / wxWidgets.git / blobdiff