X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38b97c15acf982020caf8291c2ccc0b0a36eceab..7dcea26b0bcbd845c75174e50c78a4320913a683:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index 26f58e72f1..d672a44196 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,46 @@ RELEASE_NUMBER = RELEASE_VERSION # for compatibility CLEANUP.append('wx/__version__.py') +#---------------------------------------------------------------------- +# Write the SWIG version to a header file +#---------------------------------------------------------------------- + +if USE_SWIG: + try: + # It may come on either stdout or stderr, depending on the + # version, so read both. + i, o, e = os.popen3(SWIG + ' -version', 't') + stext = o.read() + e.read() + import re + match = re.search(r'[0-9]+\.[0-9]+\.[0-9]+$', stext, re.MULTILINE) + if not match: + raise 'NotFound' + SVER = match.group(0) + 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 #---------------------------------------------------------------------- @@ -96,6 +147,7 @@ swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR, 'src/_validator.i', 'src/_window.i', 'src/_control.i', + 'src/_swigtype.i', ], True) @@ -123,7 +175,6 @@ else: ext = Extension('_core_', ['src/helpers.cpp', - 'src/libpy.c', ] + rc_file + swig_sources, include_dirs = includes, @@ -135,7 +186,7 @@ ext = Extension('_core_', ['src/helpers.cpp', extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -163,6 +214,7 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR, 'src/_icon.i', 'src/_pen.i', 'src/_palette.i', + 'src/_renderer.i', ], True) ext = Extension('_gdi_', ['src/drawlist.cpp'] + swig_sources, @@ -172,7 +224,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 +260,7 @@ ext = Extension('_windows_', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -241,6 +293,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 +303,7 @@ ext = Extension('_controls_', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -279,6 +332,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 +342,7 @@ ext = Extension('_misc_', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -307,7 +361,7 @@ ext = Extension('_calendar', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -321,7 +375,7 @@ ext = Extension('_grid', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -336,7 +390,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 +436,7 @@ ext = Extension('_wizard', swig_sources, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, - depends = depends + **depends ) wxpExtensions.append(ext) @@ -458,10 +543,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-%d.%d/wx/stc' % (VER_MAJOR, VER_MINOR)) + #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... @@ -482,7 +567,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, @@ -500,38 +589,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) #---------------------------------------------------------------------- @@ -592,6 +649,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 +711,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. @@ -647,18 +721,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') @@ -676,12 +752,23 @@ else: 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 + + + #---------------------------------------------------------------------- # Do the Setup/Build/Install/Whatever #---------------------------------------------------------------------- if __name__ == "__main__": if not PREP_ONLY: + setup(name = 'wxPython', version = VERSION, description = DESCRIPTION, @@ -716,6 +803,8 @@ if __name__ == "__main__": 'wx.tools.XRCed', ], + extra_path = EXTRA_PATH, + ext_package = PKGDIR, ext_modules = wxpExtensions, @@ -726,12 +815,40 @@ 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, }, ) + 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, + }, + ) + #---------------------------------------------------------------------- #----------------------------------------------------------------------