]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/setup.py
Detect Apple bug that prevents the joystick code compiling for OS X 10.1
[wxWidgets.git] / wxPython / setup.py
index 5064aaf328b96db420de2a0979c239e56b3b7ca9..4c231fa4e230116b455cde7ee4a152830d95bfaa 100755 (executable)
 #!/usr/bin/env python
 #----------------------------------------------------------------------
+# Name:        setup.py
+# Purpose:     Distutils script for building wxPython
+#
+# Author:      Robin Dunn
+#
+# Created:     12-Oct-2000
+# RCS-ID:      $Id$
+# Copyright:   (c) 2000 by Total Control Software
+# Licence:     wxWindows license
+#----------------------------------------------------------------------
 
-import sys, os, string
-from distutils.core      import setup, Extension
-from distutils.file_util import copy_file
-from distutils.dir_util  import mkpath
-from distutils.dep_util  import newer
+import sys, os
 
-from my_distutils import run_swig, contrib_copy_tree
 
-#----------------------------------------------------------------------
-# flags and values that affect this script
-#----------------------------------------------------------------------
+# 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
+# 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.
 
-VERSION          = "2.3b2"
-DESCRIPTION      = "Cross platform GUI toolkit for Python"
-AUTHOR           = "Robin Dunn"
-AUTHOR_EMAIL     = "robin@alldunn.com"
-URL              = "http://wxPython.org/"
-LICENCE          = "wxWindows (LGPL derivative)"
-LONG_DESCRIPTION = """\
-wxPython is a GUI toolkit for Python that is a wrapper around the
-wxWindows C++ GUI library.  wxPython provides a large variety of
-window types and controls, all imlemented with a native look and
-feel (and native runtime speed) on the platforms it is supported
-on.
-"""
+# This script imports it as just "config" because if wxPython doesn't
+# exist yet, then it can't be imported from wx.build.config (since
+# wx._core doesn't exist yet.)  So instead we keep the main copy of
+# config .py in the same place as setup.py, and then copy it to
+# wx/build as needed below.
 
+# 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.
 
-BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
-BUILD_OGL = 1      # If true, build the contrib/ogl extension module
-BUILD_STC = 1      # If true, build the contrib/stc extension module
-CORE_ONLY = 0      # if true, don't build any of the above
+if os.path.exists("build_options.py"):
+    os.remove("build_options.py")
 
-USE_SWIG = 0       # Should we actually execute SWIG, or just use the
-                   # files already in the distribution?
+sys.setup_is_main =  __name__ == "__main__"  # an icky hack!
+from config import *
 
-IN_CVS_TREE = 0    # Set to true if building in a full wxWindows CVS
-                   # tree, otherwise will assume all needed files are
-                   # available in the wxPython source distribution
 
+#----------------------------------------------------------------------
+# Update the packaged config file.
+#----------------------------------------------------------------------
 
-# Some MSW build settings
+copy_file('config.py', 'wx/build', update=1, verbose=1)
+copy_file('build_options.py', 'wx/build', update=1, verbose=1)
+CLEANUP.append('wx/build/config.py')
+CLEANUP.append('wx/build/build_options.py')
 
-FINAL = 1          # Mirrors use of same flag in wx makefiles,
-                   # (0 or 1 only) should probably find a way to
-                   # autodetect this...
+#----------------------------------------------------------------------
+# Update the version file
+#----------------------------------------------------------------------
 
-HYBRID = 0         # If set and not debug or FINAL, then build a
-                   # hybrid extension that can be used by the
-                   # non-debug version of python, but contains
-                   # debugging symbols for wxWindows and wxPython.
-                   # wxWindows must have been built with /MD, not /MDd
-                   # (using FINAL=hybrid will do it.)
+# The version file is unconditionally updated every time setup.py is
+# run since the version string can change based on the UNICODE flag
 
-WXDLLVER = '23_0'  # Version part of DLL name
+open('wx/__version__.py', 'w').write("""\
+# This file was generated by setup.py...
 
+VERSION_STRING  = '%(VERSION)s'
+MAJOR_VERSION   = %(VER_MAJOR)s
+MINOR_VERSION   = %(VER_MINOR)s
+RELEASE_VERSION = %(VER_RELEASE)s
+SUBREL_VERSION  = %(VER_SUBREL)s
 
-#----------------------------------------------------------------------
-# Some other globals
-#----------------------------------------------------------------------
+VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION,
+           SUBREL_VERSION, '%(VER_FLAGS)s')
 
-PKGDIR = 'wxPython'
-wxpExtensions = []
+RELEASE_NUMBER = RELEASE_VERSION  # for compatibility
+""" % globals())
 
-force = '--force' in sys.argv or '-f' in sys.argv
-debug = '--debug' in sys.argv or '-g' in sys.argv
+CLEANUP.append('wx/__version__.py')
 
 
 #----------------------------------------------------------------------
-# Check for build flags on the command line
+# patch distutils if it can't cope with the "classifiers" or
+# "download_url" keywords 
 #----------------------------------------------------------------------
 
