Allow art provider IDs for the extra bitmaps in a wxBitmapButton. (The

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 4c231fa4e230116b455cde7ee4a152830d95bfaa..dfc10d00eadf53d3cf148624b544a0e08829f677 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -17,8 +17,8 @@ import sys, os
 # The full contents of the wx.build.config module used to be located
 # here in setup.py.  They were split into a separate module so it will
 # be installed with wxPython and can then be used by the build scripts
-# of other extension modules that wich to be wxPython compatible.  The
-# split is still fairly new and hasn't been tested by building
+# of other extension modules that wish to be wxPython compatible.
+# The split is still fairly new and hasn't been tested by building
 # third-party extensions yet, so expect some things to still shift
 # back and forth, and also more stuff in config.py will get converted
 # to functions, etc.
@@ -31,11 +31,12 @@ import sys, os
 
 # To fully support external builds, we need to have a build options
 # file that is created whenever a new wxPython build is performed.
-# We happen to be doing that 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 *
@@ -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)
 
@@ -186,6 +206,7 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                          'src/_icon.i',
                          'src/_pen.i',
                          'src/_palette.i',
+                         'src/_renderer.i',
                          ],
                         True)
 ext = Extension('_gdi_', ['src/drawlist.cpp'] + swig_sources,
@@ -451,8 +472,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
@@ -560,38 +582,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)
 #----------------------------------------------------------------------
@@ -757,7 +747,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:
@@ -787,6 +777,8 @@ if __name__ == "__main__":
 
               packages = ['wxPython',
                           'wxPython.lib',
+                          'wx.lib.analogclock',
+                          'wx.lib.analogclock.lib_setup',
                           'wxPython.lib.colourchooser',
                           'wxPython.lib.editor',
                           'wxPython.lib.mixins',