]> 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
docstrings
[wxWidgets.git] / wxPython / setup.py
diff --git a/wxPython/setup.py b/wxPython/setup.py
index 169a88cc4a32cf0f0e182942fd68f2f41f2b09f7..2140d6d359bdf95a085a1303aeeeb41c2a7ce4ce 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -65,6 +65,20 @@ RELEASE_NUMBER = RELEASE_VERSION  # for compatibility
 CLEANUP.append('wx/__version__.py')
 
 
 CLEANUP.append('wx/__version__.py')
 
 
+#----------------------------------------------------------------------
+# 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
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Define the CORE extension module
 #----------------------------------------------------------------------
@@ -78,11 +92,12 @@ swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR,
                           'src/_constraints.i',
                           'src/_core_api.i',
                           'src/_core_ex.py',
                           'src/_constraints.i',
                           'src/_core_api.i',
                           'src/_core_ex.py',
-                          'src/_core_rename.i',
-                          'src/_core_reverse.txt',
+                          'src/__core_rename.i',
+                          'src/__core_reverse.txt',
                           'src/_defs.i',
                           'src/_event.i',
                           'src/_event_ex.py',
                           'src/_defs.i',
                           'src/_event.i',
                           'src/_event_ex.py',
+                          'src/_evtloop.i',
                           'src/_evthandler.i',
                           'src/_filesys.i',
                           'src/_gdicmn.i',
                           'src/_evthandler.i',
                           'src/_filesys.i',
                           'src/_gdicmn.i',
@@ -95,7 +110,8 @@ 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',
-                          ])
+                          ],
+                        True)
 
 copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
 CLEANUP.append(opj(PKGDIR, '__init__.py'))
 
 copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
 CLEANUP.append(opj(PKGDIR, '__init__.py'))
@@ -120,9 +136,9 @@ else:
     rc_file = []
 
 
     rc_file = []
 
 
