]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/setup.py
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
deprecated wxString::GetWriteBuf() and friends in favour of wxStringBuffer
[wxWidgets.git] / wxPython / setup.py
diff --git a/wxPython/setup.py b/wxPython/setup.py
index 50bfe0d1ee16ff561b6dedfafb1e97dbb66d1053..6413627345be67357aa72d377263aec000ee9021 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -34,8 +34,9 @@ import sys, os
 # 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.
 
 # 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.
 
-if os.path.exists("build_options.py"):
-    os.remove("build_options.py")
+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 *
 
 sys.setup_is_main =  __name__ == "__main__"  # an icky hack!
 from config import *
@@ -75,6 +76,24 @@ RELEASE_NUMBER = RELEASE_VERSION  # for compatibility
 CLEANUP.append('wx/__version__.py')
 
 
 CLEANUP.append('wx/__version__.py')
 
 
+#----------------------------------------------------------------------
+# Write the SWIG version to a header file
+#----------------------------------------------------------------------
+
+if USE_SWIG:
+    try:
+        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')
+        
+
+
 #----------------------------------------------------------------------
 # patch distutils if it can't cope with the "classifiers" or
 # "download_url" keywords 
 #----------------------------------------------------------------------
 # patch distutils if it can't cope with the "classifiers" or
 # "download_url" keywords 
@@ -120,6 +139,7 @@ swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR,
                           'src/_validator.i',
                           'src/_window.i',
                           'src/_control.i',
                           'src/_validator.i',
                           'src/_window.i',
                           'src/_control.i',
+                          'src/_swigtype.i',
                           ],
                         True)
 
                           ],
                         True)
 
@@ -169,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 +
 # 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/_colour.i',
                          'src/_dc.i',
+                         'src/_graphics.i',
+                         'src/_overlay.i',
                          'src/_gdiobj.i',
                          'src/_imaglist.i',
                          'src/_region.i',
                          'src/_gdiobj.i',
                          'src/_imaglist.i',
                          'src/_region.i',
@@ -187,9 +208,12 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                          'src/_pen.i',
                          'src/_palette.i',
                          'src/_renderer.i',
                          'src/_pen.i',
                          'src/_palette.i',
                          'src/_renderer.i',
+                         'src/_pseudodc.i',
                          ],
                         True)
                          ],
                         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,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
@@ -208,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 +
 # 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',
                          'src/_toplvl.i',
                          'src/_statusbar.i',
                          'src/_splitter.i',
@@ -242,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 +
 # 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',
                           'src/_button.i',
                           'src/_checkbox.i',
                           'src/_choice.i',
@@ -266,6 +286,10 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                           'src/_cshelp.i',
                           'src/_dragimg.i',
                           'src/_datectrl.i',
                           'src/_cshelp.i',
                           'src/_dragimg.i',
                           'src/_datectrl.i',