-for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'CORE_ONLY',
-             'USE_SWIG', 'IN_CVS_TREE', 'FINAL', 'HYBRID',
-             'WXDLLVER', ]:
-    for x in range(len(sys.argv)):
-        if string.find(sys.argv[x], flag) == 0:
-            pos = string.find(sys.argv[x], '=') + 1
-            if pos > 0:
-                vars()[flag] = eval(sys.argv[x][pos:])
-                sys.argv[x] = ''
+if sys.version < '2.2.3': 
+    from distutils.dist import DistributionMetadata 
+    DistributionMetadata.classifiers = None 
+    DistributionMetadata.download_url = None
+    depends = {}
+else:
+    depends = {'depends' : depends}
+    
 
-sys.argv = filter(None, sys.argv)
+#----------------------------------------------------------------------
+# Define the CORE extension module
+#----------------------------------------------------------------------
 
+msg('Preparing CORE...')
+swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps +
+                        [ 'src/_accel.i',
+                          'src/_app.i',
+                          'src/_app_ex.py',
+                          'src/_constraints.i',
+                          'src/_core_api.i',
+                          'src/_core_ex.py',
+                          'src/__core_rename.i',
+                          'src/__core_reverse.txt',
+                          'src/_defs.i',
+                          'src/_event.i',
+                          'src/_event_ex.py',
+                          'src/_evtloop.i',
+                          'src/_evthandler.i',
+                          'src/_filesys.i',
+                          'src/_gdicmn.i',
+                          'src/_image.i',
+                          'src/_menu.i',
+                          'src/_obj.i',
+                          'src/_sizers.i',
+                          'src/_gbsizer.i',
+                          'src/_streams.i',
+                          'src/_validator.i',
+                          'src/_window.i',
+                          'src/_control.i',
+                          ],
+                        True)
 
-if CORE_ONLY:
-    BUILD_GLCANVAS = 0
-    BUILD_OGL = 0
-    BUILD_STC = 0
+copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
+CLEANUP.append(opj(PKGDIR, '__init__.py'))
+
+
+# update the license files
+mkpath('licence')
+for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
+    copy_file(opj(WXDIR, 'docs', file), opj('licence',file), update=1, verbose=0)
+    CLEANUP.append(opj('licence',file))
+CLEANUP.append('licence')
 
-#----------------------------------------------------------------------
-# Setup some platform specific stuff
-#----------------------------------------------------------------------
 
 if os.name == 'nt':
-    # Set compile flags and such for MSVC.  These values are derived
-    # from the wxWindows makefiles for MSVC, others will probably
-    # vary...
-    WXDIR = os.environ['WXWIN']
-    WXPLAT = '__WXMSW__'
-    GENDIR = 'msw'
-
-    if debug:
-        FINAL  = 0
-        HYBRID = 0
-
-    if HYBRID:
-        FINAL = 0
-
-    includes = ['src',
-                os.path.join(WXDIR, 'include'),
-                ]
-
-    defines = [ ('WIN32', None),        # Some of these are no longer
-                ('__WIN32__', None),    # necessary.  Anybody know which?
-                ('_WINDOWS', None),
-                ('__WINDOWS__', None),
-                ('WINVER', '0x0400'),
-                ('__WIN95__', None),
-                ('STRICT', None),
-
-                (WXPLAT, None),
-                ('WXUSINGDLL', '1'),
-
-                ('SWIG_GLOBAL', None),
-                ('HAVE_CONFIG_H', None),
-                ('WXP_USE_THREAD', '1'),
-                ]
-
-    if not FINAL or HYBRID:
-        defines.append( ('__WXDEBUG__', None) )
-
-    libdirs = [os.path.join(WXDIR, 'lib'), 'build\\ilib']
-
-    if FINAL:
-        wxdll = 'wx' + WXDLLVER
-    elif HYBRID:
-        wxdll = 'wx' + WXDLLVER + 'h'
-    else:
-        wxdll = 'wx' + WXDLLVER + 'd'
+    build_locale_dir(opj(PKGDIR, 'locale'))
+    DATA_FILES += build_locale_list(opj(PKGDIR, 'locale'))
 
 
-    libs = [wxdll, 'kernel32', 'user32', 'gdi32', 'comdlg32',
-            'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32',
-            'ctl3d32', 'odbc32', 'ole32', 'oleaut32', 'uuid', 'rpcrt4',
-            'advapi32', 'wsock32']
+if os.name == 'nt':
+    rc_file = ['src/wxc.rc']
+else:
+    rc_file = []
 
-    cflags = ['/GX-']  # workaround for internal compiler error in MSVC 5
-    lflags = None
 
