X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5311274387a33f94810b13dc928a95fb86253270..d3e6a1f2db0ff2050bfe0c659224bdc99dd5af4b:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index 2140d6d359..951b307e1d 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,24 @@ 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 @@ -110,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) @@ -126,8 +156,8 @@ CLEANUP.append('licence') if os.name == 'nt': - build_locale_dir(opj(PKGDIR, 'locale')) - DATA_FILES += build_locale_list(opj(PKGDIR, 'locale')) + build_locale_dir(opj(PKGDIR, 'i18n')) + DATA_FILES += build_locale_list(opj(PKGDIR, 'i18n')) if os.name == 'nt': @@ -137,7 +167,6 @@ else: ext = Extension('_core_', ['src/helpers.cpp', - 'src/libpy.c', ] + rc_file + swig_sources, include_dirs = includes, @@ -177,9 +206,13 @@ 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, @@ -255,6 +288,9 @@ 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', ], True) ext = Extension('_controls_', swig_sources, @@ -294,6 +330,7 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR, 'src/_display.i', 'src/_clipbrd.i', 'src/_stdpaths.i', + 'src/_power.i', ], True) ext = Extension('_misc_', swig_sources, @@ -356,6 +393,22 @@ ext = Extension('_html', swig_sources, wxpExtensions.append(ext) +mediaLibs = libs[:] +if not MONOLITHIC: + 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) @@ -396,6 +449,10 @@ swig_sources = run_swig(['xrc.i'], 'src', GENDIR, PKGDIR, 'src/_xml.i', 'src/_xmlhandler.i', ]) +if not MONOLITHIC: + xrcLib = makeLibName('xrc') +else: + xrcLib = [] ext = Extension('_xrc', swig_sources, @@ -403,14 +460,62 @@ ext = Extension('_xrc', define_macros = defines, library_dirs = libdirs, - libraries = libs, + 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: + 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: + 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) + + + + + #---------------------------------------------------------------------- # Define the GLCanvas extension module #---------------------------------------------------------------------- @@ -423,10 +528,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 + ' --libs gl', 'r').read()[:-1] - gl_lflags = gl_config.split() + lflags - gl_libs = libs + 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 @@ -437,7 +545,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, @@ -512,7 +620,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, @@ -530,38 +642,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) #---------------------------------------------------------------------- @@ -622,6 +702,33 @@ if BUILD_GIZMOS: wxpExtensions.append(ext) +#---------------------------------------------------------------------- +# Define the ANIMATE extension module +#---------------------------------------------------------------------- + +if BUILD_ANIMATE: + msg('Preparing ANIMATE...') + location = 'contrib/animate' + + swig_sources = run_swig(['animate.i'], location, 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 + makeLibName('animate'), + + extra_compile_args = cflags, + extra_link_args = lflags, + ) + + wxpExtensions.append(ext) + + #---------------------------------------------------------------------- # Define the DLLWIDGET extension module @@ -700,7 +807,7 @@ else: if INSTALL_MULTIVERSION: - EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS) + 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: @@ -738,6 +845,8 @@ 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', @@ -769,6 +878,21 @@ if __name__ == "__main__": }, ) + 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',