X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/471e64d61eebd501933423285e84917f85cb5ed1..b8dc98c8f5c62b90219564de161a9fe1a99c5ae2:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index cdaa055bfc..0960cd8487 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -82,24 +82,16 @@ CLEANUP.append('wx/__version__.py') 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) + 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') + #---------------------------------------------------------------------- @@ -201,6 +193,8 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR, 'src/_bitmap.i', 'src/_colour.i', 'src/_dc.i', + 'src/_graphics.i', + 'src/_overlay.i', 'src/_gdiobj.i', 'src/_imaglist.i', 'src/_region.i', @@ -215,9 +209,12 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR, '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, @@ -294,6 +291,8 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR, 'src/_cshelp.i', 'src/_dragimg.i', 'src/_datectrl.i', + 'src/_hyperlink.i', + 'src/_picker.i', ], True) ext = Extension('_controls_', swig_sources, @@ -333,6 +332,8 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR, 'src/_display.i', 'src/_clipbrd.i', 'src/_stdpaths.i', + 'src/_power.i', + 'src/_about.i', ], True) ext = Extension('_misc_', swig_sources, @@ -396,8 +397,8 @@ wxpExtensions.append(ext) mediaLibs = libs[:] -if not MONOLITHIC and os.name == 'nt': - mediaLibs.append(makeLibName('media')[0]) +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, @@ -451,21 +452,90 @@ 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, 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: + 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) + + +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 #---------------------------------------------------------------------- @@ -478,10 +548,12 @@ 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() - gl_libs = libs + gl_lflags = adjustLFLAGS(gl_lflags, gl_libdirs, gl_libs) + else: gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl') @@ -493,7 +565,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, @@ -632,7 +704,8 @@ 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' % opj(location, 'wxCode/src') ] + swig_sources, @@ -650,34 +723,6 @@ 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 #---------------------------------------------------------------------- @@ -793,6 +838,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', @@ -824,6 +871,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',