]> 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
Warning fix.
[wxWidgets.git] / wxPython / setup.py
diff --git a/wxPython/setup.py b/wxPython/setup.py
index fb919d5eabceac6607af81305fe5fa87d689577d..e61f68bfb293d016df686c3592d8354a0a5419a1 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -1,714 +1,484 @@
 #!/usr/bin/env python
 #----------------------------------------------------------------------
 #!/usr/bin/env python
 #----------------------------------------------------------------------
-
-import sys, os, glob, fnmatch
-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
-from distutils.spawn     import spawn
-from distutils.command.install_data import install_data
-
+# 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
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
-# flags and values that affect this script
-#----------------------------------------------------------------------
-
-VER_MAJOR        = 2      # The first three must match wxWindows
-VER_MINOR        = 5
-VER_RELEASE      = 0
-VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWindows
-VER_FLAGS        = "p1"   # release flags, such as prerelease num, unicode, etc.
-
-DESCRIPTION      = "Cross platform GUI toolkit for Python"
-AUTHOR           = "Robin Dunn"
-AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
-URL              = "http://wxPython.org/"
-LICENSE          = "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 implemented with a native look and
-feel (by using the native widgets) on the platforms it is supported
-on.
-"""
-
-
-# Config values below this point can be reset on the setup.py command line.
-
-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
-BUILD_XRC = 1      # XML based resource system
-BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library
-BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
-                   # to be loaded from a DLL and to be used from Python.
-
-                   # Internet Explorer wrapper (experimental)
-BUILD_IEWIN = (os.name == 'nt')
-
-
-CORE_ONLY = 0      # if true, don't build any of the above
-
-PREP_ONLY = 0      # Only run the prepatory steps, not the actual build.
-
-USE_SWIG = 0       # Should we actually execute SWIG, or just use the
-                   # files already in the distribution?
-
-UNICODE = 0        # This will pass the 'wxUSE_UNICODE' flag to SWIG and
-                   # will ensure that the right headers are found and the
-                   # right libs are linked.
 
 
-IN_CVS_TREE = 1    # Set to true if building in a full wxWindows CVS
-                   # tree, or the new style of a full wxPythonSrc tarball.
-                   # wxPython used to be distributed as a separate source
-                   # tarball without the wxWindows but with a copy of the
-                   # needed contrib code.  That's no longer the case and so
-                   # this setting is now defaulting to true.  Eventually it
-                   # should be removed entirly.
+import sys, os
 
 
-UNDEF_NDEBUG = 1   # Python 2.2 on Unix/Linux by default defines NDEBUG,
-                   # and distutils will pick this up and use it on the
-                   # compile command-line for the extensions.  This could
-                   # conflict with how wxWindows was built.  If NDEBUG is
-                   # set then wxWindows' __WXDEBUG__ setting will be turned
-                   # off.  If wxWindows was actually built with it turned
-                   # on then you end up with mismatched class structures,
-                   # and wxPython will crash.
 
 
-NO_SCRIPTS = 0     # Don't install the tool scripts
+# 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 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.
 
 
-WX_CONFIG = None   # Usually you shouldn't need to touch this, but you can set
-                   # it to pass an alternate version of wx-config or alternate
-                   # flags, eg. as required by the .deb in-tree build.  By
-                   # default a wx-config command will be assembled based on
-                   # version, port, etc. and it will be looked for on the
-                   # default $PATH.
+# 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.
 
 
-WXPORT = 'gtk'     # On Linux/Unix there are several ports of wxWindows available.
-                   # Setting this value lets you select which will be used for
-                   # the wxPython build.  Possibilites are 'gtk', 'gtk2' and
-                   # 'x11'.  Curently only gtk and gtk2 works.
+# 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 here in this script, so make sure to
+# remove the build_options.py file, so that config.py will recreate it.
 
 
-BUILD_BASE = "build"       # Directory to use for temporary build files.
+for bo_name in ["build_options.py", "build_options.pyc"]:
+    if os.path.exists(bo_name):
+        os.remove(bo_name)
 
 
-
-
-# Some MSW build settings
-
-FINAL = 0          # Mirrors use of same flag in wx makefiles,
-                   # (0 or 1 only) should probably find a way to
-                   # autodetect this...
-
-HYBRID = 1         # 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.)
-
-WXDLLVER = '250'   # Version part of wxWindows DLL name
-
-
-#----------------------------------------------------------------------
-
-def msg(text):
-    if __name__ == "__main__":
-        print text
-
-
-def opj(*args):
-    path = apply(os.path.join, args)
-    return os.path.normpath(path)
-
-
-def libFlag():
-    if FINAL:
-        rv = ''
-    elif HYBRID:
-        rv = 'h'
-    else:
-        rv = 'd'
-    if UNICODE:
-        rv = 'u' + rv
-    return rv
+sys.setup_is_main =  __name__ == "__main__"  # an icky hack!
+from config import *
 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
-# Some other globals
+# Update the packaged config file.
 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
 
-PKGDIR = 'wxPython'
-wxpExtensions = []
-DATA_FILES = []
-
-force = '--force' in sys.argv or '-f' in sys.argv
-debug = '--debug' in sys.argv or '-g' in sys.argv
-
-# change the PORT default for wxMac
-if sys.platform[:6] == "darwin":
-    WXPORT = 'mac'
-
-# and do the same for wxMSW, just for consistency
-if os.name == 'nt':
-    WXPORT = 'msw'
-
+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')
 
 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
-# Check for build flags on the command line
+# Update the version file
 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
 
-# Boolean (int) flags
-for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
-             'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN',
-             'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE',
-             'UNDEF_NDEBUG', 'NO_SCRIPTS',
-             'FINAL', 'HYBRID', ]:
-    for x in range(len(sys.argv)):
-        if sys.argv[x].find(flag) == 0:
-            pos = sys.argv[x].find('=') + 1
-            if pos > 0:
-                vars()[flag] = eval(sys.argv[x][pos:])
-                sys.argv[x] = ''
-
-# String options
-for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT']:
-    for x in range(len(sys.argv)):
-        if sys.argv[x].find(option) == 0:
-            pos = sys.argv[x].find('=') + 1
-            if pos > 0:
-                vars()[option] = sys.argv[x][pos:]
-                sys.argv[x] = ''
-
-sys.argv = filter(None, sys.argv)
-
+# The version file is unconditionally updated every time setup.py is
+# run since the version string can change based on the UNICODE flag
 
 
-#----------------------------------------------------------------------
-# some helper functions
-#----------------------------------------------------------------------
+open('wx/__version__.py', 'w').write("""\
+# This file was generated by setup.py...
 
 
-def Verify_WX_CONFIG():
-    """ Called below for the builds that need wx-config,
-        if WX_CONFIG is not set then tries to select the specific
-        wx*-config script based on build options.  If not found
-        then it defaults to 'wx-config'.
-    """
-    # if WX_CONFIG hasn't been set to an explicit value then construct one.
-    global WX_CONFIG
-    if WX_CONFIG is None:
-        if debug:             # TODO: Fix this.  wxPython's --debug shouldn't be tied to wxWindows...
-            df = 'd'
-        else:
-            df = ''
-        if UNICODE:
-            uf = 'u'
-        else:
-            uf = ''
-        ver2 = "%s.%s" % (VER_MAJOR, VER_MINOR)
-        WX_CONFIG = 'wx%s%s%s-%s-config' % (WXPORT, uf, df, ver2)
-
-        searchpath = os.environ["PATH"]
-        for p in searchpath.split(':'):
-            fp = os.path.join(p, WX_CONFIG)
-            if os.path.exists(fp) and os.access(fp, os.X_OK):
-                # success
-                msg("Found wx-config: " + fp)
-                WX_CONFIG = fp
-                break
-        else:
-            msg("WX_CONFIG not specified and %s not found on $PATH "
-                  "defaulting to \"wx-config\"" % WX_CONFIG)
-            WX_CONFIG = 'wx-config'
-
-
-
-def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=[]):
-    """Run SWIG the way I want it done"""
-    if not os.path.exists(os.path.join(dir, gendir)):
-        os.mkdir(os.path.join(dir, gendir))
-
-    sources = []
-
-    for file in files:
-        basefile = os.path.splitext(file)[0]
-        i_file   = os.path.join(dir, file)
-        py_file  = os.path.join(dir, gendir, basefile+'.py')
-        cpp_file = os.path.join(dir, gendir, basefile+'.cpp')
-
-        sources.append(cpp_file)
-
-        if USE_SWIG:
-            for dep in swig_deps:
-                if newer(dep, py_file) or newer(dep, cpp_file):
-                    force = 1
-                    break
-
-            if force or newer(i_file, py_file) or newer(i_file, cpp_file):
-                # we need forward slashes here even on win32
-                cpp_file = '/'.join(cpp_file.split('\\'))
-                i_file = '/'.join(i_file.split('\\'))
-
-                cmd = ['./wxSWIG/wxswig'] + swig_args + ['-I'+dir, '-c', '-o', cpp_file, i_file]
-                msg(' '.join(cmd))
-                spawn(cmd)
-
-        # copy the generated python file to the package directory
-        copy_file(py_file, package, update=not force, verbose=0)
-
-    return sources
-
-
-
-def contrib_copy_tree(src, dest, verbose=0):
-    """Update local copies of wxWindows contrib files"""
-    from distutils.dir_util import mkpath, copy_tree
-
-    mkpath(dest, verbose=verbose)
-    copy_tree(src, dest, update=1, verbose=verbose)
-
-
-
-class smart_install_data(install_data):
-    def run(self):
-        #need to change self.install_dir to the actual library dir
-        install_cmd = self.get_finalized_command('install')
-        self.install_dir = getattr(install_cmd, 'install_lib')
-        return install_data.run(self)
-
-
-def build_locale_dir(destdir, verbose=1):
-    """Build a locale dir under the wxPython package for MSW"""
-    moFiles = glob.glob(opj(WXDIR, 'locale', '*.mo'))
-    for src in moFiles:
-        lang = os.path.splitext(os.path.basename(src))[0]
-        dest = opj(destdir, lang, 'LC_MESSAGES')
-        mkpath(dest, verbose=verbose)
-        copy_file(src, opj(dest, 'wxstd.mo'), update=1, verbose=verbose)
-
-
-def build_locale_list(srcdir):
-    # get a list of all files under the srcdir, to be used for install_data
-    def walk_helper(lst, dirname, files):
-        for f in files:
-            filename = opj(dirname, f)
-            if not os.path.isdir(filename):
-                lst.append( (dirname, [filename]) )
-    file_list = []
-    os.path.walk(srcdir, walk_helper, file_list)
-    return file_list
-
-
-def find_data_files(srcdir, *wildcards):
-    # get a list of all files under the srcdir matching wildcards,
-    # returned in a format to be used for install_data
+VERSION_STRING  = '%(VERSION)s'
+MAJOR_VERSION   = %(VER_MAJOR)s
+MINOR_VERSION   = %(VER_MINOR)s
+RELEASE_VERSION = %(VER_RELEASE)s
+SUBREL_VERSION  = %(VER_SUBREL)s
 
 
-    def walk_helper(arg, dirname, files):
-        names = []
-        lst, wildcards = arg
-        for wc in wildcards:
-            for f in files:
-                filename = opj(dirname, f)
-                if fnmatch.fnmatch(filename, wc) and not os.path.isdir(filename):
-                    names.append(filename)
-        if names:
-            lst.append( (dirname, names ) )
+VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION,
+           SUBREL_VERSION, '%(VER_FLAGS)s')
 
 
-    file_list = []
-    os.path.walk(srcdir, walk_helper, (file_list, wildcards))
-    return file_list
+RELEASE_NUMBER = RELEASE_VERSION  # for compatibility
+""" % globals())
 
 
+CLEANUP.append('wx/__version__.py')
 
 
-def makeLibName(name):
-    if os.name == 'posix':
-        libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE)
-    else:
-        raise NotImplementedError
-
-    return [libname]
-
-
-
-def adjustCFLAGS(cflags, defines, includes):
-    '''Extrace the raw -I, -D, and -U flags and put them into
-       defines and includes as needed.'''
-    newCFLAGS = []
-    for flag in cflags:
-        if flag[:2] == '-I':
-            includes.append(flag[2:])
-        elif flag[:2] == '-D':
-            flag = flag[2:]
-            if flag.find('=') == -1:
-                defines.append( (flag, None) )
-            else:
-                defines.append( tuple(flag.split('=')) )
-        elif flag[:2] == '-U':
-            defines.append( (flag[2:], ) )
-        else:
-            newCFLAGS.append(flag)
-    return newCFLAGS
-
-
-
-def adjustLFLAGS(lfags, libdirs, libs):
-    '''Extrace the -L and -l flags and put them in libdirs and libs as needed'''
-    newLFLAGS = []
-    for flag in lflags:
-        if flag[:2] == '-L':
-            libdirs.append(flag[2:])
-        elif flag[:2] == '-l':
-            libs.append(flag[2:])
-        else:
-            newLFLAGS.append(flag)
-
-    return newLFLAGS
 
 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
-# sanity checks
-
-if CORE_ONLY:
-    BUILD_GLCANVAS = 0
-    BUILD_OGL = 0
-    BUILD_STC = 0
-    BUILD_XRC = 0
-    BUILD_GIZMOS = 0
-    BUILD_DLLWIDGET = 0
-    BUILD_IEWIN = 0
-
-if debug:
-    FINAL  = 0
-    HYBRID = 0
+# Write the SWIG version to a header file
+#----------------------------------------------------------------------
 
 
-if FINAL:
-    HYBRID = 0
+if USE_SWIG:
+    try:
+        SVER = swig_version()
+        open('include/wx/wxPython/swigver.h', 'w').write('''\
+// This file was generated by setup.py
 
 
-if UNICODE and WXPORT not in ['msw', 'gtk2']:
-    raise SystemExit, "UNICODE mode not currently supported on this WXPORT: "+WXPORT
+#define wxPy_SWIG_VERSION "SWIG-%s"
+''' % SVER)
+        msg('Using SWIG-' + SVER)
+    except:
+        msg('\nUnable to get SWIG version number\n')
+        
 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
-# Setup some platform specific stuff
+# patch distutils if it can't cope with the "classifiers" or
+# "download_url" keywords 
 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
 
-if os.name == 'nt':
-    # Set compile flags and such for MSVC.  These values are derived
-    # from the wxWindows makefiles for MSVC, other compilers settings
-    # will probably vary...
-    if os.environ.has_key('WXWIN'):
-        WXDIR = os.environ['WXWIN']
-    else:
-        msg("WARNING: WXWIN not set in environment.")
-        WXDIR = '..'  # assumes in CVS tree
-    WXPLAT = '__WXMSW__'
-    GENDIR = 'msw'
-
-    includes = ['src',
-                opj(WXDIR, 'lib', 'mswdll' + libFlag()),
-                opj(WXDIR, 'include'),
-                ]
-
-    defines = [ ('WIN32', None),
-                ('__WIN32__', None),
-                ('_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 UNDEF_NDEBUG:
-        defines.append( ('NDEBUG',) )  # using a 1-tuple makes it do an undef
-
-
-    if not FINAL or HYBRID:
-        defines.append( ('__WXDEBUG__', None) )
-
-    libdirs = [ opj(WXDIR, 'lib') ]
-    wxdll = 'wxmsw' + WXDLLVER + libFlag()
-    libs = [ wxdll ]
-
-    libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
-            'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32',
-            'odbc32', 'ole32', 'oleaut32', 'uuid', 'rpcrt4',
-            'advapi32', 'wsock32']
-
-
-    cflags = [ '/Gy',
-             # '/GX-'  # workaround for internal compiler error in MSVC on some machines
-             ]
-    lflags = None
-
-    # Other MSVC flags...
-    # Too bad I don't remember why I was playing with these, can they be removed?
-    if FINAL:
-        pass #cflags = cflags + ['/O1']
-    elif HYBRID :
-        pass #cflags = cflags + ['/Ox']
-    else:
-        pass # cflags = cflags + ['/Od', '/Z7']
-             # lflags = ['/DEBUG', ]
-
-
+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
 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
 
-elif os.name == 'posix':
-    WXDIR = '..'              # assumes IN_CVS_TREE
-    includes = ['src']
-    defines = [('SWIG_GLOBAL', None),
-               ('HAVE_CONFIG_H', None),
-               ('WXP_USE_THREAD', '1'),
-               ]
-    if UNDEF_NDEBUG:
-        defines.append( ('NDEBUG',) )  # using a 1-tuple makes it do an undef
-
-    Verify_WX_CONFIG()
-
-    libdirs = []
-    libs = []
-
-    cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1]
-    cflags = cflags.split()
-    if debug:
-        cflags.append('-g')
-        cflags.append('-O0')
-
-    lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
-    lflags = lflags.split()
+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',
+                          'src/_swigtype.i',
+                          ],
+                        True)
 
 
-    WXBASENAME = os.popen(WX_CONFIG + ' --basename').read()[:-1]
-    WXRELEASE  = os.popen(WX_CONFIG + ' --release').read()[:-1]
-    WXPREFIX   = os.popen(WX_CONFIG + ' --prefix').read()[:-1]
+copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
+CLEANUP.append(opj(PKGDIR, '__init__.py'))
 
 
 
 
-    if sys.platform[:6] == "darwin":
-        # Flags and such for a Darwin (Max OS X) build of Python
-        WXPLAT = '__WXMAC__'
-        GENDIR = 'mac'
-        libs = ['stdc++']
-        NO_SCRIPTS = 1
+# 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')
 
 
 
 
-    else:
-        # Set flags for other Unix type platforms
-        GENDIR = WXPORT
-
-        if WXPORT == 'gtk':
-            WXPLAT = '__WXGTK__'
-            portcfg = os.popen('gtk-config --cflags', 'r').read()[:-1]
-        elif WXPORT == 'gtk2':
-            WXPLAT = '__WXGTK__'
-            GENDIR = 'gtk' # no code differences so use the same generated sources
-            portcfg = os.popen('pkg-config gtk+-2.0 --cflags', 'r').read()[:-1]
-            BUILD_BASE = BUILD_BASE + '-' + WXPORT
-        elif WXPORT == 'x11':
-            WXPLAT = '__WXX11__'
-            portcfg = ''
-            BUILD_BASE = BUILD_BASE + '-' + WXPORT
-        else:
-            raise SystemExit, "Unknown WXPORT value: " + WXPORT
-
-        cflags += portcfg.split()
-
-        # Some distros (e.g. Mandrake) put libGLU in /usr/X11R6/lib, but
-        # wx-config doesn't output that for some reason.  For now, just
-        # add it unconditionally but we should really check if the lib is
-        # really found there or wx-config should be fixed.
-        libdirs.append("/usr/X11R6/lib")
-
-
-    # Move the various -I, -D, etc. flags we got from the *config scripts
-    # into the distutils lists.
-    cflags = adjustCFLAGS(cflags, defines, includes)
-    lflags = adjustLFLAGS(lflags, libdirs, libs)
+if os.name == 'nt':
+    build_locale_dir(opj(PKGDIR, 'locale'))
+    DATA_FILES += build_locale_list(opj(PKGDIR, 'locale'))
 
 
 
 
-#----------------------------------------------------------------------
+if os.name == 'nt':
+    rc_file = ['src/wxc.rc']
 else:
 else:
-    raise 'Sorry Charlie, platform not supported...'
+    rc_file = []
 
 
 
 
-#----------------------------------------------------------------------
-# post platform setup checks and tweaks, create the full version string
-#----------------------------------------------------------------------
+ext = Extension('_core_', ['src/helpers.cpp',
+                           ] + rc_file + swig_sources,
 
 
-if UNICODE:
-    BUILD_BASE = BUILD_BASE + '.unicode'
-    VER_FLAGS += 'u'
+                include_dirs = includes,
+                define_macros = defines,
 
 
+                library_dirs = libdirs,
+                libraries = libs,
 
 
-VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
-                             VER_SUBREL, VER_FLAGS)
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
 
 
-#----------------------------------------------------------------------
-# Update the version file
-#----------------------------------------------------------------------
+                **depends
+                )
+wxpExtensions.append(ext)
 
 
-# Unconditionally updated since the version string can change based
-# on the UNICODE flag
-open('src/__version__.py', 'w').write("""\
-# This file was generated by setup.py...
 
 
-wxVERSION_STRING  = '%(VERSION)s'
-wxMAJOR_VERSION   = %(VER_MAJOR)s
-wxMINOR_VERSION   = %(VER_MINOR)s
-wxRELEASE_VERSION = %(VER_RELEASE)s
-wxSUBREL_VERSION  = %(VER_SUBREL)s
 
 
-wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION,
-             wxSUBREL_VERSION, '%(VER_FLAGS)s')
-
-wxRELEASE_NUMBER = wxRELEASE_VERSION  # for compatibility
-""" % globals())
 
 
 
 
+# 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',
+                         'src/_renderer.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)
 
 
 
 
-#----------------------------------------------------------------------
-# SWIG defaults
-#----------------------------------------------------------------------
 
 
-swig_force = force
-swig_args = ['-c++', '-shadow', '-python', '-keyword',
-             '-dnone',
-             #'-dascii',
-             #'-docstring', '-Sbefore',
-             '-I./src', '-D'+WXPLAT,
-             ]
-if UNICODE:
-    swig_args.append('-DwxUSE_UNICODE')
 
 
-swig_deps = ['src/my_typemaps.i']
 
 
 
 
-#----------------------------------------------------------------------
-# Define the CORE extension module
-#----------------------------------------------------------------------
+# 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)
 
 
-msg('Preparing CORE...')
-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', 'utils.i', 'fonts.i'
-               ]
 
 
-swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
-                        USE_SWIG, swig_force, swig_args, swig_deps)
 
 
-copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
-copy_file('src/__version__.py', PKGDIR, 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',
+                          'src/_hyperlink.i',
+                          'src/_picker.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 IN_CVS_TREE:   # 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)
 
 
 
 
-if os.name == 'nt':
-    build_locale_dir(opj(PKGDIR, 'locale'))
-    DATA_FILES += build_locale_list(opj(PKGDIR, 'locale'))
 
 
+# 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',
+                          'src/_power.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)
 
 
-if os.name == 'nt':
-    rc_file = ['src/wxc.rc']
-else:
-    rc_file = []
 
 
 
 
-ext = Extension('wxc', ['src/helpers.cpp',
-                        'src/drawlist.cpp',
-                        'src/libpy.c',
-                        ] + rc_file + swig_sources,
+##
+## Core modules that are not in the "core" namespace start here
+##
 
 
-                include_dirs = includes,
+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,
                 define_macros = defines,
-
                 library_dirs = libdirs,
                 libraries = libs,
                 library_dirs = libdirs,
                 libraries = libs,
-
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
+                **depends
                 )
 wxpExtensions.append(ext)
 
 
                 )
 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)
 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,
                 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)
 
 
-# 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)
                         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,
                 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)
 
 
-# Extension for the calendar module
-swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
+mediaLibs = libs[:]
+if not MONOLITHIC:
+    mediaLibs += makeLibName('media')
+swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
                         USE_SWIG, swig_force, swig_args, swig_deps)
-ext = Extension('calendarc', swig_sources,
+ext = Extension('_media', swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
-                libraries = libs,
+                libraries = mediaLibs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
+                **depends
                 )
 wxpExtensions.append(ext)
 
 
                 )
 wxpExtensions.append(ext)
 
 
-# Extension for the help module
-swig_sources = run_swig(['help.i'], 'src', GENDIR, PKGDIR,
+swig_sources = run_swig(['webkit.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
                         USE_SWIG, swig_force, swig_args, swig_deps)
-ext = Extension('helpc', swig_sources,
+ext = Extension('_webkit', 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
                 )
 wxpExtensions.append(ext)
 
 
                 )
 wxpExtensions.append(ext)
 
 
-# Extension for the wizard module
+
 swig_sources = run_swig(['wizard.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 swig_sources = run_swig(['wizard.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
-ext = Extension('wizardc', 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,
                 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)
 
 
+
+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)
+
+
+
+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
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Define the GLCanvas extension module
 #----------------------------------------------------------------------
@@ -716,26 +486,24 @@ wxpExtensions.append(ext)
 if BUILD_GLCANVAS:
     msg('Preparing GLCANVAS...')
     location = 'contrib/glcanvas'
 if BUILD_GLCANVAS:
     msg('Preparing GLCANVAS...')
     location = 'contrib/glcanvas'
-    swig_files = ['glcanvas.i']
-    other_sources = []
 
 
-    swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
+    swig_sources = run_swig(['glcanvas.i'], location, GENDIR, PKGDIR,
                             USE_SWIG, swig_force, swig_args, swig_deps)
 
     gl_libs = []
     if os.name == 'posix':
                             USE_SWIG, swig_force, swig_args, swig_deps)
 
     gl_libs = []
     if os.name == 'posix':
-        gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
-        gl_lflags = gl_config.split() + lflags
+        gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
+        gl_lflags = gl_config.split()
         gl_libs = libs
         gl_libs = libs
+        
     else:
     else:
-        other_sources = [opj(location, 'msw/myglcanvas.cpp')]
-        gl_libs = libs + ['opengl32', 'glu32']
+        gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         gl_lflags = lflags
 
         gl_lflags = lflags
 
-    ext = Extension('glcanvasc',
-                    swig_sources + other_sources,
+    ext = Extension('_glcanvas',
+                    swig_sources,
 
 
-                    include_dirs = includes,
+                    include_dirs = includes + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
                     define_macros = defines,
 
                     library_dirs = libdirs,
@@ -756,16 +524,19 @@ if BUILD_OGL:
     msg('Preparing OGL...')
     location = 'contrib/ogl'
 
     msg('Preparing OGL...')
     location = 'contrib/ogl'
 
-    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)
+    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,
+                              ])
 
 
-    ext = Extension('oglc',
+    ext = Extension('_ogl',
                     swig_sources,
 
                     swig_sources,
 
-                    include_dirs =  includes,
+                    include_dirs =  includes + [ location ] + CONTRIBS_INC,
                     define_macros = defines + [('wxUSE_DEPRECATED', '0')],
 
                     library_dirs = libdirs,
                     define_macros = defines + [('wxUSE_DEPRECATED', '0')],
 
                     library_dirs = libdirs,
@@ -786,9 +557,12 @@ if BUILD_OGL:
 if BUILD_STC:
     msg('Preparing STC...')
     location = 'contrib/stc'
 if BUILD_STC:
     msg('Preparing STC...')
     location = 'contrib/stc'
-    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 this to the stc.bkl...
+## 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
 
 ##         # 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
@@ -804,19 +578,19 @@ if BUILD_STC:
 ##             os.chdir(cwd)
 
 
 ##             os.chdir(cwd)
 
 
-    swig_files = ['stc_.i']
-    swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
+    swig_sources = run_swig(['stc.i'], location, GENDIR, PKGDIR,
                             USE_SWIG, swig_force,
                             swig_args + ['-I'+STC_H, '-I'+location],
                             USE_SWIG, swig_force,
                             swig_args + ['-I'+STC_H, '-I'+location],
-                            [opj(STC_H, 'stc.h')] + swig_deps)
+                            [opj(STC_H, 'stc.h'),
+                             opj(location, "_stc_utf8_methods.py"),
+                             opj(location, "_stc_docstrings.i"),
+                             opj(location, "_stc_gendocs.i"),
+                             ] + swig_deps)
 
 
-    # copy a contrib project specific py module to the main package dir
-    copy_file(opj(location, 'stc.py'), PKGDIR, update=1, verbose=0)
-
-    ext = Extension('stc_c',
+    ext = Extension('_stc',
                     swig_sources,
 
                     swig_sources,
 
-                    include_dirs = includes,
+                    include_dirs = includes + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
                     define_macros = defines,
 
                     library_dirs = libdirs,
@@ -829,26 +603,27 @@ if BUILD_STC:
     wxpExtensions.append(ext)
 
 
     wxpExtensions.append(ext)
 
 
-
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
-# Define the IEWIN extension module (experimental)
+# Define the ACTIVEX extension module (experimental)
 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
 
-if BUILD_IEWIN:
-    msg('Preparing IEWIN...')
-    location = 'contrib/iewin'
+if BUILD_ACTIVEX:
+    msg('Preparing ACTIVEX...')
+    location = 'contrib/activex'
+    axloc = opj(location, "wxie")
 
 
-    swig_files = ['iewin.i', ]
+    swig_files = ['activex.i', ]
 
     swig_sources = run_swig(swig_files, location, '', PKGDIR,
 
     swig_sources = run_swig(swig_files, location, '', PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
+                            USE_SWIG, swig_force, swig_args, swig_deps +
+                            [ '%s/_activex_ex.py' % location])
 
 
 
 
-    ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location,
-                               '%s/wxactivex.cpp' % location,
-                             ] + swig_sources,
+    ext = Extension('_activex', ['%s/IEHtmlWin.cpp' % axloc,
+                                 '%s/wxactivex.cpp' % axloc,
+                                 ] + swig_sources,
 
 
-                    include_dirs =  includes,
+                    include_dirs =  includes + [ axloc ],
                     define_macros = defines,
 
                     library_dirs = libdirs,
                     define_macros = defines,
 
                     library_dirs = libdirs,
@@ -862,25 +637,24 @@ if BUILD_IEWIN:
 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
-# Define the XRC extension module
+# Define the GIZMOS  extension module
 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
 
-if BUILD_XRC:
-    msg('Preparing XRC...')
-    location = 'contrib/xrc'
+if BUILD_GIZMOS:
+    msg('Preparing GIZMOS...')
+    location = 'contrib/gizmos'
 
 
-    swig_files = ['xrc.i']
-    swig_sources = run_swig(swig_files, location, '', PKGDIR,
+    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)
 
-    ext = Extension('xrcc',
-                    swig_sources,
+    ext = Extension('_gizmos',
+                    [ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources,
 
 
-                    include_dirs =  includes,
+                    include_dirs =  includes + [ location, opj(location, 'wxCode/include') ] + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
                     define_macros = defines,
 
                     library_dirs = libdirs,
-                    libraries = libs + makeLibName('xrc'),
+                    libraries = libs + makeLibName('gizmos'),
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
@@ -889,27 +663,25 @@ if BUILD_XRC:
     wxpExtensions.append(ext)
 
 
     wxpExtensions.append(ext)
 
 
-
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
-# Define the GIZMOS  extension module
+# Define the ANIMATE  extension module
 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
 
-if BUILD_GIZMOS:
-    msg('Preparing GIZMOS...')
-    location = 'contrib/gizmos'
+if BUILD_ANIMATE:
+    msg('Preparing ANIMATE...')
+    location = 'contrib/animate'
 
 
-    swig_files = ['gizmos.i']
-    swig_sources = run_swig(swig_files, location, '', PKGDIR,
+    swig_sources = run_swig(['animate.i'], location, GENDIR, PKGDIR,
                             USE_SWIG, swig_force, swig_args, swig_deps)
 
                             USE_SWIG, swig_force, swig_args, swig_deps)
 
-    ext = Extension('gizmosc',
-                    [ '%s/treelistctrl.cpp' % location ] + swig_sources,
+    ext = Extension('_animate',
+                    swig_sources,
 
 
-                    include_dirs =  includes,
+                    include_dirs =  includes + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
                     define_macros = defines,
 
                     library_dirs = libdirs,
-                    libraries = libs + makeLibName('gizmos'),
+                    libraries = libs + makeLibName('animate'),
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
@@ -933,12 +705,13 @@ if BUILD_DLLWIDGET:
 
     # copy a contrib project specific py module to the main package dir
     copy_file(opj(location, 'dllwidget.py'), PKGDIR, update=1, verbose=0)
 
     # 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,
 
 
     ext = Extension('dllwidget_c', [
                                 '%s/dllwidget.cpp' % location,
                              ] + swig_sources,
 
-                    include_dirs =  includes,
+                    include_dirs =  includes + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
                     define_macros = defines,
 
                     library_dirs = libdirs,
@@ -952,9 +725,9 @@ if BUILD_DLLWIDGET:
 
 
 
 
 
 
-
+    
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
-# Tools and scripts
+# Tools, scripts data files, etc.
 #----------------------------------------------------------------------
 
 if NO_SCRIPTS:
 #----------------------------------------------------------------------
 
 if NO_SCRIPTS:
@@ -962,71 +735,136 @@ 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('wxPython/tools/XRCed', '*.txt', '*.xrc')
-DATA_FILES += find_data_files('wxPython/py', '*.txt', '*.ico', '*.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')
 
 
 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))
+
+
+
+if INSTALL_MULTIVERSION:
+    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:
+    EXTRA_PATH = None
+       
+
+
 #----------------------------------------------------------------------
 # Do the Setup/Build/Install/Whatever
 #----------------------------------------------------------------------
 
 if __name__ == "__main__":
     if not PREP_ONLY:
 #----------------------------------------------------------------------
 # Do the Setup/Build/Install/Whatever
 #----------------------------------------------------------------------
 
 if __name__ == "__main__":
     if not PREP_ONLY:
-        setup(name             = PKGDIR,
+        
+        setup(name             = 'wxPython',
               version          = VERSION,
               description      = DESCRIPTION,
               long_description = LONG_DESCRIPTION,
               author           = AUTHOR,
               author_email     = AUTHOR_EMAIL,
               url              = URL,
               version          = VERSION,
               description      = DESCRIPTION,
               long_description = LONG_DESCRIPTION,
               author           = AUTHOR,
               author_email     = AUTHOR_EMAIL,
               url              = URL,
+              download_url     = DOWNLOAD_URL,
               license          = LICENSE,
               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',
 
               packages = ['wxPython',
                           'wxPython.lib',
                           'wxPython.lib.colourchooser',
                           'wxPython.lib.editor',
                           'wxPython.lib.mixins',
-                          'wxPython.lib.PyCrust',
-                          'wxPython.py',
-                          'wxPython.py.wxd',
                           'wxPython.tools',
                           'wxPython.tools',
-                          'wxPython.tools.XRCed',
 
                           'wx',
 
                           'wx',
+                          'wx.build',
                           'wx.lib',
                           'wx.lib',
+                          'wx.lib.analogclock',
+                          'wx.lib.analogclock.lib_setup',
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           '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,
 
-              options = { 'build' : { 'build_base' : BUILD_BASE }},
-
-              scripts = SCRIPTS,
+              options = { 'build'            : { 'build_base' : BUILD_BASE },
+                          },
 
 
-              cmdclass = { 'install_data': smart_install_data},
+              scripts =    SCRIPTS,
               data_files = DATA_FILES,
               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,
+                               },
+                  )
+            
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
wxWidgets (Impactor)