X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f4e928794167715f19a3021d62b7c4f77611694..3216dbf5dccab8ed6dc0245b7e5c998738ef51d7:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index 43f84a5c10..4d4f531992 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python #---------------------------------------------------------------------- -import sys, os, string +import sys, os, string, glob from distutils.core import setup, Extension from distutils.file_util import copy_file from distutils.dir_util import mkpath @@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree # flags and values that affect this script #---------------------------------------------------------------------- -VERSION = "2.3.2b7" +VERSION = "2.3.3pre" DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" AUTHOR_EMAIL = "Robin Dunn " @@ -31,12 +31,16 @@ on. BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module BUILD_OGL = 1 # If true, build the contrib/ogl extension module BUILD_STC = 1 # If true, build the contrib/stc extension module -BUILD_IEWIN = 0 # Internet Explorer wrapper (experimental) 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_IEWIN = 0 # Internet Explorer wrapper (experimental) 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 @@ -65,7 +69,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 = '232' # Version part of DLL name +WXDLLVER = '233' # Version part of DLL name #---------------------------------------------------------------------- @@ -112,6 +116,7 @@ if bcpp_compiling: #---------------------------------------------------------------------- for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC', + 'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'FINAL', 'HYBRID', ]: for x in range(len(sys.argv)): @@ -137,6 +142,9 @@ if CORE_ONLY: BUILD_OGL = 0 BUILD_STC = 0 BUILD_XRC = 0 + BUILD_GIZMOS = 0 + BUILD_DLLWIDGET = 0 + #---------------------------------------------------------------------- # Setup some platform specific stuff @@ -211,12 +219,14 @@ 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 if bcpp_compiling: # overwrite it - cflags = ['-5', '-VF', ### To supplort MSVC spurious semicolons in the class scope + cflags = ['-5', '-VF', ### To support MSVC spurious semicolons in the class scope ### else, all semicolons at the end of all DECLARE_...CALLBACK... macros must be eliminated '-Hc', '-H=' + opj(WXDIR, '\src\msw\wx32.csm'), '@' + opj(WXDIR, '\src\msw\wxwin32.cfg') @@ -233,7 +243,7 @@ if os.name == 'nt': -elif os.name == 'posix' and sys.platform == "darwin1": +elif os.name == 'posix' and sys.platform[:6] == "darwin": # Flags and such for a Darwin (Max OS X) build of Python WXDIR = '..' # assumes IN_CVS_TREE @@ -316,8 +326,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' ] swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR, @@ -383,20 +392,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) @@ -553,7 +548,7 @@ if not GL_ONLY and BUILD_STC: swig_args + ['-I'+STC_H, '-I'+location], [opj(STC_H, 'stc.h')]) - # copy a project specific py module to the main package dir + # copy a contrib project specific py module to the main package dir copy_file(opj(location, 'stc.py'), PKGDIR, update=1, verbose=0) # add some include dirs to the standard set @@ -698,6 +693,7 @@ if not GL_ONLY and BUILD_XRC: '%s/xh_frame.cpp' % XMLLOC, '%s/xh_gauge.cpp' % XMLLOC, + '%s/xh_gdctl.cpp' % XMLLOC, '%s/xh_html.cpp' % XMLLOC, '%s/xh_listb.cpp' % XMLLOC, '%s/xh_listc.cpp' % XMLLOC, @@ -723,13 +719,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, @@ -774,8 +765,9 @@ if not GL_ONLY and BUILD_GIZMOS: ext = Extension('gizmosc', [ '%s/dynamicsash.cpp' % GIZMOLOC, '%s/editlbox.cpp' % GIZMOLOC, - '%s/multicell.cpp' % GIZMOLOC, + #'%s/multicell.cpp' % GIZMOLOC, '%s/splittree.cpp' % GIZMOLOC, + '%s/ledctrl.cpp' % GIZMOLOC, ] + swig_sources, include_dirs = gizmos_includes, @@ -792,6 +784,52 @@ if not GL_ONLY and BUILD_GIZMOS: +#---------------------------------------------------------------------- +# Define the DLLWIDGET extension module +#---------------------------------------------------------------------- + +if not GL_ONLY and BUILD_DLLWIDGET: + msg('Preparing DLLWIDGET...') + location = 'contrib/dllwidget' + swig_files = ['dllwidget_.i'] + + swig_sources = run_swig(swig_files, location, '', PKGDIR, + USE_SWIG, swig_force, swig_args) + + # copy a contrib project specific py module to the main package dir + copy_file(opj(location, 'dllwidget.py'), PKGDIR, update=1, verbose=0) + + ext = Extension('dllwidget_c', [ + '%s/dllwidget.cpp' % location, + ] + swig_sources, + + include_dirs = includes, + define_macros = defines, + + library_dirs = libdirs, + libraries = libs, + + extra_compile_args = cflags, + extra_link_args = lflags, + ) + + wxpExtensions.append(ext) + + +#---------------------------------------------------------------------- +# 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"]), + ] + + + #---------------------------------------------------------------------- # Do the Setup/Build/Install/Whatever @@ -811,11 +849,14 @@ if __name__ == "__main__": packages = [PKGDIR, PKGDIR+'.lib', PKGDIR+'.lib.editor', - PKGDIR+'.lib.mixins' + PKGDIR+'.lib.mixins', + PKGDIR+'.lib.PyCrust', ], ext_package = PKGDIR, ext_modules = wxpExtensions, + + ##data_files = TOOLS, ) else: @@ -832,6 +873,7 @@ if __name__ == "__main__": ext_package = PKGDIR, ext_modules = wxpExtensions, + )