-    if not FINAL and HYBRID:
-        cflags = cflags + ['/Od', '/Z7']
-        lflags = ['/DEBUG', ]
+ext = Extension('_core_', ['src/helpers.cpp',
+                           ] + rc_file + swig_sources,
 
+                include_dirs = includes,
+                define_macros = defines,
 
-elif os.name == 'posix':
-    # Set flags for Unix type platforms
+                library_dirs = libdirs,
+                libraries = libs,
 
-    WXDIR = '..'              # assumes IN_CVS_TREE
-    WXPLAT = '__WXGTK__'      # and assumes GTK...
-    GENDIR = 'gtk'            # Need to allow for Motif eventually too
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
 
-    includes = ['src']
-    defines = [('SWIG_GLOBAL', None),
-               ('HAVE_CONFIG_H', None),
-               ('WXP_USE_THREAD', '1'),
-               ]
-    libdirs = []
-    libs = []
+                **depends
+                )
+wxpExtensions.append(ext)
 
-    cflags = os.popen('wx-config --cflags', 'r').read()[:-1] + ' ' + \
-             os.popen('gtk-config --cflags', 'r').read()[:-1]
-    cflags = string.split(cflags)
 
-    lflags = os.popen('wx-config --libs', 'r').read()[:-1]
-    lflags = string.split(lflags)
 
 
-else:
-    raise 'Sorry Charlie...'
 
+# 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/_colour.i',
+                         'src/_dc.i',
+                         'src/_gdiobj.i',
+                         'src/_imaglist.i',
+                         'src/_region.i',
+                         'src/_stockobjs.i',
+                         'src/_effects.i',
+                         'src/_intl.i',
+                         'src/_intl_ex.py',
+                         'src/_brush.i',
+                         'src/_cursor.i',
+                         'src/_font.i',
+                         'src/_icon.i',
+                         'src/_pen.i',
+                         'src/_palette.i',
+                         ],
+                        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,
+                **depends
+                )
+wxpExtensions.append(ext)
 
-#----------------------------------------------------------------------
-# Check if the version file needs updated
-#----------------------------------------------------------------------
 
-if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
-    open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION)
 
-#----------------------------------------------------------------------
-# Define the CORE extension module
-#----------------------------------------------------------------------
 
-print 'Preparing CORE...'
-swig_force = force
-swig_args = ['-c++', '-shadow', '-python', '-keyword', '-dnone', #'-dascii',
-             '-I./src', '-D'+WXPLAT]
-swig_deps = ['src/my_typemaps.i']
 
-swig_files = [ 'wx.i', 'windows.i', 'windows2.i', 'windows3.i', 'events.i',
-               'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
-               'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
-               'printfw.i', 'sizers.i', 'clip_dnd.i',
-               'filesys.i', 'streams.i',
-               ##'grid.i', 'html.i', 'htmlhelp.i', 'calendar.i', 'utils.i',
-               ]
 
-swig_sources = run_swig(swig_files, '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/_toplvl.i',
+                         'src/_statusbar.i',
+                         'src/_splitter.i',
+                         'src/_sashwin.i',
+                         'src/_popupwin.i',
+                         'src/_tipwin.i',
+                         'src/_vscroll.i',
+                         'src/_taskbar.i',
+                         'src/_cmndlgs.i',
+                         'src/_mdi.i',
+                         'src/_pywindows.i',
+                         'src/_printfw.i',
+                         ],
+                        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,
+                **depends
+                )
+wxpExtensions.append(ext)
 
-copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
-copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
 
 
-if IN_CVS_TREE:   # update the licence files
-    mkpath('licence')
-    for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
-        copy_file(WXDIR+'/docs/'+file, 'licence/'+file, update=1, verbose=0)
 
+# 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/_button.i',
+                          'src/_checkbox.i',
+                          'src/_choice.i',
+                          'src/_combobox.i',
+                          'src/_gauge.i',
+                          'src/_statctrls.i',
+                          'src/_listbox.i',
+                          'src/_textctrl.i',
+                          'src/_scrolbar.i',
+                          'src/_spin.i',
+                          'src/_radio.i',
+                          'src/_slider.i',
+                          'src/_tglbtn.i',
+                          'src/_notebook.i',
+                          'src/_listctrl.i',
+                          'src/_treectrl.i',
+                          'src/_dirctrl.i',
+                          'src/_pycontrol.i',
+                          'src/_cshelp.i',
+                          'src/_dragimg.i',
+                          'src/_datectrl.i',
+                          ],
+                        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,
+                **depends
+                )
+wxpExtensions.append(ext)
 
-if os.name == 'nt':
-    rc_file = ['src/wxc.rc']
-else:
-    rc_file = []
 
 
-ext = Extension('wxc', ['src/helpers.cpp',
-                        'src/libpy.c',
-                        ] + rc_file + swig_sources,
 
-                include_dirs = includes,
+# 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/_functions.i',
+                          'src/_misc.i',
+                          'src/_tipdlg.i',
+                          'src/_timer.i',
+                          'src/_log.i',
+                          'src/_process.i',
+                          'src/_joystick.i',
+                          'src/_sound.i',
+                          'src/_mimetype.i',
+                          'src/_artprov.i',
+                          'src/_config.i',
+                          'src/_datetime.i',
+                          'src/_dataobj.i',
+                          'src/_dnd.i',
+                          'src/_display.i',
+                          'src/_clipbrd.i',
+                          '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,
+                **depends
+                )
+wxpExtensions.append(ext)
+
+
 
