Build fix for motif.

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 50bfe0d1ee16ff561b6dedfafb1e97dbb66d1053..830ad30308a366fefd9a26db2d466e519d59fe25 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.
 
-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 *
@@ -75,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 
@@ -120,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)
 
@@ -266,6 +286,7 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                           'src/_cshelp.i',
                           'src/_dragimg.i',
                           'src/_datectrl.i',
+                          'src/_hyperlink.i',
                           ],
                         True)
 ext = Extension('_controls_', swig_sources,
@@ -305,6 +326,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,
@@ -438,6 +460,24 @@ ext = Extension('_xrc',
 wxpExtensions.append(ext)
 
 
+
+swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps)
+ext = Extension('_richtext', 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)
+
+
+
+
+
 #----------------------------------------------------------------------
 # Define the GLCanvas extension module
 #----------------------------------------------------------------------
@@ -452,8 +492,9 @@ if BUILD_GLCANVAS:
     gl_libs = []
     if os.name == 'posix':
         gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
-        gl_lflags = gl_config.split() + lflags
+        gl_lflags = gl_config.split()
         gl_libs = libs
+        
     else:
         gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         gl_lflags = lflags
@@ -561,38 +602,6 @@ if BUILD_STC:
     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)
 #----------------------------------------------------------------------
@@ -758,7 +767,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:
@@ -796,6 +805,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',