-ext = Extension('_core', ['src/helpers.cpp',
-                          'src/libpy.c',
-                        ] + rc_file + swig_sources,
+ext = Extension('_core_', ['src/helpers.cpp',
+                           'src/libpy.c',
+                           ] + rc_file + swig_sources,
 
                 include_dirs = includes,
                 define_macros = defines,
 
                 include_dirs = includes,
                 define_macros = defines,
@@ -133,7 +149,7 @@ ext = Extension('_core', ['src/helpers.cpp',
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
 
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
 
-                depends = depends
+                **depends
                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 
@@ -144,7 +160,7 @@ 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/__gdi_rename.i',
                          'src/_bitmap.i',
                          'src/_colour.i',
                          'src/_dc.i',
                          'src/_bitmap.i',
                          'src/_colour.i',
                          'src/_dc.i',
@@ -161,15 +177,16 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                          'src/_icon.i',
                          'src/_pen.i',
                          'src/_palette.i',
                          'src/_icon.i',
                          'src/_pen.i',
                          'src/_palette.i',
-                         ])
-ext = Extension('_gdi', ['src/drawlist.cpp'] + swig_sources,
+                         ],
+                        True)
+ext = Extension('_gdi_', ['src/drawlist.cpp'] + swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
-                depends = depends
+                **depends
                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 
@@ -181,8 +198,8 @@ 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/__windows_rename.i',
+                         'src/__windows_reverse.txt',
                          'src/_panel.i',
                          'src/_toplvl.i',
                          'src/_statusbar.i',
                          'src/_panel.i',
                          'src/_toplvl.i',
                          'src/_statusbar.i',
@@ -196,15 +213,16 @@ swig_sources = run_swig(['windows.i'], 'src', GENDIR, PKGDIR,
                          'src/_mdi.i',
                          'src/_pywindows.i',
                          'src/_printfw.i',
                          'src/_mdi.i',
                          'src/_pywindows.i',
                          'src/_printfw.i',
-                         ])
-ext = Extension('_windows', swig_sources,
+                         ],
+                        True)
+ext = Extension('_windows_', swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
-                depends = depends
+                **depends
                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 
@@ -214,8 +232,8 @@ 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/__controls_rename.i',
+                          'src/__controls_reverse.txt',
                           'src/_toolbar.i',
                           'src/_button.i',
                           'src/_checkbox.i',
                           'src/_toolbar.i',
                           'src/_button.i',
                           'src/_checkbox.i',
@@ -237,15 +255,16 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                           'src/_pycontrol.i',
                           'src/_cshelp.i',
                           'src/_dragimg.i',
                           'src/_pycontrol.i',
                           'src/_cshelp.i',
                           'src/_dragimg.i',
-                          ])
-ext = Extension('_controls', swig_sources,
+                          ],
+                        True)
+ext = Extension('_controls_', swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
-                depends = depends
+                **depends
                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 
@@ -255,7 +274,9 @@ 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/_settings.i',
+                        [ 'src/__misc_rename.i',
+                          'src/__misc_reverse.txt',
+                          'src/_settings.i',
                           'src/_functions.i',
                           'src/_misc.i',
                           'src/_tipdlg.i',
                           'src/_functions.i',
                           'src/_misc.i',
                           'src/_tipdlg.i',
@@ -272,15 +293,17 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
                           'src/_dnd.i',
                           'src/_display.i',
                           'src/_clipbrd.i',
                           'src/_dnd.i',
                           'src/_display.i',
                           'src/_clipbrd.i',
-                          ])
-ext = Extension('_misc', swig_sources,
+                          'src/_stdpaths.i',
+                          ],
+                        True)
+ext = Extension('_misc_', swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
-                depends = depends
+                **depends
                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 
@@ -299,7 +322,7 @@ ext = Extension('_calendar', swig_sources,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
-                depends = depends
+                **depends
                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 
@@ -313,7 +336,7 @@ ext = Extension('_grid', swig_sources,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
-                depends = depends
+                **depends
                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 
@@ -328,7 +351,22 @@ ext = Extension('_html', swig_sources,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
-                depends = depends
+                **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)
 
                 )
 wxpExtensions.append(ext)
 
@@ -343,7 +381,32 @@ ext = Extension('_wizard', swig_sources,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
-                depends = depends
+                **depends
+                )
+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/_xmlres.i',
+                          'src/_xmlsub.i',
+                          'src/_xml.i',
+                          'src/_xmlhandler.i',
+                          ])
+ext = Extension('_xrc',
+                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)
 
                 )
 wxpExtensions.append(ext)
 
@@ -361,7 +424,7 @@ if BUILD_GLCANVAS:
 
     gl_libs = []
     if os.name == 'posix':
 
     gl_libs = []
     if os.name == 'posix':
-        gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
+        gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
         gl_lflags = gl_config.split() + lflags
         gl_libs = libs
     else:
         gl_lflags = gl_config.split() + lflags
         gl_libs = libs
     else:
@@ -425,10 +488,10 @@ if BUILD_OGL:
 if BUILD_STC:
     msg('Preparing STC...')
     location = 'contrib/stc'
 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/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))
 
 ## NOTE: need to add something like this to the stc.bkl...
 
 
 ## NOTE: need to add something like this to the stc.bkl...
 
@@ -532,41 +595,6 @@ if BUILD_ACTIVEX:
     wxpExtensions.append(ext)
 
 
     wxpExtensions.append(ext)
 
 