+                          'src/_hyperlink.i',
+                          'src/_picker.i',
+                          'src/_collpane.i',
+                          'src/_srchctrl.i',
                           ],
                         True)
 ext = Extension('_controls_', swig_sources,
                           ],
                         True)
 ext = Extension('_controls_', swig_sources,
@@ -285,9 +309,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 +
 # 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',
                           'src/_functions.i',
                           'src/_misc.i',
                           'src/_tipdlg.i',
@@ -305,6 +327,8 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
                           'src/_display.i',
                           'src/_clipbrd.i',
                           'src/_stdpaths.i',
                           'src/_display.i',
                           'src/_clipbrd.i',
                           'src/_stdpaths.i',
+                          'src/_power.i',
+                          'src/_about.i',
                           ],
                         True)
 ext = Extension('_misc_', swig_sources,
                           ],
                         True)
 ext = Extension('_misc_', swig_sources,
@@ -338,6 +362,20 @@ ext = Extension('_calendar', swig_sources,
 wxpExtensions.append(ext)
 
 
 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,
 swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 ext = Extension('_grid', swig_sources,
@@ -368,8 +406,8 @@ wxpExtensions.append(ext)
 
 
 mediaLibs = libs[:]
 
 
 mediaLibs = libs[:]
-if not MONOLITHIC and os.name == 'nt':
-    mediaLibs.append(makeLibName('media')[0])
+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)
 ext = Extension('_media', swig_sources,
 swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 ext = Extension('_media', swig_sources,
@@ -416,28 +454,98 @@ wxpExtensions.append(ext)
 
 swig_sources = run_swig(['xrc.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps +
 
 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',
                           ])
                           '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,
 
                 include_dirs =  includes + CONTRIBS_INC,
                 define_macros = defines,
 
 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 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 + 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'),
+                                     opj(WXDIR, 'include/wx/aui/tabmdi.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,
                 )
                 library_dirs = libdirs,
                 libraries = libs,
 
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 )
+
 wxpExtensions.append(ext)
 
 
 wxpExtensions.append(ext)
 
 
+
+
 #----------------------------------------------------------------------
 # Define the GLCanvas extension module
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Define the GLCanvas extension module
 #----------------------------------------------------------------------
@@ -450,10 +558,13 @@ if BUILD_GLCANVAS:
                             USE_SWIG, swig_force, swig_args, swig_deps)
 
     gl_libs = []
                             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]
     if os.name == 'posix':
         gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
-        gl_lflags = gl_config.split() + lflags
-        gl_libs = libs
+        gl_lflags = gl_config.split()
+        gl_lflags = adjustLFLAGS(gl_lflags, gl_libdirs, gl_libs)
+
+        
     else:
         gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         gl_lflags = lflags
     else:
         gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         gl_lflags = lflags
@@ -464,7 +575,7 @@ if BUILD_GLCANVAS:
                     include_dirs = includes + CONTRIBS_INC,
                     define_macros = defines,
 
                     include_dirs = includes + CONTRIBS_INC,
                     define_macros = defines,
 
-                    library_dirs = libdirs,
+                    library_dirs = gl_libdirs,
                     libraries = gl_libs,
 
                     extra_compile_args = cflags,
                     libraries = gl_libs,
 
                     extra_compile_args = cflags,
@@ -561,38 +672,6 @@ if BUILD_STC:
     wxpExtensions.append(ext)
 
 
     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)
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Define the ACTIVEX extension module (experimental)
 #----------------------------------------------------------------------
@@ -635,7 +714,8 @@ if BUILD_GIZMOS:
     location = 'contrib/gizmos'
 
     swig_sources = run_swig(['gizmos.i'], location, GENDIR, PKGDIR,
     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,
 
     ext = Extension('_gizmos',
                     [ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources,
@@ -653,34 +733,6 @@ if BUILD_GIZMOS:
     wxpExtensions.append(ext)
 
 
     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
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Define the DLLWIDGET  extension module
 #----------------------------------------------------------------------
@@ -751,6 +803,8 @@ else:
     i_files = glob.glob(opj("src/*.i"))   + \
               glob.glob(opj("src/_*.py")) + \
               glob.glob(opj("src/*.swg"))
     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))
 
     HEADERS = zip(h_files, ["/wxPython"]*len(h_files)) + \
               zip(i_files, ["/wxPython/i_files"]*len(i_files))
@@ -758,7 +812,7 @@ else:
 
 
 if INSTALL_MULTIVERSION:
 
 
 if INSTALL_MULTIVERSION:
-    EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS)
+    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:
     open("src/wx.pth", "w").write(EXTRA_PATH)
     CLEANUP.append("src/wx.pth")
 else:
@@ -796,6 +850,9 @@ if __name__ == "__main__":
                           'wx',
                           'wx.build',
                           'wx.lib',
                           'wx',
                           'wx.build',
                           'wx.lib',
+                          'wx.lib.analogclock',
+                          'wx.lib.analogclock.lib_setup',
+                          'wx.lib.art',
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib.floatcanvas',
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib.floatcanvas',
@@ -827,6 +884,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',
 
         if INSTALL_MULTIVERSION:
             setup(name             = 'wxPython-common',
wxWidgets (Impactor)