+##
+## Core modules that are not in the "core" namespace start here
+##
+
+swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps)
+ext = Extension('_calendar', 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)
 
 
-# Extension for the grid module
 swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
-ext = Extension('gridc', swig_sources,
+ext = Extension('_grid', 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)
 
 
-# Extension for the html modules
-swig_sources = run_swig(['html.i', 'htmlhelp.i'], 'src', GENDIR, PKGDIR,
+
+swig_sources = run_swig(['html.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
-ext = Extension('htmlc', swig_sources,
+ext = Extension('_html', 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)
 
 
-# Extension for the utils module
-swig_sources = run_swig(['utils.i'], 'src', GENDIR, PKGDIR,
+mediaLibs = libs[:]
+if not MONOLITHIC and os.name == 'nt':
+    mediaLibs.append(makeLibName('media')[0])
+swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
-ext = Extension('utilsc', swig_sources,
+ext = Extension('_media', swig_sources,
+                include_dirs =  includes,
+                define_macros = defines,
+                library_dirs = libdirs,
+                libraries = mediaLibs,
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
+                **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)
 
 
-# Extension for the calendar module
-swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
+
+swig_sources = run_swig(['wizard.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
-ext = Extension('calendarc', swig_sources,
+ext = Extension('_wizard', 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(['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,
                 )
@@ -303,31 +442,32 @@ wxpExtensions.append(ext)
 #----------------------------------------------------------------------
 
 if BUILD_GLCANVAS:
-    print 'Preparing GLCANVAS...'
+    msg('Preparing GLCANVAS...')
     location = 'contrib/glcanvas'
-    swig_files = ['glcanvas.i']
 
-    swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args)
+    swig_sources = run_swig(['glcanvas.i'], location, GENDIR, PKGDIR,
+                            USE_SWIG, swig_force, swig_args, swig_deps)
 
     gl_libs = []
     if os.name == 'posix':
-        if '-D__WXDEBUG__' in cflags:
-            gl_libs = ['wx_gtkd_gl', 'GL', 'GLU']
-        else:
-            gl_libs = ['wx_gtk_gl', 'GL', 'GLU']
+        gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
+        gl_lflags = gl_config.split() + lflags
+        gl_libs = libs
+    else:
+        gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
+        gl_lflags = lflags
 
-    ext = Extension('glcanvasc',
+    ext = Extension('_glcanvas',
                     swig_sources,
 
-                    include_dirs = includes,
+                    include_dirs = includes + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
-                    libraries = libs + gl_libs,
+                    libraries = gl_libs,
 
                     extra_compile_args = cflags,
-                    extra_link_args = lflags,
+                    extra_link_args = gl_lflags,
                     )
 
     wxpExtensions.append(ext)
@@ -337,43 +477,27 @@ if BUILD_GLCANVAS:
 # Define the OGL extension module
 #----------------------------------------------------------------------
 
-
 if BUILD_OGL:
-    print 'Preparing OGL...'
+    msg('Preparing OGL...')
     location = 'contrib/ogl'
-    OGLLOC = location + '/contrib/src/ogl'
-    OGLINC = location + '/contrib/include'
 
-    swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
-                  'oglcanvas.i']
+    swig_sources = run_swig(['ogl.i'], location, GENDIR, PKGDIR,
+                            USE_SWIG, swig_force, swig_args, swig_deps +
+                            [ '%s/_oglbasic.i' % location,
+                              '%s/_oglshapes.i' % location,
+                              '%s/_oglshapes2.i' % location,
+                              '%s/_oglcanvas.i' % location,
+                              '%s/_ogldefs.i' % location,
+                              ])
 
-    swig_sources = run_swig(swig_files, location, '', PKGDIR,
-                            USE_SWIG, swig_force, swig_args)
-
-    # make sure local copy of contrib files are up to date
-    if IN_CVS_TREE:
-        contrib_copy_tree(WXDIR + '/contrib/include/wx/ogl', OGLINC+'/wx/ogl')
-        contrib_copy_tree(WXDIR + '/contrib/src/ogl', OGLLOC)
-
-    ext = Extension('oglc', ['%s/basic.cpp' % OGLLOC,
-                             '%s/bmpshape.cpp' % OGLLOC,
-                             '%s/composit.cpp' % OGLLOC,
-                             '%s/divided.cpp' % OGLLOC,
-                             '%s/lines.cpp' % OGLLOC,
-                             '%s/misc.cpp' % OGLLOC,
-                             '%s/basic2.cpp' % OGLLOC,
-                             '%s/canvas.cpp' % OGLLOC,
-                             '%s/constrnt.cpp' % OGLLOC,
-                             '%s/drawn.cpp' % OGLLOC,
-                             '%s/mfutils.cpp' % OGLLOC,
-                             '%s/ogldiag.cpp' % OGLLOC,
-                             ] + swig_sources,
+    ext = Extension('_ogl',
+                    swig_sources,
 
-                    include_dirs =  [OGLINC] + includes,
-                    define_macros = defines,
+                    include_dirs =  includes + [ location ] + CONTRIBS_INC,
+                    define_macros = defines + [('wxUSE_DEPRECATED', '0')],
 
                     library_dirs = libdirs,
-                    libraries = libs,
+                    libraries = libs + makeLibName('ogl'),
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
@@ -388,74 +512,75 @@ if BUILD_OGL:
 #----------------------------------------------------------------------
 
 if BUILD_STC:
-    print 'Preparing STC...'
+    msg('Preparing STC...')
     location = 'contrib/stc'
-    STCLOC = location + '/contrib/src/stc'
-    STCINC = location + '/contrib/include'
-    STC_H =  location + '/contrib/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))
 
-    # make sure local copy of contrib files are up to date
-    if IN_CVS_TREE:
-        contrib_copy_tree(WXDIR + '/contrib/include/wx/stc', STCINC+'/wx/stc')
-        contrib_copy_tree(WXDIR + '/contrib/src/stc', STCLOC)
+## NOTE: need to add something like this to the stc.bkl...
 
+##         # Check if gen_iface needs to be run for the wxSTC sources
+##         if (newer(opj(CTRB_SRC, 'stc/stc.h.in'),     opj(CTRB_INC, 'stc/stc.h'  )) or
+##             newer(opj(CTRB_SRC, 'stc/stc.cpp.in'),   opj(CTRB_SRC, 'stc/stc.cpp')) or
+##             newer(opj(CTRB_SRC, 'stc/gen_iface.py'), opj(CTRB_SRC, 'stc/stc.cpp'))):
 
-    swig_files = ['stc_.i']
-    swig_sources = run_swig(swig_files, location, '', PKGDIR,
+##             msg('Running gen_iface.py, regenerating stc.h and stc.cpp...')
+##             cwd = os.getcwd()
+##             os.chdir(opj(CTRB_SRC, 'stc'))
+##             sys.path.insert(0, os.curdir)
+##             import gen_iface
+##             gen_iface.main([])
+##             os.chdir(cwd)
+
+
+    swig_sources = run_swig(['stc.i'], location, GENDIR, PKGDIR,
                             USE_SWIG, swig_force,
                             swig_args + ['-I'+STC_H, '-I'+location],
-                            [STC_H+'/stc.h'])
-
-    # copy a project specific py module to the main package dir
-    copy_file(location+'/stc.py', PKGDIR, update=1, verbose=1)
-
-    # add some include dirs to the standard set
-    stc_includes = includes[:]
-    stc_includes.append('%s/scintilla/include' % STCLOC)
-    stc_includes.append('%s/scintilla/src' % STCLOC)
-    stc_includes.append(STCINC)
-
-    # and some macro definitions
-    stc_defines = defines[:]
-    stc_defines.append( ('__WX__', None) )
-    stc_defines.append( ('SCI_LEXER', None) )
-
-
-    ext = Extension('stc_c',
-                    ['%s/scintilla/src/AutoComplete.cxx' % STCLOC,
-                     '%s/scintilla/src/CallTip.cxx' % STCLOC,
-                     '%s/scintilla/src/CellBuffer.cxx' % STCLOC,
-                     '%s/scintilla/src/ContractionState.cxx' % STCLOC,
-                     '%s/scintilla/src/Document.cxx' % STCLOC,
-                     '%s/scintilla/src/Editor.cxx' % STCLOC,
-                     '%s/scintilla/src/Indicator.cxx' % STCLOC,
-                     '%s/scintilla/src/KeyMap.cxx' % STCLOC,
-                     '%s/scintilla/src/KeyWords.cxx' % STCLOC,
-                     '%s/scintilla/src/LineMarker.cxx' % STCLOC,
-                     '%s/scintilla/src/PropSet.cxx' % STCLOC,
-                     '%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
-                     '%s/scintilla/src/Style.cxx' % STCLOC,
-                     '%s/scintilla/src/ViewStyle.cxx' % STCLOC,
-                     '%s/scintilla/src/LexCPP.cxx' % STCLOC,
-                     '%s/scintilla/src/LexHTML.cxx' % STCLOC,
-                     '%s/scintilla/src/LexLua.cxx' % STCLOC,
-                     '%s/scintilla/src/LexOthers.cxx' % STCLOC,
-                     '%s/scintilla/src/LexPerl.cxx' % STCLOC,
-                     '%s/scintilla/src/LexPython.cxx' % STCLOC,
-                     '%s/scintilla/src/LexSQL.cxx' % STCLOC,
-                     '%s/scintilla/src/LexVB.cxx' % STCLOC,
-                     '%s/scintilla/src/DocumentAccessor.cxx' % STCLOC,
-                     '%s/scintilla/src/UniConversion.cxx' % STCLOC,
-                     '%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
-                     '%s/scintilla/src/PosRegExp.cxx' % STCLOC,
-
-                     '%s/PlatWX.cpp' % STCLOC,
-                     '%s/ScintillaWX.cpp' % STCLOC,
-                     '%s/stc.cpp' % STCLOC,
-                     ] + swig_sources,
-
-                    include_dirs = stc_includes,
-                    define_macros = stc_defines,
+                            [opj(STC_H, 'stc.h'),
+                             opj(location, "_stc_utf8_methods.py"),
+                             opj(location, "_stc_docstrings.i"),
+                             opj(location, "_stc_gendocs.i"),
+                             ] + swig_deps)
+
+    ext = Extension('_stc',
+                    swig_sources,
+
+                    include_dirs = includes + CONTRIBS_INC,
+                    define_macros = defines,
+
+                    library_dirs = libdirs,
+                    libraries = libs + makeLibName('stc'),
+
+                    extra_compile_args = cflags,
+                    extra_link_args = lflags,
+                    )
+
+    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,
@@ -467,198 +592,266 @@ if BUILD_STC:
     wxpExtensions.append(ext)
 
 
+#----------------------------------------------------------------------
+# Define the ACTIVEX extension module (experimental)
+#----------------------------------------------------------------------
+
+if BUILD_ACTIVEX:
+    msg('Preparing ACTIVEX...')
+    location = 'contrib/activex'
+    axloc = opj(location, "wxie")
+
+    swig_files = ['activex.i', ]
+
+    swig_sources = run_swig(swig_files, location, '', PKGDIR,
+                            USE_SWIG, swig_force, swig_args, swig_deps +
+                            [ '%s/_activex_ex.py' % location])
+
+
+    ext = Extension('_activex', ['%s/IEHtmlWin.cpp' % axloc,
+                                 '%s/wxactivex.cpp' % axloc,
+                                 ] + swig_sources,
+
+                    include_dirs =  includes + [ axloc ],
+                    define_macros = defines,
+
+                    library_dirs = libdirs,
+                    libraries = libs,
+
+                    extra_compile_args = cflags,
+                    extra_link_args = lflags,
+                    )
+
+    wxpExtensions.append(ext)
+
 
 #----------------------------------------------------------------------
-# Do the Setup/Build/Install/Whatever
+# Define the GIZMOS  extension module
+#----------------------------------------------------------------------
+
+if BUILD_GIZMOS:
+    msg('Preparing GIZMOS...')
+    location = 'contrib/gizmos'
+
+    swig_sources = run_swig(['gizmos.i'], location, GENDIR, PKGDIR,
+                            USE_SWIG, swig_force, swig_args, swig_deps)
+
+    ext = Extension('_gizmos',
+                    [ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources,
+
+                    include_dirs =  includes + [ location, opj(location, 'wxCode/include') ] + CONTRIBS_INC,
+                    define_macros = defines,
+
+                    library_dirs = libdirs,
+                    libraries = libs + makeLibName('gizmos'),
+
+                    extra_compile_args = cflags,
+                    extra_link_args = lflags,
+                    )
+
+    wxpExtensions.append(ext)
+
+
+#----------------------------------------------------------------------
+# Define the ANIMATE  extension module
 #----------------------------------------------------------------------
 
-setup(name             = PKGDIR,
-      version          = VERSION,
-      description      = DESCRIPTION,
-      long_description = LONG_DESCRIPTION,
-      author           = AUTHOR,
-      author_email     = AUTHOR_EMAIL,
-      url              = URL,
-      licence          = LICENCE,
+if BUILD_ANIMATE:
+    msg('Preparing ANIMATE...')
+    location = 'contrib/animate'
 
-      packages = [PKGDIR,
-                  PKGDIR+'.lib',
-                  PKGDIR+'.lib.editor',
-                  ],
+    swig_sources = run_swig(['animate.i'], location, GENDIR, PKGDIR,
+                            USE_SWIG, swig_force, swig_args, swig_deps)
 
-      ext_package = PKGDIR,
-      ext_modules = wxpExtensions,
+    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
+#----------------------------------------------------------------------
+
+if BUILD_DLLWIDGET:
+    msg('Preparing DLLWIDGET...')
+    location = 'contrib/dllwidget'
+    swig_files = ['dllwidget_.i']
+
+    swig_sources = run_swig(swig_files, location, '', PKGDIR,
+                            USE_SWIG, swig_force, swig_args, swig_deps)
+
+    # copy a contrib project specific py module to the main package dir
+    copy_file(opj(location, 'dllwidget.py'), PKGDIR, update=1, verbose=0)
+    CLEANUP.append(opj(PKGDIR, 'dllwidget.py'))
+
+    ext = Extension('dllwidget_c', [
+                                '%s/dllwidget.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)
+
+
+
+    
 #----------------------------------------------------------------------
+# Tools, scripts data files, etc.
 #----------------------------------------------------------------------
 
-# The pre-distutils binary distributions of wxPython included the demo
-# as a subdirectory of the package dir.  This doesn't really make sense
-# for Linux/Unix platforms as it's not part of the package, and the user
-# may want to tweak and learn without having to become root first.
-#
-# For now I am going to start distributing the demo as a separate tarball,
-# but if I ever want to go back to the old way, this is how to do it the
-# distutils way:
+if NO_SCRIPTS:
+    SCRIPTS = None
+else:
+    SCRIPTS = [opj('scripts/helpviewer'),
+               opj('scripts/img2png'),
+               opj('scripts/img2py'),
+               opj('scripts/img2xpm'),
+               opj('scripts/pyalacarte'),
+               opj('scripts/pyalamode'),
+               opj('scripts/pycrust'),
+               opj('scripts/pyshell'),
+               opj('scripts/pywrap'),
+               opj('scripts/pywrap'),
+               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')
+
 
+if NO_HEADERS:
+    HEADERS = None
+else:
+    h_files = glob.glob(opj("include/wx/wxPython/*.h"))
+    i_files = glob.glob(opj("src/*.i"))   + \
+              glob.glob(opj("src/_*.py")) + \
+              glob.glob(opj("src/*.swg"))
+
+    HEADERS = zip(h_files, ["/wxPython"]*len(h_files)) + \
+              zip(i_files, ["/wxPython/i_files"]*len(i_files))
 
-## from my_install_data import *
 
-## Add this to the setup() call
-##       # Overridden command classes
-##       cmdclass = {'install_data': my_install_data},
-##       # non python files of examples
-##       data_files = [
-##            Data_Files(
-##                base_dir='install_lib',
-##                copy_to = 'wxPython',
-##                #strip_dirs = 2,
-##                template=[ 'graft demo',
-##                           'global-exclude CVS/*'
-##                    ],
-##                preserve_path=1
-##            )
-##        ],
+
+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
+#----------------------------------------------------------------------
 
+if __name__ == "__main__":
+    if not PREP_ONLY:
+        
+        setup(name             = 'wxPython',
+              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 = ['wxPython',
+                          'wxPython.lib',
+                          'wxPython.lib.colourchooser',
+                          'wxPython.lib.editor',
+                          'wxPython.lib.mixins',
+                          'wxPython.tools',
+
+                          'wx',
+                          'wx.build',
+                          'wx.lib',
+                          'wx.lib.colourchooser',
+                          'wx.lib.editor',
+                          'wx.lib.floatcanvas',
+                          'wx.lib.masked',
+                          'wx.lib.mixins',
+                          'wx.lib.ogl',
+                          'wx.py',
+                          'wx.tools',
+                          'wx.tools.XRCed',
+                          ],
+
+              extra_path = EXTRA_PATH,
+
+              ext_package = PKGDIR,
+              ext_modules = wxpExtensions,
+
+              options = { 'build'            : { 'build_base' : BUILD_BASE },
+                          },
+
+              scripts =    SCRIPTS,
+              data_files = DATA_FILES,
+              headers =    HEADERS,
+
+              # 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,
+                           },
+              )
+
+
+        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,
+                               },
+                  )
+            
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
-#----------------------------------------------------------------------
-## if not BUILD_GLCANVAS:
-##     wxext.sources = wxext.sources + ['contrib/glcanvas/stub.cpp']
-## else:
-##     print 'Preparing GLCANVAS...'
-##     location = 'contrib/glcanvas'
-##     swig_files = ['glcanvas.i']
-
-##     swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
-##                             USE_SWIG, swig_force, swig_args, swig_deps)
-
-##     gl_libs = []
-##     if os.name == 'posix':
-##         if '-D__WXDEBUG__' in cflags:
-##             gl_libs = ['wx_gtkd_gl', 'GL', 'GLU']
-##         else:
-##             gl_libs = ['wx_gtk_gl', 'GL', 'GLU']
-
-##     wxext.sources = wxext.sources + swig_sources
-##     wxext.libraries = wxext.libraries + gl_libs
-
-
-## if not BUILD_OGL:
-##     wxext.sources = wxext.sources + ['contrib/ogl/stub.cpp']
-## else:
-##     print 'Preparing OGL...'
-##     location = 'contrib/ogl'
-##     OGLLOC = location + '/contrib/src/ogl'
-##     OGLINC = location + '/contrib/include'
-
-##     swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
-##                   'oglcanvas.i']
-
-##     swig_sources = run_swig(swig_files, location, '', PKGDIR,
-##                             USE_SWIG, swig_force, swig_args, swig_deps)
-
-##     # make sure local copy of contrib files are up to date
-##     if IN_CVS_TREE:
-##         contrib_copy_tree(WXDIR + '/contrib/include/wx/ogl', OGLINC+'/wx/ogl')
-##         contrib_copy_tree(WXDIR + '/contrib/src/ogl', OGLLOC)
-
-##     # add items to the core extension module definition
-##     wxext.sources = wxext.sources + [location + '/oglhelpers.cpp',
-##                                      '%s/basic.cpp' % OGLLOC,
-##                                      '%s/bmpshape.cpp' % OGLLOC,
-##                                      '%s/composit.cpp' % OGLLOC,
-##                                      '%s/divided.cpp' % OGLLOC,
-##                                      '%s/lines.cpp' % OGLLOC,
-##                                      '%s/misc.cpp' % OGLLOC,
-##                                      '%s/basic2.cpp' % OGLLOC,
-##                                      '%s/canvas.cpp' % OGLLOC,
-##                                      '%s/constrnt.cpp' % OGLLOC,
-##                                      '%s/drawn.cpp' % OGLLOC,
-##                                      '%s/mfutils.cpp' % OGLLOC,
-##                                      '%s/ogldiag.cpp' % OGLLOC,
-##                                      ] + swig_sources
-
-##     wxext.include_dirs = wxext.include_dirs + [OGLINC]
-
-
-
-
-## if not BUILD_STC:
-##     wxext.sources = wxext.sources + ['contrib/stc/stub.cpp']
-## else:
-##     print 'Preparing STC...'
-##     location = 'contrib/stc'
-##     STCLOC = location + '/contrib/src/stc'
-##     STCINC = location + '/contrib/include'
-##     STC_H =  location + '/contrib/include/wx/stc'
-
-##     # make sure local copy of contrib files are up to date
-##     if IN_CVS_TREE:
-##         contrib_copy_tree(WXDIR + '/contrib/include/wx/stc', STCINC+'/wx/stc')
-##         contrib_copy_tree(WXDIR + '/contrib/src/stc', STCLOC)
-
-
-##     swig_files = ['stc_.i']
-##     swig_sources = run_swig(swig_files, location, '', PKGDIR,
-##                             USE_SWIG, swig_force,
-##                             swig_args + ['-I'+STC_H, '-I'+location],
-##                             swig_deps + [STC_H+'/stc.h'])
-
-##     # copy a project specific py module to the main package dir
-##     copy_file(location+'/stc.py', PKGDIR, update=1, verbose=1)
-
-##     # add some include dirs to the standard set
-##     stc_includes = [ '%s/scintilla/include' % STCLOC,
-##                      '%s/scintilla/src' % STCLOC,
-##                      STCINC ]
-
-##     # and some macro definitions
-##     stc_defines = [ ('__WX__', None),
-##                     ('SCI_LEXER', None) ]
-
-
-##     # add items to the core extension module definition
-##     wxext.sources = wxext.sources +  [
-##                      '%s/scintilla/src/AutoComplete.cxx' % STCLOC,
-##                      '%s/scintilla/src/CallTip.cxx' % STCLOC,
-##                      '%s/scintilla/src/CellBuffer.cxx' % STCLOC,
-##                      '%s/scintilla/src/ContractionState.cxx' % STCLOC,
-##                      '%s/scintilla/src/Document.cxx' % STCLOC,
-##                      '%s/scintilla/src/Editor.cxx' % STCLOC,
-##                      '%s/scintilla/src/Indicator.cxx' % STCLOC,
-##                      '%s/scintilla/src/KeyMap.cxx' % STCLOC,
-##                      '%s/scintilla/src/KeyWords.cxx' % STCLOC,
-##                      '%s/scintilla/src/LineMarker.cxx' % STCLOC,
-##                      '%s/scintilla/src/PropSet.cxx' % STCLOC,
-##                      '%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
-##                      '%s/scintilla/src/Style.cxx' % STCLOC,
-##                      '%s/scintilla/src/ViewStyle.cxx' % STCLOC,
-##                      '%s/scintilla/src/LexCPP.cxx' % STCLOC,
-##                      '%s/scintilla/src/LexHTML.cxx' % STCLOC,
-##                      '%s/scintilla/src/LexLua.cxx' % STCLOC,
-##                      '%s/scintilla/src/LexOthers.cxx' % STCLOC,
-##                      '%s/scintilla/src/LexPerl.cxx' % STCLOC,
-##                      '%s/scintilla/src/LexPython.cxx' % STCLOC,
-##                      '%s/scintilla/src/LexSQL.cxx' % STCLOC,
-##                      '%s/scintilla/src/LexVB.cxx' % STCLOC,
-##                      '%s/scintilla/src/DocumentAccessor.cxx' % STCLOC,
-##                      '%s/scintilla/src/UniConversion.cxx' % STCLOC,
-##                      '%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
-##                      '%s/scintilla/src/PosRegExp.cxx' % STCLOC,
-
-##                      '%s/PlatWX.cpp' % STCLOC,
-##                      '%s/ScintillaWX.cpp' % STCLOC,
-##                      '%s/stc.cpp' % STCLOC,
-##                      ] + swig_sources
-
-##     wxext.include_dirs = wxext.include_dirs + stc_includes
-##     wxext.define_macros = wxext.define_macros + stc_defines