-#----------------------------------------------------------------------
-# Define the XRC extension module
-#----------------------------------------------------------------------
-
-if BUILD_XRC:
-    msg('Preparing XRC...')
-    location = 'contrib/xrc'
-
-    swig_sources = run_swig(['xrc.i'], location, GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps +
-                            [ '%s/_xrc_rename.i' % location,
-                              '%s/_xrc_ex.py' % location,
-                              '%s/_xmlres.i' % location,
-                              '%s/_xmlsub.i' % location,
-                              '%s/_xml.i' % location,
-                              '%s/_xmlhandler.i' % location,
-                              ])
-
-    ext = Extension('_xrc',
-                    swig_sources,
-
-                    include_dirs =  includes + CONTRIBS_INC,
-                    define_macros = defines,
-
-                    library_dirs = libdirs,
-                    libraries = libs + makeLibName('xrc'),
-
-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-
-    wxpExtensions.append(ext)
-
-
-
 #----------------------------------------------------------------------
 # Define the GIZMOS  extension module
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Define the GIZMOS  extension module
 #----------------------------------------------------------------------
@@ -579,9 +607,9 @@ if BUILD_GIZMOS:
                             USE_SWIG, swig_force, swig_args, swig_deps)
 
     ext = Extension('_gizmos',
                             USE_SWIG, swig_force, swig_args, swig_deps)
 
     ext = Extension('_gizmos',
-                    [ '%s/treelistctrl.cpp' % location ] + swig_sources,
+                    [ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources,
 
 
-                    include_dirs =  includes + [ location ] + CONTRIBS_INC,
+                    include_dirs =  includes + [ location, opj(location, 'wxCode/include') ] + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
                     define_macros = defines,
 
                     library_dirs = libdirs,
@@ -629,7 +657,7 @@ if BUILD_DLLWIDGET:
 
 
 
 
 
 
-
+    
 #----------------------------------------------------------------------
 # Tools, scripts data files, etc.
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Tools, scripts data files, etc.
 #----------------------------------------------------------------------
@@ -639,18 +667,20 @@ if NO_SCRIPTS:
 else:
     SCRIPTS = [opj('scripts/helpviewer'),
                opj('scripts/img2png'),
 else:
     SCRIPTS = [opj('scripts/helpviewer'),
                opj('scripts/img2png'),
-               opj('scripts/img2xpm'),
                opj('scripts/img2py'),
                opj('scripts/img2py'),
-               opj('scripts/xrced'),
-               opj('scripts/pyshell'),
+               opj('scripts/img2xpm'),
+               opj('scripts/pyalacarte'),
+               opj('scripts/pyalamode'),
                opj('scripts/pycrust'),
                opj('scripts/pycrust'),
+               opj('scripts/pyshell'),
                opj('scripts/pywrap'),
                opj('scripts/pywrap'),
                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')
 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')
@@ -664,8 +694,19 @@ else:
               glob.glob(opj("src/_*.py")) + \
               glob.glob(opj("src/*.swg"))
 
               glob.glob(opj("src/_*.py")) + \
               glob.glob(opj("src/*.swg"))
 
-    HEADERS = zip(h_files, ["/include/wx/wxPython"]*len(h_files)) + \
-              zip(i_files, ["/include/wx/wxPython/i_files"]*len(i_files))
+    HEADERS = zip(h_files, ["/wxPython"]*len(h_files)) + \
+              zip(i_files, ["/wxPython/i_files"]*len(i_files))
+
+
+
+if INSTALL_MULTIVERSION:
+    EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS)
+    open("src/wx.pth", "w").write(EXTRA_PATH)
+    CLEANUP.append("src/wx.pth")
+else:
+    EXTRA_PATH = None
+       
+
 
 #----------------------------------------------------------------------
 # Do the Setup/Build/Install/Whatever
 
 #----------------------------------------------------------------------
 # Do the Setup/Build/Install/Whatever
@@ -673,6 +714,7 @@ else:
 
 if __name__ == "__main__":
     if not PREP_ONLY:
 
 if __name__ == "__main__":
     if not PREP_ONLY:
+        
         setup(name             = 'wxPython',
               version          = VERSION,
               description      = DESCRIPTION,
         setup(name             = 'wxPython',
               version          = VERSION,
               description      = DESCRIPTION,
@@ -698,12 +740,17 @@ if __name__ == "__main__":
                           'wx.lib',
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib',
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
+                          'wx.lib.floatcanvas',
+                          'wx.lib.masked',
                           'wx.lib.mixins',
                           'wx.lib.mixins',
+                          'wx.lib.ogl',
                           'wx.py',
                           'wx.tools',
                           'wx.tools.XRCed',
                           ],
 
                           'wx.py',
                           'wx.tools',
                           'wx.tools.XRCed',
                           ],
 
+              extra_path = EXTRA_PATH,
+
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
 
@@ -714,12 +761,40 @@ if __name__ == "__main__":
               data_files = DATA_FILES,
               headers =    HEADERS,
 
               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,
                            },
               )
 
 
                            '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,
+                               },
+                  )
+            
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
wxWidgets (Impactor)