X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c5ae2d2a6f716e8a89b27579026b9d085f84191..9f4de6b2cf06f53a98b28f53640f3b9ec8cf4182:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index f224408ece..1714cc46a4 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree # flags and values that affect this script #---------------------------------------------------------------------- -VERSION = "2.3.3rc" +VERSION = "2.3.3pre3" DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" AUTHOR_EMAIL = "Robin Dunn " @@ -33,7 +33,8 @@ BUILD_OGL = 1 # If true, build the contrib/ogl extension module 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 the gizmos contrib library +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) @@ -46,15 +47,30 @@ GL_ONLY = 0 # Only used when making the -gl RPM. See the "b" script USE_SWIG = 0 # Should we actually execute SWIG, or just use the # files already in the distribution? +UNICODE = 0 # This will pass the 'wxUSE_UNICODE' flag to SWIG and + # will ensure that the right headers are found and the + # right libs are linked. + IN_CVS_TREE = 0 # Set to true if building in a full wxWindows CVS # 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, # eg. as required by the .deb in-tree build. +BUILD_BASE = "build" + # Some MSW build settings FINAL = 1 # Mirrors use of same flag in wx makefiles, @@ -68,7 +84,7 @@ HYBRID = 0 # If set and not debug or FINAL, then build a # wxWindows must have been built with /MD, not /MDd # (using FINAL=hybrid will do it.) -WXDLLVER = '233' # Version part of DLL name +WXDLLVER = '233' # Version part of wxWindows DLL name #---------------------------------------------------------------------- @@ -77,17 +93,22 @@ def msg(text): if __name__ == "__main__": print text + def opj(*args): path = apply(os.path.join, args) return os.path.normpath(path) + def libFlag(): if FINAL: - return '' + rv = '' elif HYBRID: - return 'h' + rv = 'h' else: - return 'd' + rv = 'd' + if UNICODE: + rv = 'u' + rv + return rv #---------------------------------------------------------------------- @@ -114,9 +135,10 @@ if bcpp_compiling: # 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', + '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: @@ -125,7 +147,8 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC', 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 @@ -136,6 +159,10 @@ for option in ['WX_CONFIG', 'WXDLLVER', ]: sys.argv = filter(None, sys.argv) + +#---------------------------------------------------------------------- +# sanity checks + if CORE_ONLY: BUILD_GLCANVAS = 0 BUILD_OGL = 0 @@ -145,15 +172,29 @@ if CORE_ONLY: BUILD_DLLWIDGET = 0 +if UNICODE and os.name != 'nt': + print "UNICODE is currently only supported on Win32" + sys.exit() + + +if UNICODE: + BUILD_BASE = BUILD_BASE + '.unicode' + VERSION = VERSION + 'u' + + #---------------------------------------------------------------------- # Setup some platform specific stuff #---------------------------------------------------------------------- if os.name == 'nt': # Set compile flags and such for MSVC. These values are derived - # from the wxWindows makefiles for MSVC, others will probably - # vary... - WXDIR = os.environ['WXWIN'] + # from the wxWindows makefiles for MSVC, other compilers settings + # will probably vary... + if os.environ.has_key('WXWIN'): + WXDIR = os.environ['WXWIN'] + else: + msg("WARNING: WXWIN not set in environment.") + WXDIR = '..' # assumes in CVS tree WXPLAT = '__WXMSW__' GENDIR = 'msw' @@ -218,7 +259,9 @@ if os.name == 'nt': 'advapi32', 'wsock32'] - cflags = [] #['/GX-'] # workaround for internal compiler error in MSVC on some machines + cflags = [ + # '/GX-' # workaround for internal compiler error in MSVC on some machines + ] lflags = None @@ -236,7 +279,7 @@ if os.name == 'nt': elif bcpp_compiling and not FINAL: cflags = cflags + ['/Od', '/v', '/y'] - lflags = lflags + ['/v', ] ## '/PDB:NONE'] + lflags = lflags + ['/v', ] @@ -257,6 +300,8 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin": 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) @@ -281,6 +326,8 @@ elif os.name == 'posix': 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) @@ -310,6 +357,9 @@ swig_args = ['-c++', '-shadow', '-python', '-keyword', #'-docstring', '-Sbefore', '-I./src', '-D'+WXPLAT, ] +if UNICODE: + swig_args.append('-DwxUSE_UNICODE') + swig_deps = ['src/my_typemaps.i'] @@ -323,8 +373,7 @@ if not GL_ONLY: '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', - ##'grid.i', 'html.i', 'htmlhelp.i', 'calendar.i', 'utils.i', + 'filesys.i', 'streams.i', 'utils.i', 'fonts.i' ] swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR, @@ -332,7 +381,7 @@ if not GL_ONLY: 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') @@ -390,20 +439,6 @@ if not GL_ONLY: wxpExtensions.append(ext) - # Extension for the utils module - swig_sources = run_swig(['utils.i'], 'src', GENDIR, PKGDIR, - USE_SWIG, swig_force, swig_args, swig_deps) - ext = Extension('utilsc', swig_sources, - include_dirs = includes, - define_macros = defines, - library_dirs = libdirs, - libraries = libs, - extra_compile_args = cflags, - extra_link_args = lflags, - ) - wxpExtensions.append(ext) - - # Extension for the calendar module swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps) @@ -446,7 +481,7 @@ if BUILD_GLCANVAS or GL_ONLY: 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': @@ -488,7 +523,7 @@ if not GL_ONLY and BUILD_OGL: '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 @@ -558,7 +593,7 @@ if not GL_ONLY and BUILD_STC: 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) @@ -573,6 +608,7 @@ if not GL_ONLY and BUILD_STC: stc_defines = defines[:] stc_defines.append( ('__WX__', None) ) stc_defines.append( ('SCI_LEXER', None) ) + stc_defines.append( ('LINK_LEXERS', None) ) ext = Extension('stc_c', @@ -598,6 +634,8 @@ if not GL_ONLY and BUILD_STC: '%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, @@ -605,6 +643,7 @@ if not GL_ONLY and BUILD_STC: '%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, @@ -643,7 +682,7 @@ if not GL_ONLY and BUILD_IEWIN: 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, @@ -675,7 +714,7 @@ if not GL_ONLY and BUILD_XRC: 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) @@ -731,13 +770,8 @@ if not GL_ONLY and BUILD_XRC: '%s/xh_unkwn.cpp' % XMLLOC, '%s/xml.cpp' % XMLLOC, - '%s/xmlbin.cpp' % XMLLOC, - '%s/xmlbinz.cpp' % XMLLOC, - '%s/xmlexpat.cpp' % XMLLOC, - '%s/xmlres.cpp' % XMLLOC, '%s/xmlrsall.cpp' % XMLLOC, - '%s/xmlwrite.cpp' % XMLLOC, ] + swig_sources, @@ -768,7 +802,7 @@ if not GL_ONLY and BUILD_GIZMOS: 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) @@ -811,7 +845,7 @@ if not GL_ONLY and BUILD_DLLWIDGET: 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) @@ -873,6 +907,8 @@ if __name__ == "__main__": ext_package = PKGDIR, ext_modules = wxpExtensions, + options = { 'build' : { 'build_base' : BUILD_BASE }} + ##data_files = TOOLS, )