X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d48c1c640e96d350cf914bf91bd1264026048255..db679b8c836e69c111cdc31e62cf92cebe4f938f:/wxPython/setup.py?ds=sidebyside diff --git a/wxPython/setup.py b/wxPython/setup.py index f8aabe26d7..4c231fa4e2 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -11,7 +11,7 @@ # Licence: wxWindows license #---------------------------------------------------------------------- -import sys +import sys, os # The full contents of the wx.build.config module used to be located @@ -29,6 +29,14 @@ 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 in this script, so make sure to remove +# the build_options.py file, so that config.py will recreate it. + +if os.path.exists("build_options.py"): + os.remove("build_options.py") + sys.setup_is_main = __name__ == "__main__" # an icky hack! from config import * @@ -38,7 +46,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 +75,20 @@ RELEASE_NUMBER = RELEASE_VERSION # for compatibility CLEANUP.append('wx/__version__.py') +#---------------------------------------------------------------------- +# 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 #---------------------------------------------------------------------- @@ -123,7 +147,6 @@ else: ext = Extension('_core_', ['src/helpers.cpp', - 'src/libpy.c', ] + rc_file + swig_sources, include_dirs = includes, @@ -135,7 +158,7 @@ ext = Extension('_core_', ['src/helpers.cpp', extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -172,7 +195,7 @@ ext = Extension('_gdi_', ['src/drawlist.cpp'] + swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -208,7 +231,7 @@ ext = Extension('_windows_', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -241,6 +264,7 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR, 'src/_pycontrol.i', 'src/_cshelp.i', 'src/_dragimg.i', + 'src/_datectrl.i', ], True) ext = Extension('_controls_', swig_sources, @@ -250,7 +274,7 @@ ext = Extension('_controls_', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -279,6 +303,7 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR, 'src/_dnd.i', 'src/_display.i', 'src/_clipbrd.i', + 'src/_stdpaths.i', ], True) ext = Extension('_misc_', swig_sources, @@ -288,7 +313,7 @@ ext = Extension('_misc_', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -307,7 +332,7 @@ ext = Extension('_calendar', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -321,7 +346,7 @@ ext = Extension('_grid', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -336,7 +361,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 os.name == 'nt': + mediaLibs.append(makeLibName('media')[0]) +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) @@ -351,7 +407,7 @@ ext = Extension('_wizard', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -482,7 +538,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, @@ -592,6 +652,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 @@ -627,16 +714,6 @@ if BUILD_DLLWIDGET: -#---------------------------------------------------------------------- -# 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 - #---------------------------------------------------------------------- # Tools, scripts data files, etc. @@ -655,10 +732,9 @@ else: opj('scripts/pyshell'), opj('scripts/pywrap'), opj('scripts/pywrap'), + opj('scripts/pywxrc'), opj('scripts/xrced'), ] - if INSTALL_WXRC: - SCRIPTS += [opj('scripts/wxrc')] @@ -681,7 +757,7 @@ else: if INSTALL_MULTIVERSION: - EXTRA_PATH = getExtraPath() + EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS) open("src/wx.pth", "w").write(EXTRA_PATH) CLEANUP.append("src/wx.pth") else: