X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b8c7ba607a15a2ff8a04448138df9ffff7df6c5..db679b8c836e69c111cdc31e62cf92cebe4f938f:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index c10120bbda..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 @@ -254,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, @@ -527,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, @@ -637,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