X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cdaed0ba00e01b31fe236b270b8a209f3ac8921..8dcfd2f963134802bc1585e1a9f7737238d9e893:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index 1b820fc713..2c65f03fb8 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -13,12 +13,12 @@ from my_distutils import run_swig, contrib_copy_tree # flags and values that affect this script #---------------------------------------------------------------------- -VERSION = "2.3.3pre3" +VERSION = "2.3.3pre6" DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" AUTHOR_EMAIL = "Robin Dunn " URL = "http://wxPython.org/" -LICENCE = "wxWindows (LGPL derivative)" +LICENSE = "wxWindows (LGPL derivative)" LONG_DESCRIPTION = """\ wxPython is a GUI toolkit for Python that is a wrapper around the wxWindows C++ GUI library. wxPython provides a large variety of @@ -33,14 +33,14 @@ 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 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) + # Internet Explorer wrapper (experimental) +BUILD_IEWIN = (os.name == 'nt') CORE_ONLY = 0 # if true, don't build any of the above - GL_ONLY = 0 # Only used when making the -gl RPM. See the "b" script # for the ugly details @@ -55,6 +55,18 @@ 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. + +NO_SCRIPTS = 0 # Don't install the tool scripts + + 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, @@ -126,9 +138,11 @@ 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', + 'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', 'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE', + 'UNDEF_NDEBUG', 'NO_SCRIPTS', 'FINAL', 'HYBRID', ]: for x in range(len(sys.argv)): if string.find(sys.argv[x], flag) == 0: @@ -137,7 +151,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 @@ -159,6 +174,7 @@ if CORE_ONLY: BUILD_XRC = 0 BUILD_GIZMOS = 0 BUILD_DLLWIDGET = 0 + BUILD_IEWIN = 0 if UNICODE and os.name != 'nt': @@ -168,6 +184,7 @@ if UNICODE and os.name != 'nt': if UNICODE: BUILD_BASE = BUILD_BASE + '.unicode' + VERSION = VERSION + 'u' #---------------------------------------------------------------------- @@ -288,10 +305,13 @@ 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) + NO_SCRIPTS = 1 elif os.name == 'posix': @@ -312,6 +332,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) @@ -325,8 +347,8 @@ else: # Check if the version file needs updated #---------------------------------------------------------------------- -if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'): - open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION) +#if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'): +open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION) @@ -367,7 +389,7 @@ if not GL_ONLY: 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 + if IN_CVS_TREE: # update the license files mkpath('licence') for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']: copy_file(opj(WXDIR, 'docs', file), opj('licence',file), update=1, verbose=0) @@ -670,6 +692,7 @@ if not GL_ONLY and BUILD_IEWIN: ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location, + '%s/wxactivex.cpp' % location, ] + swig_sources, include_dirs = includes, @@ -855,15 +878,25 @@ if not GL_ONLY and BUILD_DLLWIDGET: # Tools and scripts #---------------------------------------------------------------------- -TOOLS = [("wxPython/tools", glob.glob("tools/*.py")), - ("wxPython/tools/XRCed", glob.glob("tools/XRCed/*.py") + - glob.glob("tools/XRCed/*.xrc") + - ["tools/XRCed/CHANGES", - "tools/XRCed/TODO", - "tools/XRCed/README"]), - ] +## TOOLS = [("wxPython/tools", glob.glob("tools/*.py")), +## ("wxPython/tools/XRCed", glob.glob("tools/XRCed/*.py") + +## glob.glob("tools/XRCed/*.xrc") + +## ["tools/XRCed/CHANGES", +## "tools/XRCed/TODO", +## "tools/XRCed/README"]), +## ] +if NO_SCRIPTS: + SCRIPTS = None +else: + SCRIPTS = [opj('scripts/img2png'), + opj('scripts/img2xpm'), + opj('scripts/img2py'), + opj('scripts/xrced'), + opj('scripts/pyshell'), + opj('scripts/pycrust'), + ] #---------------------------------------------------------------------- @@ -879,21 +912,24 @@ if __name__ == "__main__": author = AUTHOR, author_email = AUTHOR_EMAIL, url = URL, - licence = LICENCE, + license = LICENSE, packages = [PKGDIR, PKGDIR+'.lib', PKGDIR+'.lib.editor', PKGDIR+'.lib.mixins', PKGDIR+'.lib.PyCrust', + PKGDIR+'.tools', + PKGDIR+'.tools.XRCed', ], ext_package = PKGDIR, ext_modules = wxpExtensions, - options = { 'build' : { 'build_base' : BUILD_BASE }} + options = { 'build' : { 'build_base' : BUILD_BASE }}, ##data_files = TOOLS, + scripts = SCRIPTS, ) else: @@ -904,7 +940,7 @@ if __name__ == "__main__": author = AUTHOR, author_email = AUTHOR_EMAIL, url = URL, - licence = LICENCE, + license = LICENSE, py_modules = [ "wxPython.glcanvas" ],