# flags and values that affect this script
#----------------------------------------------------------------------
-VERSION = "2.3.1b1"
+VERSION = "2.3.2b2"
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
-AUTHOR_EMAIL = "robin@alldunn.com"
+AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>"
URL = "http://wxPython.org/"
LICENCE = "wxWindows (LGPL derivative)"
LONG_DESCRIPTION = """\
# wxWindows must have been built with /MD, not /MDd
# (using FINAL=hybrid will do it.)
-WXDLLVER = '23_1' # Version part of DLL name
+WXDLLVER = '23_2' # Version part of DLL name
+#----------------------------------------------------------------------
+
+def msg(text):
+ if __name__ == "__main__":
+ print text
+
+def opj(*args):
+ path = apply(os.path.join, args)
+ return os.path.normpath(path)
+
#----------------------------------------------------------------------
# Some other globals
#----------------------------------------------------------------------
bcpp_compiling = '-c' in sys.argv and 'my_bcpp' in sys.argv # Bad heuristic
if bcpp_compiling:
- print "Compiling wxPython by Borland C/C++ Compiler"
+ msg("Compiling wxPython by Borland C/C++ Compiler")
HYBRID=0
WXBCPPLIBVER = string.replace(WXDLLVER,"_","")
# Version part of BCPP build LIBRARY name
# Check for build flags on the command line
#----------------------------------------------------------------------
-for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'CORE_ONLY',
- 'USE_SWIG', 'IN_CVS_TREE', 'FINAL', 'HYBRID', ]:
+for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
+ 'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE',
+ 'FINAL', 'HYBRID', ]:
for x in range(len(sys.argv)):
if string.find(sys.argv[x], flag) == 0:
pos = string.find(sys.argv[x], '=') + 1
BUILD_GLCANVAS = 0
BUILD_OGL = 0
BUILD_STC = 0
+ BUILD_XRC = 0
#----------------------------------------------------------------------
# Setup some platform specific stuff
FINAL = 0
includes = ['src',
- os.path.join(WXDIR, 'include'),
+ opj(WXDIR, 'include'),
]
defines = [ ('WIN32', None), # Some of these are no longer
if not FINAL or HYBRID:
defines.append( ('__WXDEBUG__', None) )
- libdirs = [os.path.join(WXDIR, 'lib'), 'build\\ilib']
+ libdirs = [opj(WXDIR, 'lib'), 'build\\ilib']
if FINAL:
wxdll = 'wx' + WXDLLVER
'advapi32', 'wsock32']
- cflags = [] #['/GX-'] # workaround for internal compiler error in MSVC 5
+ cflags = [] #['/GX-'] # workaround for internal compiler error in MSVC on some machines
lflags = None
if bcpp_compiling: # overwrite it
cflags = ['-5', '-VF', ### To supplort MSVC spurious semicolons in the class scope
### else, all semicolons at the end of all DECLARE_...CALLBACK... macros must be eliminated
- '-Hc', '-H='+WXDIR+'\src\msw\wx32.csm',
- '@'+WXDIR+'\src\msw\wxwin32.cfg'
+ '-Hc', '-H=' + opj(WXDIR, '\src\msw\wx32.csm'),
+ '@' + opj(WXDIR, '\src\msw\wxwin32.cfg')
]
#----------------------------------------------------------------------
swig_force = force
-swig_args = ['-c++', '-shadow', '-python', '-keyword', '-dnone', #'-dascii',
+swig_args = ['-c++', '-shadow', '-python', '-keyword',
+ '-dnone',
+ #'-dascii',
+ #'-docstring', '-Sbefore',
'-I./src', '-D'+WXPLAT]
swig_deps = ['src/my_typemaps.i']
#----------------------------------------------------------------------
if not GL_ONLY:
- print 'Preparing CORE...'
+ msg('Preparing CORE...')
swig_files = [ 'wx.i', 'windows.i', 'windows2.i', 'windows3.i', 'events.i',
'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
if IN_CVS_TREE: # update the licence files
mkpath('licence')
for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
- copy_file(WXDIR+'/docs/'+file, 'licence/'+file, update=1, verbose=0)
+ copy_file(opj(WXDIR, 'docs', file), opj('licence',file), update=1, verbose=0)
if os.name == 'nt':
wxpExtensions.append(ext)
+ # Extension for the help module
+ swig_sources = run_swig(['help.i'], 'src', GENDIR, PKGDIR,
+ USE_SWIG, swig_force, swig_args, swig_deps)
+ ext = Extension('helpc', swig_sources,
+ include_dirs = includes,
+ define_macros = defines,
+ library_dirs = libdirs,
+ libraries = libs,
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ )
+ wxpExtensions.append(ext)
+
+
#----------------------------------------------------------------------
# Define the GLCanvas extension module
#----------------------------------------------------------------------
+CTRB_SRC = opj(WXDIR, 'contrib/src')
+CTRB_INC = opj(WXDIR, 'contrib/include/wx')
+
if BUILD_GLCANVAS or GL_ONLY:
- print 'Preparing GLCANVAS...'
+ msg('Preparing GLCANVAS...')
location = 'contrib/glcanvas'
swig_files = ['glcanvas.i']
other_sources = []
else:
gl_libs = ['wx_gtk_gl', 'GL', 'GLU']
else:
- other_sources = [location + '/msw/myglcanvas.cpp']
+ other_sources = [opj(location, 'msw/myglcanvas.cpp')]
gl_libs = ['opengl32', 'glu32']
#----------------------------------------------------------------------
if not GL_ONLY and BUILD_OGL:
- print 'Preparing OGL...'
+ msg('Preparing OGL...')
location = 'contrib/ogl'
- OGLLOC = location + '/contrib/src/ogl'
- OGLINC = location + '/contrib/include'
+ OGLLOC = opj(location, 'contrib/src/ogl')
+ OGLINC = opj(location, 'contrib/include')
swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
'oglcanvas.i']
swig_sources = run_swig(swig_files, location, '', PKGDIR,
USE_SWIG, swig_force, swig_args)
- # make sure local copy of contrib files are up to date
if IN_CVS_TREE:
- contrib_copy_tree(WXDIR + '/contrib/include/wx/ogl', OGLINC+'/wx/ogl')
- contrib_copy_tree(WXDIR + '/contrib/src/ogl', OGLLOC)
+ # make sure local copy of contrib files are up to date
+ contrib_copy_tree(opj(CTRB_INC, 'ogl'), opj(OGLINC, 'wx/ogl'))
+ contrib_copy_tree(opj(CTRB_SRC, 'ogl'), OGLLOC)
ext = Extension('oglc', ['%s/basic.cpp' % OGLLOC,
'%s/bmpshape.cpp' % OGLLOC,
#----------------------------------------------------------------------
if not GL_ONLY and BUILD_STC:
- print 'Preparing STC...'
+ msg('Preparing STC...')
location = 'contrib/stc'
- STCLOC = location + '/contrib/src/stc'
- STCINC = location + '/contrib/include'
- STC_H = location + '/contrib/include/wx/stc'
+ STCLOC = opj(location, 'contrib/src/stc')
+ STCINC = opj(location, 'contrib/include')
+ STC_H = opj(location, 'contrib/include/wx/stc')
- # make sure local copy of contrib files are up to date
if IN_CVS_TREE:
- contrib_copy_tree(WXDIR + '/contrib/include/wx/stc', STCINC+'/wx/stc')
- contrib_copy_tree(WXDIR + '/contrib/src/stc', STCLOC)
+ # Check if gen_iface needs to be run for the wxSTC sources
+ if (newer(opj(CTRB_SRC, 'stc/stc.h.in'), opj(CTRB_INC, 'stc/stc.h' )) or
+ newer(opj(CTRB_SRC, 'stc/stc.cpp.in'), opj(CTRB_SRC, 'stc/stc.cpp')) or
+ newer(opj(CTRB_SRC, 'stc/gen_iface.py'), opj(CTRB_SRC, 'stc/stc.cpp'))):
+
+ msg('Running gen_iface.py, regenerating stc.h and stc.cpp...')
+ cwd = os.getcwd()
+ os.chdir(opj(CTRB_SRC, 'stc'))
+ import gen_iface
+ gen_iface.main([])
+ os.chdir(cwd)
+
+
+ # make sure local copy of contrib files are up to date
+ contrib_copy_tree(opj(CTRB_INC, 'stc'), opj(STCINC, 'wx/stc'))
+ contrib_copy_tree(opj(CTRB_SRC, 'stc'), STCLOC)
+
swig_files = ['stc_.i']
swig_sources = run_swig(swig_files, location, '', PKGDIR,
USE_SWIG, swig_force,
swig_args + ['-I'+STC_H, '-I'+location],
- [STC_H+'/stc.h'])
+ [opj(STC_H, 'stc.h')])
# copy a project specific py module to the main package dir
- copy_file(location+'/stc.py', PKGDIR, update=1, verbose=1)
+ copy_file(opj(location, 'stc.py'), PKGDIR, update=1, verbose=0)
# add some include dirs to the standard set
stc_includes = includes[:]
'%s/scintilla/src/CellBuffer.cxx' % STCLOC,
'%s/scintilla/src/ContractionState.cxx' % STCLOC,
'%s/scintilla/src/Document.cxx' % STCLOC,
+ '%s/scintilla/src/DocumentAccessor.cxx' % STCLOC,
'%s/scintilla/src/Editor.cxx' % STCLOC,
'%s/scintilla/src/Indicator.cxx' % STCLOC,
'%s/scintilla/src/KeyMap.cxx' % STCLOC,
'%s/scintilla/src/KeyWords.cxx' % STCLOC,
'%s/scintilla/src/LineMarker.cxx' % STCLOC,
'%s/scintilla/src/PropSet.cxx' % STCLOC,
+ '%s/scintilla/src/RESearch.cxx' % STCLOC,
'%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
'%s/scintilla/src/Style.cxx' % STCLOC,
+ '%s/scintilla/src/UniConversion.cxx' % STCLOC,
'%s/scintilla/src/ViewStyle.cxx' % STCLOC,
+ '%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
+
+ '%s/scintilla/src/LexAda.cxx' % STCLOC,
+ '%s/scintilla/src/LexAVE.cxx' % STCLOC,
+ '%s/scintilla/src/LexConf.cxx' % STCLOC,
'%s/scintilla/src/LexCPP.cxx' % STCLOC,
+ '%s/scintilla/src/LexEiffel.cxx' % STCLOC,
'%s/scintilla/src/LexHTML.cxx' % STCLOC,
+ '%s/scintilla/src/LexLisp.cxx' % STCLOC,
'%s/scintilla/src/LexLua.cxx' % STCLOC,
'%s/scintilla/src/LexOthers.cxx' % STCLOC,
+ '%s/scintilla/src/LexPascal.cxx' % STCLOC,
'%s/scintilla/src/LexPerl.cxx' % STCLOC,
'%s/scintilla/src/LexPython.cxx' % STCLOC,
+ '%s/scintilla/src/LexRuby.cxx' % STCLOC,
'%s/scintilla/src/LexSQL.cxx' % STCLOC,
'%s/scintilla/src/LexVB.cxx' % STCLOC,
- '%s/scintilla/src/DocumentAccessor.cxx' % STCLOC,
- '%s/scintilla/src/UniConversion.cxx' % STCLOC,
- '%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
- '%s/scintilla/src/PosRegExp.cxx' % STCLOC,
'%s/PlatWX.cpp' % STCLOC,
'%s/ScintillaWX.cpp' % STCLOC,
#----------------------------------------------------------------------
if not GL_ONLY and BUILD_IEWIN:
- print 'Preparing IEWIN...'
+ msg('Preparing IEWIN...')
location = 'contrib/iewin'
swig_files = ['iewin.i', ]
#----------------------------------------------------------------------
if not GL_ONLY and BUILD_XRC:
- print 'Preparing XRC...'
+ msg('Preparing XRC...')
location = 'contrib/xrc'
- XMLLOC = location + '/contrib/src/xrc'
- XMLINC = location + '/contrib/include'
+ XMLLOC = opj(location, 'contrib/src/xrc')
+ XMLINC = opj(location, 'contrib/include')
swig_files = ['xrc.i']
# make sure local copy of contrib files are up to date
if IN_CVS_TREE:
- contrib_copy_tree(WXDIR + '/contrib/include/wx/xrc', XMLINC+'/wx/xrc')
- contrib_copy_tree(WXDIR + '/contrib/src/xrc', XMLLOC)
+ contrib_copy_tree(opj(CTRB_INC, 'xrc'), opj(XMLINC, 'wx/xrc'))
+ contrib_copy_tree(opj(CTRB_SRC, 'xrc'), XMLLOC)
ext = Extension('xrcc', ['%s/expat/xmlparse/xmlparse.c' % XMLLOC,
'%s/expat/xmltok/xmlrole.c' % XMLLOC,
packages = [PKGDIR,
PKGDIR+'.lib',
PKGDIR+'.lib.editor',
+ PKGDIR+'.lib.mixins'
],
ext_package = PKGDIR,
projects / wxWidgets.git / blobdiff