X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b9db15f1e92e3083ee36f16aa654fb8b09922c10..b4eecebd423df0c6efe86d7658cd3df818d67ed8:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index 42d59936a9..1e6cbd820c 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -189,10 +189,11 @@ wxpExtensions.append(ext) # Extension for the GDI module swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps + - ['src/__gdi_rename.i', - 'src/_bitmap.i', + ['src/_bitmap.i', 'src/_colour.i', 'src/_dc.i', + 'src/_graphics.i', + 'src/_overlay.i', 'src/_gdiobj.i', 'src/_imaglist.i', 'src/_region.i', @@ -207,9 +208,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, @@ -228,9 +232,7 @@ wxpExtensions.append(ext) # Extension for the windows module swig_sources = run_swig(['windows.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps + - ['src/__windows_rename.i', - 'src/__windows_reverse.txt', - 'src/_panel.i', + ['src/_panel.i', 'src/_toplvl.i', 'src/_statusbar.i', 'src/_splitter.i', @@ -262,9 +264,7 @@ wxpExtensions.append(ext) # Extension for the controls module swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps + - [ 'src/__controls_rename.i', - 'src/__controls_reverse.txt', - 'src/_toolbar.i', + [ 'src/_toolbar.i', 'src/_button.i', 'src/_checkbox.i', 'src/_choice.i', @@ -288,6 +288,7 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR, 'src/_datectrl.i', 'src/_hyperlink.i', 'src/_picker.i', + 'src/_collpane.i', ], True) ext = Extension('_controls_', swig_sources, @@ -307,9 +308,7 @@ wxpExtensions.append(ext) # Extension for the misc module swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps + - [ 'src/__misc_rename.i', - 'src/__misc_reverse.txt', - 'src/_settings.i', + [ 'src/_settings.i', 'src/_functions.i', 'src/_misc.i', 'src/_tipdlg.i', @@ -328,6 +327,7 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR, 'src/_clipbrd.i', 'src/_stdpaths.i', 'src/_power.i', + 'src/_about.i', ], True) ext = Extension('_misc_', swig_sources, @@ -361,6 +361,20 @@ ext = Extension('_calendar', swig_sources, wxpExtensions.append(ext) +swig_sources = run_swig(['combo.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps) +ext = Extension('_combo', 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) + + swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps) ext = Extension('_grid', swig_sources, @@ -391,7 +405,7 @@ wxpExtensions.append(ext) mediaLibs = libs[:] -if not MONOLITHIC: +if not MONOLITHIC and findLib('media', libdirs): mediaLibs += makeLibName('media') swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps) @@ -439,13 +453,17 @@ wxpExtensions.append(ext) swig_sources = run_swig(['xrc.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps + - [ 'src/_xrc_rename.i', - 'src/_xrc_ex.py', + [ 'src/_xrc_ex.py', 'src/_xmlres.i', 'src/_xmlsub.i', 'src/_xml.i', 'src/_xmlhandler.i', ]) + +if not MONOLITHIC and findLib('xrc', libdirs): + xrcLib = makeLibName('xrc') +else: + xrcLib = [] ext = Extension('_xrc', swig_sources, @@ -453,7 +471,7 @@ ext = Extension('_xrc', define_macros = defines, library_dirs = libdirs, - libraries = libs + makeLibName('xrc'), + libraries = libs + xrcLib, extra_compile_args = cflags, extra_link_args = lflags, @@ -464,11 +482,15 @@ wxpExtensions.append(ext) swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps) +if not MONOLITHIC and findLib('richtext', libdirs): + richLib = makeLibName('richtext') +else: + richLib = [] ext = Extension('_richtext', swig_sources, include_dirs = includes, define_macros = defines, library_dirs = libdirs, - libraries = libs + makeLibName('richtext'), + libraries = libs + richLib, extra_compile_args = cflags, extra_link_args = lflags, **depends @@ -477,6 +499,49 @@ 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 and findLib('aui', libdirs): + 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) + + #---------------------------------------------------------------------- @@ -491,10 +556,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') @@ -506,7 +573,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, @@ -645,7 +712,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, @@ -663,34 +731,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 #---------------------------------------------------------------------- @@ -761,6 +801,8 @@ else: i_files = glob.glob(opj("src/*.i")) + \ glob.glob(opj("src/_*.py")) + \ glob.glob(opj("src/*.swg")) + if BUILD_GLCANVAS: + i_files += glob.glob(opj("contrib/glcanvas/*.i")) HEADERS = zip(h_files, ["/wxPython"]*len(h_files)) + \ zip(i_files, ["/wxPython/i_files"]*len(i_files)) @@ -839,6 +881,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',