revert last change

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 051bbdb6e8690c2473a269d416afccdf15f8aab6..34b0b5dacc50ebb6c25f0636130d6661cd5ae87f 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -76,6 +76,24 @@ RELEASE_NUMBER = RELEASE_VERSION  # for compatibility
 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 
@@ -121,6 +139,7 @@ swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR,
                           'src/_validator.i',
                           'src/_window.i',
                           'src/_control.i',
+                          'src/_swigtype.i',
                           ],
                         True)
 
@@ -137,8 +156,8 @@ CLEANUP.append('licence')
 
 
 if os.name == 'nt':
-    build_locale_dir(opj(PKGDIR, 'locale'))
-    DATA_FILES += build_locale_list(opj(PKGDIR, 'locale'))
+    build_locale_dir(opj(PKGDIR, 'i18n'))
+    DATA_FILES += build_locale_list(opj(PKGDIR, 'i18n'))
 
 
 if os.name == 'nt':
@@ -188,9 +207,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,
@@ -267,6 +289,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,
@@ -306,6 +330,7 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
                           'src/_display.i',
                           'src/_clipbrd.i',
                           'src/_stdpaths.i',
+                          'src/_power.i',
                           ],
                         True)
 ext = Extension('_misc_', swig_sources,
@@ -369,8 +394,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,
@@ -424,6 +449,10 @@ 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,
 
@@ -431,7 +460,7 @@ ext = Extension('_xrc',
                 define_macros = defines,
 
                 library_dirs = libdirs,
-                libraries = libs,
+                libraries = libs + xrcLib,
 
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
@@ -439,6 +468,54 @@ ext = Extension('_xrc',
 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)
+
+
+
+
+
 #----------------------------------------------------------------------
 # Define the GLCanvas extension module
 #----------------------------------------------------------------------
@@ -451,10 +528,13 @@ 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() + 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
@@ -465,7 +545,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,
@@ -604,7 +684,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,
@@ -727,7 +808,7 @@ else:
 
 
 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:
@@ -765,6 +846,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',
@@ -796,6 +879,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',