X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54f9ee450905e98296e6afd1376b3d1e06a1e00f..54a4121a62a1a7bc6c003915d247e8362d27750b:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index 346f552fad..1e6cbd820c 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -11,14 +11,14 @@ # Licence: wxWindows license #---------------------------------------------------------------------- -import sys +import sys, os # The full contents of the wx.build.config module used to be located # here in setup.py. They were split into a separate module so it will # be installed with wxPython and can then be used by the build scripts -# of other extension modules that wich to be wxPython compatible. The -# split is still fairly new and hasn't been tested by building +# of other extension modules that wish to be wxPython compatible. +# The split is still fairly new and hasn't been tested by building # third-party extensions yet, so expect some things to still shift # back and forth, and also more stuff in config.py will get converted # to functions, etc. @@ -29,6 +29,15 @@ import sys # config .py in the same place as setup.py, and then copy it to # wx/build as needed below. +# To fully support external builds, we need to have a build options +# file that is created whenever a new wxPython build is performed. +# We happen to be doing that here in this script, so make sure to +# remove the build_options.py file, so that config.py will recreate it. + +for bo_name in ["build_options.py", "build_options.pyc"]: + if os.path.exists(bo_name): + os.remove(bo_name) + sys.setup_is_main = __name__ == "__main__" # an icky hack! from config import * @@ -38,7 +47,9 @@ from config import * #---------------------------------------------------------------------- copy_file('config.py', 'wx/build', update=1, verbose=1) +copy_file('build_options.py', 'wx/build', update=1, verbose=1) CLEANUP.append('wx/build/config.py') +CLEANUP.append('wx/build/build_options.py') #---------------------------------------------------------------------- # Update the version file @@ -65,6 +76,38 @@ RELEASE_NUMBER = RELEASE_VERSION # for compatibility CLEANUP.append('wx/__version__.py') +#---------------------------------------------------------------------- +# Write the SWIG version to a header file +#---------------------------------------------------------------------- + +if USE_SWIG: + try: + SVER = swig_version() + open('include/wx/wxPython/swigver.h', 'w').write('''\ +// This file was generated by setup.py + +#define wxPy_SWIG_VERSION "SWIG-%s" +''' % SVER) + msg('Using SWIG-' + SVER) + except: + msg('\nUnable to get SWIG version number\n') + + + +#---------------------------------------------------------------------- +# patch distutils if it can't cope with the "classifiers" or +# "download_url" keywords +#---------------------------------------------------------------------- + +if sys.version < '2.2.3': + from distutils.dist import DistributionMetadata + DistributionMetadata.classifiers = None + DistributionMetadata.download_url = None + depends = {} +else: + depends = {'depends' : depends} + + #---------------------------------------------------------------------- # Define the CORE extension module #---------------------------------------------------------------------- @@ -83,6 +126,7 @@ swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR, 'src/_defs.i', 'src/_event.i', 'src/_event_ex.py', + 'src/_evtloop.i', 'src/_evthandler.i', 'src/_filesys.i', 'src/_gdicmn.i', @@ -95,6 +139,7 @@ swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR, 'src/_validator.i', 'src/_window.i', 'src/_control.i', + 'src/_swigtype.i', ], True) @@ -122,7 +167,6 @@ else: ext = Extension('_core_', ['src/helpers.cpp', - 'src/libpy.c', ] + rc_file + swig_sources, include_dirs = includes, @@ -134,7 +178,7 @@ ext = Extension('_core_', ['src/helpers.cpp', extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -145,10 +189,11 @@ wxpExtensions.append(ext) # Extension for the GDI module swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps + - ['src/__gdi_rename.i', - 'src/_bitmap.i', + ['src/_bitmap.i', 'src/_colour.i', 'src/_dc.i', + 'src/_graphics.i', + 'src/_overlay.i', 'src/_gdiobj.i', 'src/_imaglist.i', 'src/_region.i', @@ -162,16 +207,20 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR, 'src/_icon.i', 'src/_pen.i', 'src/_palette.i', + 'src/_renderer.i', + 'src/_pseudodc.i', ], True) -ext = Extension('_gdi_', ['src/drawlist.cpp'] + swig_sources, +ext = Extension('_gdi_', ['src/drawlist.cpp', + 'src/pseudodc.cpp' + ] + swig_sources, include_dirs = includes, define_macros = defines, library_dirs = libdirs, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -183,9 +232,7 @@ wxpExtensions.append(ext) # Extension for the windows module swig_sources = run_swig(['windows.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps + - ['src/__windows_rename.i', - 'src/__windows_reverse.txt', - 'src/_panel.i', + ['src/_panel.i', 'src/_toplvl.i', 'src/_statusbar.i', 'src/_splitter.i', @@ -207,7 +254,7 @@ ext = Extension('_windows_', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -217,9 +264,7 @@ wxpExtensions.append(ext) # Extension for the controls module swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps + - [ 'src/__controls_rename.i', - 'src/__controls_reverse.txt', - 'src/_toolbar.i', + [ 'src/_toolbar.i', 'src/_button.i', 'src/_checkbox.i', 'src/_choice.i', @@ -240,6 +285,10 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR, 'src/_pycontrol.i', 'src/_cshelp.i', 'src/_dragimg.i', + 'src/_datectrl.i', + 'src/_hyperlink.i', + 'src/_picker.i', + 'src/_collpane.i', ], True) ext = Extension('_controls_', swig_sources, @@ -249,7 +298,7 @@ ext = Extension('_controls_', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -259,9 +308,7 @@ wxpExtensions.append(ext) # Extension for the misc module swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps + - [ 'src/__misc_rename.i', - 'src/__misc_reverse.txt', - 'src/_settings.i', + [ 'src/_settings.i', 'src/_functions.i', 'src/_misc.i', 'src/_tipdlg.i', @@ -278,6 +325,9 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR, 'src/_dnd.i', 'src/_display.i', 'src/_clipbrd.i', + 'src/_stdpaths.i', + 'src/_power.i', + 'src/_about.i', ], True) ext = Extension('_misc_', swig_sources, @@ -287,7 +337,7 @@ ext = Extension('_misc_', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -306,7 +356,21 @@ ext = Extension('_calendar', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends + ) +wxpExtensions.append(ext) + + +swig_sources = run_swig(['combo.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps) +ext = Extension('_combo', swig_sources, + include_dirs = includes, + define_macros = defines, + library_dirs = libdirs, + libraries = libs, + extra_compile_args = cflags, + extra_link_args = lflags, + **depends ) wxpExtensions.append(ext) @@ -320,7 +384,7 @@ ext = Extension('_grid', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -335,7 +399,38 @@ ext = Extension('_html', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends + ) +wxpExtensions.append(ext) + + +mediaLibs = libs[:] +if not MONOLITHIC and findLib('media', libdirs): + mediaLibs += makeLibName('media') +swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps) +ext = Extension('_media', swig_sources, + include_dirs = includes, + define_macros = defines, + library_dirs = libdirs, + libraries = mediaLibs, + extra_compile_args = cflags, + extra_link_args = lflags, + **depends + ) +wxpExtensions.append(ext) + + +swig_sources = run_swig(['webkit.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps) +ext = Extension('_webkit', swig_sources, + include_dirs = includes, + define_macros = defines, + library_dirs = libdirs, + libraries = libs, + extra_compile_args = cflags, + extra_link_args = lflags, + **depends ) wxpExtensions.append(ext) @@ -350,11 +445,105 @@ ext = Extension('_wizard', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends + ) +wxpExtensions.append(ext) + + + +swig_sources = run_swig(['xrc.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps + + [ 'src/_xrc_ex.py', + 'src/_xmlres.i', + 'src/_xmlsub.i', + 'src/_xml.i', + 'src/_xmlhandler.i', + ]) + +if not MONOLITHIC and findLib('xrc', libdirs): + xrcLib = makeLibName('xrc') +else: + xrcLib = [] +ext = Extension('_xrc', + swig_sources, + + include_dirs = includes + CONTRIBS_INC, + define_macros = defines, + + library_dirs = libdirs, + libraries = libs + xrcLib, + + extra_compile_args = cflags, + extra_link_args = lflags, + ) +wxpExtensions.append(ext) + + + +swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps) +if not MONOLITHIC and findLib('richtext', libdirs): + richLib = makeLibName('richtext') +else: + richLib = [] +ext = Extension('_richtext', swig_sources, + include_dirs = includes, + define_macros = defines, + library_dirs = libdirs, + libraries = libs + richLib, + extra_compile_args = cflags, + extra_link_args = lflags, + **depends ) wxpExtensions.append(ext) + +swig_sources = run_swig(['aui.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, + swig_args + ['-I'+opj(WXDIR, 'include/wx/aui')], + swig_deps + ['src/_aui_docstrings.i', + opj(WXDIR, 'include/wx/aui/framemanager.h'), + opj(WXDIR, 'include/wx/aui/floatpane.h'), + opj(WXDIR, 'include/wx/aui/dockart.h'), + opj(WXDIR, 'include/wx/aui/auibook.h'), + ]) +if not MONOLITHIC and findLib('aui', libdirs): + auiLib = makeLibName('aui') +else: + auiLib = [] +ext = Extension('_aui', swig_sources, + include_dirs = includes, + define_macros = defines, + library_dirs = libdirs, + libraries = libs + auiLib, + extra_compile_args = cflags, + extra_link_args = lflags, + **depends + ) +wxpExtensions.append(ext) + + +swig_sources = run_swig(['animate.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps) +ext = Extension('_animate', + swig_sources, + + include_dirs = includes + CONTRIBS_INC, + define_macros = defines, + + library_dirs = libdirs, + libraries = libs, + + extra_compile_args = cflags, + extra_link_args = lflags, + ) + +wxpExtensions.append(ext) + + + + #---------------------------------------------------------------------- # Define the GLCanvas extension module #---------------------------------------------------------------------- @@ -367,10 +556,13 @@ if BUILD_GLCANVAS: USE_SWIG, swig_force, swig_args, swig_deps) gl_libs = [] + gl_libdirs = libdirs[:] if os.name == 'posix': - gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1] - gl_lflags = gl_config.split() + lflags - gl_libs = libs + gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1] + gl_lflags = gl_config.split() + gl_lflags = adjustLFLAGS(gl_lflags, gl_libdirs, gl_libs) + + else: gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl') gl_lflags = lflags @@ -381,7 +573,7 @@ if BUILD_GLCANVAS: include_dirs = includes + CONTRIBS_INC, define_macros = defines, - library_dirs = libdirs, + library_dirs = gl_libdirs, libraries = gl_libs, extra_compile_args = cflags, @@ -432,10 +624,10 @@ if BUILD_OGL: if BUILD_STC: msg('Preparing STC...') location = 'contrib/stc' - if os.name == 'nt': - STC_H = opj(WXDIR, 'contrib', 'include/wx/stc') - else: - STC_H = opj(WXPREFIX, 'include/wx/stc') + #if os.name == 'nt': + STC_H = opj(WXDIR, 'contrib', 'include/wx/stc') + #else: + # STC_H = opj(WXPREFIX, 'include/wx-%d.%d/wx/stc' % (VER_MAJOR, VER_MINOR)) ## NOTE: need to add something like this to the stc.bkl... @@ -456,7 +648,11 @@ if BUILD_STC: swig_sources = run_swig(['stc.i'], location, GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args + ['-I'+STC_H, '-I'+location], - [opj(STC_H, 'stc.h')] + swig_deps) + [opj(STC_H, 'stc.h'), + opj(location, "_stc_utf8_methods.py"), + opj(location, "_stc_docstrings.i"), + opj(location, "_stc_gendocs.i"), + ] + swig_deps) ext = Extension('_stc', swig_sources, @@ -474,38 +670,6 @@ if BUILD_STC: wxpExtensions.append(ext) - -#---------------------------------------------------------------------- -# Define the IEWIN extension module (experimental) -#---------------------------------------------------------------------- - -if BUILD_IEWIN: - msg('Preparing IEWIN...') - location = 'contrib/iewin' - - swig_files = ['iewin.i', ] - - swig_sources = run_swig(swig_files, location, '', PKGDIR, - USE_SWIG, swig_force, swig_args, swig_deps) - - - ext = Extension('_iewin', ['%s/IEHtmlWin.cpp' % location, - '%s/wxactivex.cpp' % location, - ] + swig_sources, - - include_dirs = includes + CONTRIBS_INC, - define_macros = defines, - - library_dirs = libdirs, - libraries = libs, - - extra_compile_args = cflags, - extra_link_args = lflags, - ) - - wxpExtensions.append(ext) - - #---------------------------------------------------------------------- # Define the ACTIVEX extension module (experimental) #---------------------------------------------------------------------- @@ -539,41 +703,6 @@ if BUILD_ACTIVEX: wxpExtensions.append(ext) -#---------------------------------------------------------------------- -# Define the XRC extension module -#---------------------------------------------------------------------- - -if BUILD_XRC: - msg('Preparing XRC...') - location = 'contrib/xrc' - - swig_sources = run_swig(['xrc.i'], location, GENDIR, PKGDIR, - USE_SWIG, swig_force, swig_args, swig_deps + - [ '%s/_xrc_rename.i' % location, - '%s/_xrc_ex.py' % location, - '%s/_xmlres.i' % location, - '%s/_xmlsub.i' % location, - '%s/_xml.i' % location, - '%s/_xmlhandler.i' % location, - ]) - - ext = Extension('_xrc', - swig_sources, - - include_dirs = includes + CONTRIBS_INC, - define_macros = defines, - - library_dirs = libdirs, - libraries = libs + makeLibName('xrc'), - - extra_compile_args = cflags, - extra_link_args = lflags, - ) - - wxpExtensions.append(ext) - - - #---------------------------------------------------------------------- # Define the GIZMOS extension module #---------------------------------------------------------------------- @@ -583,12 +712,13 @@ if BUILD_GIZMOS: location = 'contrib/gizmos' swig_sources = run_swig(['gizmos.i'], location, GENDIR, PKGDIR, - USE_SWIG, swig_force, swig_args, swig_deps) + USE_SWIG, swig_force, swig_args, swig_deps + + [ '%s/_treelist.i' % location]) ext = Extension('_gizmos', - [ '%s/treelistctrl.cpp' % location ] + swig_sources, + [ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources, - include_dirs = includes + [ location ] + CONTRIBS_INC, + include_dirs = includes + [ location, opj(location, 'wxCode/include') ] + CONTRIBS_INC, define_macros = defines, library_dirs = libdirs, @@ -601,7 +731,6 @@ if BUILD_GIZMOS: wxpExtensions.append(ext) - #---------------------------------------------------------------------- # Define the DLLWIDGET extension module #---------------------------------------------------------------------- @@ -636,7 +765,7 @@ if BUILD_DLLWIDGET: - + #---------------------------------------------------------------------- # Tools, scripts data files, etc. #---------------------------------------------------------------------- @@ -646,18 +775,20 @@ if NO_SCRIPTS: else: SCRIPTS = [opj('scripts/helpviewer'), opj('scripts/img2png'), - opj('scripts/img2xpm'), opj('scripts/img2py'), - opj('scripts/xrced'), - opj('scripts/pyshell'), + opj('scripts/img2xpm'), + opj('scripts/pyalacarte'), + opj('scripts/pyalamode'), opj('scripts/pycrust'), + opj('scripts/pyshell'), opj('scripts/pywrap'), opj('scripts/pywrap'), - opj('scripts/pyalacarte'), - opj('scripts/pyalamode'), + opj('scripts/pywxrc'), + opj('scripts/xrced'), ] + DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc') DATA_FILES += find_data_files('wx/py', '*.txt', '*.ico', '*.css', '*.html') DATA_FILES += find_data_files('wx', '*.txt', '*.css', '*.html') @@ -670,9 +801,22 @@ else: i_files = glob.glob(opj("src/*.i")) + \ glob.glob(opj("src/_*.py")) + \ glob.glob(opj("src/*.swg")) + if BUILD_GLCANVAS: + i_files += glob.glob(opj("contrib/glcanvas/*.i")) + + HEADERS = zip(h_files, ["/wxPython"]*len(h_files)) + \ + zip(i_files, ["/wxPython/i_files"]*len(i_files)) + + + +if INSTALL_MULTIVERSION: + EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS, shortVer=not EP_FULL_VER) + open("src/wx.pth", "w").write(EXTRA_PATH) + CLEANUP.append("src/wx.pth") +else: + EXTRA_PATH = None + - HEADERS = zip(h_files, ["/include/wx/wxPython"]*len(h_files)) + \ - zip(i_files, ["/include/wx/wxPython/i_files"]*len(i_files)) #---------------------------------------------------------------------- # Do the Setup/Build/Install/Whatever @@ -680,6 +824,7 @@ else: if __name__ == "__main__": if not PREP_ONLY: + setup(name = 'wxPython', version = VERSION, description = DESCRIPTION, @@ -703,15 +848,21 @@ if __name__ == "__main__": 'wx', 'wx.build', 'wx.lib', + 'wx.lib.analogclock', + 'wx.lib.analogclock.lib_setup', 'wx.lib.colourchooser', 'wx.lib.editor', + 'wx.lib.floatcanvas', 'wx.lib.masked', 'wx.lib.mixins', + 'wx.lib.ogl', 'wx.py', 'wx.tools', 'wx.tools.XRCed', ], + extra_path = EXTRA_PATH, + ext_package = PKGDIR, ext_modules = wxpExtensions, @@ -722,12 +873,55 @@ if __name__ == "__main__": data_files = DATA_FILES, headers = HEADERS, - cmdclass = { 'install_data': wx_smart_install_data, + # Override some of the default distutils command classes with my own + cmdclass = { 'install' : wx_install, + 'install_data': wx_smart_install_data, 'install_headers': wx_install_headers, 'clean': wx_extra_clean, }, ) - + setup(name = 'wxaddons', + version = VERSION, + description = DESCRIPTION, + long_description = LONG_DESCRIPTION, + author = AUTHOR, + author_email = AUTHOR_EMAIL, + url = URL, + download_url = DOWNLOAD_URL, + license = LICENSE, + platforms = PLATFORMS, + classifiers = filter(None, CLASSIFIERS.split("\n")), + keywords = KEYWORDS, + + packages = ['wxaddons'] + ) + + if INSTALL_MULTIVERSION: + setup(name = 'wxPython-common', + version = VERSION, + description = DESCRIPTION, + long_description = LONG_DESCRIPTION, + author = AUTHOR, + author_email = AUTHOR_EMAIL, + url = URL, + download_url = DOWNLOAD_URL, + license = LICENSE, + platforms = PLATFORMS, + classifiers = filter(None, CLASSIFIERS.split("\n")), + keywords = KEYWORDS, + + package_dir = { '': 'wxversion' }, + py_modules = ['wxversion'], + + data_files = [('', ['src/wx.pth'])], + + options = { 'build' : { 'build_base' : BUILD_BASE }, + }, + + cmdclass = { 'install_data': wx_smart_install_data, + }, + ) + #---------------------------------------------------------------------- #----------------------------------------------------------------------