Noted where the documentation was

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index d1f624e9a88c307328bd6ba001d1cbe962cff744..2f945984d7bd6c157f0da7d14f8bd82ea3cf01d6 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -1,60 +1,87 @@
 #!/usr/bin/env python
 #----------------------------------------------------------------------
 
 #!/usr/bin/env python
 #----------------------------------------------------------------------
 

-import sys, os, string, glob
+import sys, os, glob, fnmatch, tempfile

 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.core      import setup, Extension
 from distutils.file_util import copy_file
 from distutils.dir_util  import mkpath
 from distutils.dep_util  import newer

-
-from my_distutils import run_swig, contrib_copy_tree
+from distutils.spawn     import spawn
+from distutils.command.install_data import install_data

 
 #----------------------------------------------------------------------
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 # flags and values that affect this script
 #----------------------------------------------------------------------
 

-VERSION          = "2.3.3pre6"
+VER_MAJOR        = 2      # The first three must match wxWindows
+VER_MINOR        = 5
+VER_RELEASE      = 1
+VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWindows
+VER_FLAGS        = "p5"   # 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/"
 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)"
+DOWNLOAD_URL     = "http://wxPython.org/download.php"
+LICENSE          = "wxWindows Library License (LGPL derivative)"
+PLATFORMS        = "WIN32,OSX,POSIX"
+KEYWORDS         = "GUI,wx,wxWindows,cross-platform"
+

 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
 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 (and native runtime speed) on the platforms it is supported
+feel (by using the native widgets) on the platforms it is supported

 on.
 """
 
 on.
 """
 

+CLASSIFIERS      = """\
+Development Status :: 6 - Mature
+Environment :: MacOS X :: Carbon
+Environment :: Win32 (MS Windows)
+Environment :: X11 Applications :: GTK
+Intended Audience :: Developers
+License :: OSI Approved
+Operating System :: MacOS :: MacOS X
+Operating System :: Microsoft :: Windows :: Windows 95/98/2000
+Operating System :: POSIX
+Programming Language :: Python
+Topic :: Software Development :: User Interfaces
+"""
+
+## License :: OSI Approved :: wxWindows Library Licence
+
+
+# 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_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 = 1# Build a module that enables unknown wx widgets
+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)
                    # to be loaded from a DLL and to be used from Python.
 
                    # Internet Explorer wrapper (experimental)

-BUILD_IEWIN = (os.name == 'nt')
+BUILD_IEWIN = 0 #(os.name == 'nt')
+

 
 CORE_ONLY = 0      # if true, don't build any of the above
 
 
 CORE_ONLY = 0      # if true, don't build any of the above
 

-GL_ONLY = 0        # Only used when making the -gl RPM.  See the "b" script
-                   # for the ugly details
+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?
 
 
 USE_SWIG = 0       # Should we actually execute SWIG, or just use the
                    # files already in the distribution?
 

+SWIG = "swig"      # The swig executable to use.
+
+BUILD_RENAMERS = 1 # Should we build the renamer modules too?
+

 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.
 
 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 = 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
-

 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
 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


@@ -66,13 +93,21 @@ UNDEF_NDEBUG = 1   # Python 2.2 on Unix/Linux by default defines NDEBUG,
 
 NO_SCRIPTS = 0     # Don't install the tool scripts
 
 
 NO_SCRIPTS = 0     # Don't install the tool scripts
 

+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.
+
+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.
+
+BUILD_BASE = "build"       # Directory to use for temporary build files.

 
 

-WX_CONFIG = "wx-config"    # 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.

 
 

-BUILD_BASE = "build"

 
 # Some MSW build settings
 
 
 # Some MSW build settings
 


@@ -87,7 +122,8 @@ HYBRID = 1         # If set and not debug or FINAL, then build a
                    # wxWindows must have been built with /MD, not /MDd
                    # (using FINAL=hybrid will do it.)
 
                    # wxWindows must have been built with /MD, not /MDd
                    # (using FINAL=hybrid will do it.)
 

-WXDLLVER = '233'   # Version part of wxWindows DLL name
+                   # Version part of wxWindows LIB/DLL names
+WXDLLVER = '%d%d' % (VER_MAJOR, VER_MINOR)

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -118,20 +154,22 @@ def libFlag():
 # Some other globals
 #----------------------------------------------------------------------
 
 # Some other globals
 #----------------------------------------------------------------------
 

-PKGDIR = 'wxPython'
+PKGDIR = 'wx'

 wxpExtensions = []
 wxpExtensions = []

+DATA_FILES = []

 
 force = '--force' in sys.argv or '-f' in sys.argv
 debug = '--debug' in sys.argv or '-g' in sys.argv
 
 force = '--force' in sys.argv or '-f' in sys.argv
 debug = '--debug' in sys.argv or '-g' in sys.argv

+cleaning = 'clean' in sys.argv
+

 
 

-bcpp_compiling = '-c' in sys.argv and 'my_bcpp' in sys.argv # Bad heuristic
+# change the PORT default for wxMac
+if sys.platform[:6] == "darwin":
+    WXPORT = 'mac'

 
 

-if bcpp_compiling:
-    msg("Compiling wxPython by Borland C/C++ Compiler")
-    HYBRID=0
-    WXBCPPLIBVER = string.replace(WXDLLVER,"_","")
-    # Version part of BCPP build LIBRARY name
-    WXDLLVER="" # no dll ver path avaible
+# and do the same for wxMSW, just for consistency
+if os.name == 'nt':
+    WXPORT = 'msw'

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -141,21 +179,21 @@ if bcpp_compiling:
 # Boolean (int) flags
 for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
              'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN',
 # Boolean (int) flags
 for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
              'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN',

-             'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE',
-             'UNDEF_NDEBUG', 'NO_SCRIPTS',
+             'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
+             'UNDEF_NDEBUG', 'NO_SCRIPTS', 'BUILD_RENAMERS',

              'FINAL', 'HYBRID', ]:
     for x in range(len(sys.argv)):
              'FINAL', 'HYBRID', ]:
     for x in range(len(sys.argv)):

-        if string.find(sys.argv[x], flag) == 0:
-            pos = string.find(sys.argv[x], '=') + 1
+        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
             if pos > 0:
                 vars()[flag] = eval(sys.argv[x][pos:])
                 sys.argv[x] = ''
 
 # String options

-for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE']:
+for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'SWIG']:

     for x in range(len(sys.argv)):
     for x in range(len(sys.argv)):

-        if string.find(sys.argv[x], option) == 0:
-            pos = string.find(sys.argv[x], '=') + 1
+        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] = ''
             if pos > 0:
                 vars()[option] = sys.argv[x][pos:]
                 sys.argv[x] = ''


@@ -163,6 +201,212 @@ for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE']:
 sys.argv = filter(None, sys.argv)
 
 
 sys.argv = filter(None, sys.argv)
 
 

+#----------------------------------------------------------------------
+# some helper functions
+#----------------------------------------------------------------------
+
+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))
+
+    if not os.path.exists(os.path.join("docs", "xml-raw")):
+        os.mkdir(os.path.join("docs", "xml-raw"))
+
+    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+'_wrap.cpp')
+        xml_file = os.path.join("docs", "xml-raw", basefile+'_swig.xml')
+
+        sources.append(cpp_file)
+
+        if not cleaning and 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 = opj(cpp_file) #'/'.join(cpp_file.split('\\'))
+                #i_file = opj(i_file)     #'/'.join(i_file.split('\\'))
+
+                if BUILD_RENAMERS:
+                    #tempfile.tempdir = sourcePath
+                    xmltemp = tempfile.mktemp('.xml')
+                    
+                    # First run swig to produce the XML file, adding
+                    # an extra -D that prevents the old rename
+                    # directives from being used
+                    cmd = [ swig_cmd ] + swig_args + \
+                          [ '-DBUILDING_RENAMERS', '-xmlout', xmltemp ] + \
+                          ['-I'+dir, '-o', cpp_file, i_file]
+                    msg(' '.join(cmd))
+                    spawn(cmd)
+
+                    # Next run build_renamers to process the XML
+                    cmd = [ sys.executable, '-u',
+                            './distrib/build_renamers.py', dir, basefile, xmltemp] 
+                    msg(' '.join(cmd))
+                    spawn(cmd)
+                    os.remove(xmltemp)
+
+                # Then run swig for real
+                cmd = [ swig_cmd ] + swig_args + ['-I'+dir, '-o', cpp_file,
+                                                  '-xmlout', xml_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
+
+    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 ) )
+
+    file_list = []
+    os.path.walk(srcdir, walk_helper, (file_list, wildcards))
+    return file_list
+
+
+def makeLibName(name):
+    if os.name == 'posix':
+        libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE)
+    else:
+        libname = 'wxmsw%s%s_%s' % (WXDLLVER, libFlag(), name)
+
+    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
 
 #----------------------------------------------------------------------
 # sanity checks


@@ -176,15 +420,15 @@ if CORE_ONLY:
     BUILD_DLLWIDGET = 0
     BUILD_IEWIN = 0
 
     BUILD_DLLWIDGET = 0
     BUILD_IEWIN = 0
 

+if debug:
+    FINAL  = 0
+    HYBRID = 0

 
 

-if UNICODE and os.name != 'nt':
-    print "UNICODE is currently only supported on Win32"
-    sys.exit()
+if FINAL:
+    HYBRID = 0

 
 

-
-if UNICODE:
-    BUILD_BASE = BUILD_BASE + '.unicode'
-    VERSION = VERSION + 'u'
+if UNICODE and WXPORT not in ['msw', 'gtk2']:
+    raise SystemExit, "UNICODE mode not currently supported on this WXPORT: "+WXPORT

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -203,64 +447,41 @@ if os.name == 'nt':
     WXPLAT = '__WXMSW__'
     GENDIR = 'msw'
 
     WXPLAT = '__WXMSW__'
     GENDIR = 'msw'
 

-    if debug:
-        FINAL  = 0
-        HYBRID = 0
-
-    if HYBRID:
-        FINAL = 0
-
-    includes = ['src',
-                opj(WXDIR, 'lib', 'mswdll' + libFlag()),
+    includes = ['include', 'src',
+                opj(WXDIR, 'lib', 'vc_dll', 'msw'  + libFlag()),

                 opj(WXDIR, 'include'),
                 opj(WXDIR, 'include'),

+                opj(WXDIR, 'contrib', 'include'),

                 ]
 
                 ]
 

-    defines = [ ('WIN32', None),        # Some of these are no longer
-                ('__WIN32__', None),    # necessary.  Anybody know which?
+    defines = [ ('WIN32', None),

                 ('_WINDOWS', None),
                 ('_WINDOWS', None),

-                ('__WINDOWS__', None),
-                ('WINVER', '0x0400'),
-                ('__WIN95__', None),
-                ('STRICT', None),

 
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),
 
                 ('SWIG_GLOBAL', None),
 
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),
 
                 ('SWIG_GLOBAL', None),

-                ('HAVE_CONFIG_H', None),

                 ('WXP_USE_THREAD', '1'),
                 ]
 
                 ('WXP_USE_THREAD', '1'),
                 ]
 

-    if bcpp_compiling:  # overwrite it
-        defines = [
-            ('_WINDOWS', None),
-            ('WINVER', '0x0400'),
-            ('STRICT', None),
-
-            ('WXUSINGDLL', '1'),
-
-            ('SWIG_GLOBAL', None),
-            ('HAVE_CONFIG_H', None),
-            ('WXP_USE_THREAD', '1'),
-
-            ('WXUSE_DEFINE','1'),
-            ('_RTLDLL',None),
-            ]
+    if UNDEF_NDEBUG:
+        defines.append( ('NDEBUG',) )  # using a 1-tuple makes it do an undef

 
 
     if not FINAL or HYBRID:
         defines.append( ('__WXDEBUG__', None) )
 
 
 
     if not FINAL or HYBRID:
         defines.append( ('__WXDEBUG__', None) )
 

-    libdirs = [ opj(WXDIR, 'lib') ]
-    wxdll = 'wxmsw' + WXDLLVER + libFlag()
-    libs = [ wxdll ]
-
-    if bcpp_compiling:
-        libs = [ 'wx'+WXBCPPLIBVER ]
+    libdirs = [ opj(WXDIR, 'lib', 'vc_dll') ]
+    libs = [ 'wxbase' + WXDLLVER + libFlag(),  # TODO: trim this down to what is really needed for the core
+             'wxbase' + WXDLLVER + libFlag() + '_net',
+             'wxbase' + WXDLLVER + libFlag() + '_xml',
+             makeLibName('core')[0],
+             makeLibName('adv')[0],
+             makeLibName('html')[0],
+             ]

 
     libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
             'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32',
 
     libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
             'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32',

-            'ctl3d32', 'odbc32', 'ole32', 'oleaut32', 'uuid', 'rpcrt4',
+            'odbc32', 'ole32', 'oleaut32', 'uuid', 'rpcrt4',

             'advapi32', 'wsock32']
 
 
             'advapi32', 'wsock32']
 
 


@@ -269,256 +490,442 @@ if os.name == 'nt':
              ]
     lflags = None
 
              ]
     lflags = None
 

-
-    if bcpp_compiling:  # BCC flags
-        cflags = ['-5', '-VF',  ### To support MSVC spurious semicolons in the class scope
-                  ### else, all semicolons at the end of all DECLARE_...CALLBACK... macros must be eliminated
-                  '-Hc', '-H=' + opj(WXDIR, '\src\msw\wx32.csm'),
-                  '@' + opj(WXDIR, '\src\msw\wxwin32.cfg')
-                  ]
-        if not FINAL:
-            cflags = cflags + ['/Od', '/v', '/y']
-            lflags = lflags + ['/v', ]
-
-    else:  # MSVC flags
-        if FINAL:
-            pass #cflags = cflags + ['/O1']
-        elif HYBRID :
-            pass #cflags = cflags + ['/Ox']
-        else:
-            pass # cflags = cflags + ['/Od', '/Z7']
-                 # lflags = ['/DEBUG', ]
-
-
+    # 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', ]

 
 
 
 

-elif os.name == 'posix' and sys.platform[:6] == "darwin":
-    # Flags and such for a Darwin (Max OS X) build of Python

 
 

-    WXDIR = '..'              # assumes IN_CVS_TREE
-    WXPLAT = '__WXMAC__'
-    GENDIR = 'mac'
+#----------------------------------------------------------------------

 
 

-    includes = ['src']
+elif os.name == 'posix':
+    WXDIR = '..'      
+    includes = ['include', 'src']

     defines = [('SWIG_GLOBAL', None),
                ('HAVE_CONFIG_H', None),
                ('WXP_USE_THREAD', '1'),
                ]
     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]
     libdirs = []
     libs = []
 
     cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1]

-    cflags = string.split(cflags)
-    if UNDEF_NDEBUG:
-        cflags.append('-UNDEBUG')
+    cflags = cflags.split()
+    if debug:
+        cflags.append('-g')
+        cflags.append('-O0')
+    else:
+        cflags.append('-O3')

 
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
 
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]

-    lflags = string.split(lflags)
+    lflags = lflags.split()

 
 

-    NO_SCRIPTS = 1
+    WXBASENAME = os.popen(WX_CONFIG + ' --basename').read()[:-1]
+    WXRELEASE  = os.popen(WX_CONFIG + ' --release').read()[:-1]
+    WXPREFIX   = os.popen(WX_CONFIG + ' --prefix').read()[:-1]

 
 
 
 

-elif os.name == 'posix':
-    # Set flags for Unix type platforms
+    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

 
 

-    WXDIR = '..'              # assumes IN_CVS_TREE
-    WXPLAT = '__WXGTK__'      # and assumes GTK...
-    GENDIR = 'gtk'            # Need to allow for Motif eventually too

 
 

-    includes = ['src']
-    defines = [('SWIG_GLOBAL', None),
-               ('HAVE_CONFIG_H', None),
-               ('WXP_USE_THREAD', '1'),
-               ]
-    libdirs = []
-    libs = []
+    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 = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + \
-             os.popen('gtk-config --cflags', 'r').read()[:-1]
-    cflags = string.split(cflags)
-    if UNDEF_NDEBUG:
-        cflags.append('-UNDEBUG')
+        cflags += portcfg.split()

 
 

-    lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
-    lflags = string.split(lflags)
+        # 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")

 
 
 
 

-else:
-    raise 'Sorry Charlie...'
+    # 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)

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------

-# 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)
-
+else:
+    raise 'Sorry Charlie, platform not supported...'

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------

-# SWIG defaults
+# post platform setup checks and tweaks, create the full version string

 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
 

-swig_force = force
-swig_args = ['-c++', '-shadow', '-python', '-keyword',
-             '-dnone',
-             #'-dascii',
-             #'-docstring', '-Sbefore',
-             '-I./src', '-D'+WXPLAT,
-             ]

 if UNICODE:
 if UNICODE:

-    swig_args.append('-DwxUSE_UNICODE')
+    BUILD_BASE = BUILD_BASE + '.unicode'
+    VER_FLAGS += 'u'

 
 

-swig_deps = ['src/my_typemaps.i']

 
 

+VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
+                             VER_SUBREL, VER_FLAGS)

 
 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------

-# Define the CORE extension module
+# Update the version file

 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
 

-if not GL_ONLY:
-    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'
-                   ]
+# 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...

 
 

-    swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
+VERSION_STRING  = '%(VERSION)s'
+MAJOR_VERSION   = %(VER_MAJOR)s
+MINOR_VERSION   = %(VER_MINOR)s
+RELEASE_VERSION = %(VER_RELEASE)s
+SUBREL_VERSION  = %(VER_SUBREL)s

 
 

-    copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
-    copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
-    copy_file('src/wxc.pyd.manifest', PKGDIR, update=1, verbose=0)
+VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION,
+             SUBREL_VERSION, '%(VER_FLAGS)s')

 
 

-    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)
+RELEASE_NUMBER = RELEASE_VERSION  # for compatibility
+""" % globals())

 
 
 
 

-    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,
+#----------------------------------------------------------------------
+# SWIG defaults
+#----------------------------------------------------------------------

 
 

-                    include_dirs = includes,
-                    define_macros = defines,
+swig_cmd = SWIG
+swig_force = force
+swig_args = ['-c++',
+             '-Wall',
+             '-nodefault',

 
 

-                    library_dirs = libdirs,
-                    libraries = libs,
+##              '-xml',

 
 

-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-    wxpExtensions.append(ext)
+             '-python',
+             '-keyword',
+             '-new_repr',
+             '-modern',

 
 

+             '-I./src',
+             '-D'+WXPLAT,
+             '-noruntime'
+             ]
+if UNICODE:
+    swig_args.append('-DwxUSE_UNICODE')

 
 

-    # 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,
-                    include_dirs =  includes,
-                    define_macros = defines,
-                    library_dirs = libdirs,
-                    libraries = libs,
-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-    wxpExtensions.append(ext)
+swig_deps = [ 'src/my_typemaps.i',
+              'src/common.swg',
+              'src/pyrun.swg',
+              ]

 
 

+depends = [ #'include/wx/wxPython/wxPython.h',
+            #'include/wx/wxPython/wxPython_int.h',
+            #'src/pyclasses.h',
+            ]

 
 

-    # Extension for the html modules
-    swig_sources = run_swig(['html.i', 'htmlhelp.i'], 'src', GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
-    ext = Extension('htmlc', swig_sources,
-                    include_dirs =  includes,
-                    define_macros = defines,
-                    library_dirs = libdirs,
-                    libraries = libs,
-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-    wxpExtensions.append(ext)

 
 

+#----------------------------------------------------------------------
+# Define the CORE extension module
+#----------------------------------------------------------------------

 
 

-    # Extension for the calendar module
-    swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
-    ext = Extension('calendarc', swig_sources,
-                    include_dirs =  includes,
-                    define_macros = defines,
-                    library_dirs = libdirs,
-                    libraries = libs,
-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-    wxpExtensions.append(ext)
+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/_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',
+                          ])
+
+copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
+copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
+
+
+# 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)

 
 
 
 

-    # Extension for the help module
-    swig_sources = run_swig(['help.i'], 'src', GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
-    ext = Extension('helpc', swig_sources,
-                    include_dirs =  includes,
-                    define_macros = defines,
-                    library_dirs = libdirs,
-                    libraries = libs,
-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-    wxpExtensions.append(ext)
+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:
+    rc_file = []
+
+
+ext = Extension('_core', ['src/helpers.cpp',
+                          'src/libpy.c',
+                        ] + rc_file + swig_sources,
+
+                include_dirs = includes,
+                define_macros = defines,
+
+                library_dirs = libdirs,
+                libraries = libs,
+
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
+
+                depends = depends
+                )
+wxpExtensions.append(ext)
+
+
+
+
+
+# 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/_brush.i',
+                         'src/_colour.i',           'src/_cursor.i',
+                         'src/_dc.i',               'src/_font.i',
+                         'src/_gdiobj.i',           'src/_icon.i',
+                         'src/_imaglist.i',         'src/_pen.i',
+                         'src/_region.i',           'src/_palette.i',
+                         'src/_stockobjs.i',        
+                         'src/_effects.i',
+                          'src/_intl.i',
+                          'src/_intl_ex.py',
+                          ])
+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 = depends
+                )
+wxpExtensions.append(ext)
+
+
+
+
+
+
+# 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',
+                          ])
+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 = depends
+                )
+wxpExtensions.append(ext)
+
+
+
+
+# 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/_control.i',             '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',
+                          ])
+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 = depends
+                )
+wxpExtensions.append(ext)
+
+
+
+
+# Extension for the misc module
+swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps +
+                        [ '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/_wave.i',          'src/_mimetype.i',
+                          'src/_artprov.i',       'src/_config.i',
+                          'src/_datetime.i',      'src/_dataobj.i',
+                          'src/_dnd.i',
+                          'src/_clipbrd.i',
+                          ])
+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 = 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 = depends
+                )
+wxpExtensions.append(ext)
+
+
+swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps)
+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 = depends
+                )
+wxpExtensions.append(ext)
+
+
+
+swig_sources = run_swig(['html.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps)
+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 = depends
+                )
+wxpExtensions.append(ext)
+
+
+
+swig_sources = run_swig(['wizard.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps)
+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 = depends
+                )
+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)
-    ext = Extension('wizardc', swig_sources,
-                    include_dirs =  includes,
-                    define_macros = defines,
-                    library_dirs = libdirs,
-                    libraries = libs,
-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-    wxpExtensions.append(ext)

 
 
 #----------------------------------------------------------------------
 # Define the GLCanvas extension module
 #----------------------------------------------------------------------
 
 
 
 #----------------------------------------------------------------------
 # Define the GLCanvas extension module
 #----------------------------------------------------------------------
 

-CTRB_SRC =  opj(WXDIR, 'contrib/src')
-CTRB_INC =  opj(WXDIR, 'contrib/include/wx')
-
-if BUILD_GLCANVAS or GL_ONLY:
+if BUILD_GLCANVAS:

     msg('Preparing GLCANVAS...')
     location = 'contrib/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':
         gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
                             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 = string.split(gl_config) + lflags
+        gl_lflags = gl_config.split() + lflags

         gl_libs = libs
     else:
         gl_libs = libs
     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,
                     define_macros = defines,
 
                     include_dirs = includes,
                     define_macros = defines,


@@ -537,42 +944,27 @@ if BUILD_GLCANVAS or GL_ONLY:
 # Define the OGL extension module
 #----------------------------------------------------------------------
 
 # Define the OGL extension module
 #----------------------------------------------------------------------
 

-if not GL_ONLY and BUILD_OGL:
+if BUILD_OGL:

     msg('Preparing OGL...')
     location = 'contrib/ogl'
     msg('Preparing OGL...')
     location = 'contrib/ogl'

-    OGLLOC = opj(location, 'contrib/src/ogl')
-    OGLINC = opj(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, swig_deps)
-
-    if IN_CVS_TREE:
-        # make sure local copy of contrib files are up to date
-        contrib_copy_tree(opj(CTRB_INC, 'ogl'), opj(OGLINC, 'wx/ogl'))
-        contrib_copy_tree(opj(CTRB_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 ],
+                    define_macros = defines + [('wxUSE_DEPRECATED', '0')],

 
                     library_dirs = libdirs,
 
                     library_dirs = libdirs,

-                    libraries = libs,
+                    libraries = libs + makeLibName('ogl'),

 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,


@@ -586,106 +978,43 @@ if not GL_ONLY and BUILD_OGL:
 # Define the STC extension module
 #----------------------------------------------------------------------
 
 # Define the STC extension module
 #----------------------------------------------------------------------
 

-if not GL_ONLY and BUILD_STC:
+if BUILD_STC:

     msg('Preparing STC...')
     location = 'contrib/stc'
     msg('Preparing STC...')
     location = 'contrib/stc'

-    STCLOC = opj(location, 'contrib/src/stc')
-    STCINC = opj(location, 'contrib/include')
-    STC_H =  opj(location, 'contrib/include/wx/stc')
-
-    if IN_CVS_TREE:
-        # 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'))):
-
-            msg('Running gen_iface.py, regenerating stc.h and stc.cpp...')
-            cwd = os.getcwd()
-            os.chdir(opj(CTRB_SRC, 'stc'))
-            import gen_iface
-            gen_iface.main([])
-            os.chdir(cwd)
+    if os.name == 'nt':
+        STC_H = opj(WXDIR, 'contrib', 'include/wx/stc')
+    else:
+        STC_H = opj(WXPREFIX, 'include/wx/stc')

 
 

+## NOTE: need to add this to the stc.bkl...

 
 

-        # make sure local copy of contrib files are up to date
-        contrib_copy_tree(opj(CTRB_INC, 'stc'), opj(STCINC, 'wx/stc'))
-        contrib_copy_tree(opj(CTRB_SRC, 'stc'), STCLOC)
+##         # 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'))):

 
 

+##             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_files = ['stc_.i']
-    swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
+    swig_sources = run_swig(['stc.i'], location, '', PKGDIR,

                             USE_SWIG, swig_force,
                             swig_args + ['-I'+STC_H, '-I'+location],
                             [opj(STC_H, 'stc.h')] + swig_deps)
 
                             USE_SWIG, swig_force,
                             swig_args + ['-I'+STC_H, '-I'+location],
                             [opj(STC_H, 'stc.h')] + 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)
-
-    # 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) )
-    stc_defines.append( ('LINK_LEXERS', 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/DocumentAccessor.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/RESearch.cxx' % STCLOC,
-                     '%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
-                     '%s/scintilla/src/Style.cxx' % STCLOC,
-                     '%s/scintilla/src/StyleContext.cxx' % STCLOC,
-                     '%s/scintilla/src/UniConversion.cxx' % STCLOC,
-                     '%s/scintilla/src/ViewStyle.cxx' % STCLOC,
-                     '%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
-
-                     '%s/scintilla/src/LexAda.cxx' % STCLOC,
-                     '%s/scintilla/src/LexAVE.cxx' % STCLOC,
-                     '%s/scintilla/src/LexBaan.cxx' % STCLOC,
-                     '%s/scintilla/src/LexBullant.cxx' % STCLOC,
-                     '%s/scintilla/src/LexCPP.cxx' % STCLOC,
-                     '%s/scintilla/src/LexConf.cxx' % STCLOC,
-                     '%s/scintilla/src/LexCrontab.cxx' % STCLOC,
-                     '%s/scintilla/src/LexEiffel.cxx' % STCLOC,
-                     '%s/scintilla/src/LexHTML.cxx' % STCLOC,
-                     '%s/scintilla/src/LexLisp.cxx' % STCLOC,
-                     '%s/scintilla/src/LexLua.cxx' % STCLOC,
-                     '%s/scintilla/src/LexMatlab.cxx' % STCLOC,
-                     '%s/scintilla/src/LexOthers.cxx' % STCLOC,
-                     '%s/scintilla/src/LexPascal.cxx' % STCLOC,
-                     '%s/scintilla/src/LexPerl.cxx' % STCLOC,
-                     '%s/scintilla/src/LexPython.cxx' % STCLOC,
-                     '%s/scintilla/src/LexRuby.cxx' % STCLOC,
-                     '%s/scintilla/src/LexSQL.cxx' % STCLOC,
-                     '%s/scintilla/src/LexVB.cxx' % STCLOC,
-
-                     '%s/PlatWX.cpp' % STCLOC,
-                     '%s/ScintillaWX.cpp' % STCLOC,
-                     '%s/stc.cpp' % STCLOC,
-                     ] + swig_sources,
-
-                    include_dirs = stc_includes,
-                    define_macros = stc_defines,
+    ext = Extension('_stc',
+                    swig_sources,
+
+                    include_dirs = includes,
+                    define_macros = defines,

 
                     library_dirs = libdirs,
 
                     library_dirs = libdirs,

-                    libraries = libs,
+                    libraries = libs + makeLibName('stc'),

 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,


@@ -699,7 +1028,7 @@ if not GL_ONLY and BUILD_STC:
 # Define the IEWIN extension module (experimental)
 #----------------------------------------------------------------------
 
 # Define the IEWIN extension module (experimental)
 #----------------------------------------------------------------------
 

-if not GL_ONLY and BUILD_IEWIN:
+if BUILD_IEWIN:

     msg('Preparing IEWIN...')
     location = 'contrib/iewin'
 
     msg('Preparing IEWIN...')
     location = 'contrib/iewin'
 


@@ -730,81 +1059,28 @@ if not GL_ONLY and BUILD_IEWIN:
 # Define the XRC extension module
 #----------------------------------------------------------------------
 
 # Define the XRC extension module
 #----------------------------------------------------------------------
 

-if not GL_ONLY and BUILD_XRC:
+if BUILD_XRC:

     msg('Preparing XRC...')
     location = 'contrib/xrc'
     msg('Preparing XRC...')
     location = 'contrib/xrc'

-    XMLLOC = opj(location, 'contrib/src/xrc')
-    XMLINC = opj(location, 'contrib/include')

 
 

-    swig_files = ['xrc.i']
+    swig_sources = run_swig(['xrc.i'], location, '', PKGDIR,
+                            USE_SWIG, swig_force, swig_args, swig_deps +
+                            [ '%s/_xrc_rename.i' % location,
+                              '%s/_xrc_ex.py' % location,
+                              '%s/_xmlres.i' % location,
+                              '%s/_xmlsub.i' % location,
+                              '%s/_xml.i' % location,
+                              '%s/_xmlhandler.i' % location,
+                              ])

 
 

-    swig_sources = run_swig(swig_files, location, '', PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
+    ext = Extension('_xrc',
+                    swig_sources,

 
 

-    xmlres_includes = includes[:]
-    xmlres_includes.append('%s/expat/xmlparse' % XMLLOC)
-    xmlres_includes.append('%s/expat/xmltok' % XMLLOC)
-    xmlres_includes.append(XMLINC)
-
-
-    # make sure local copy of contrib files are up to date
-    if IN_CVS_TREE:
-        contrib_copy_tree(opj(CTRB_INC, 'xrc'), opj(XMLINC, 'wx/xrc'))
-        contrib_copy_tree(opj(CTRB_SRC, 'xrc'), XMLLOC)
-
-    ext = Extension('xrcc', ['%s/expat/xmlparse/xmlparse.c' % XMLLOC,
-                                '%s/expat/xmltok/xmlrole.c' % XMLLOC,
-                                '%s/expat/xmltok/xmltok.c' % XMLLOC,
-
-                                '%s/xh_bmp.cpp' % XMLLOC,
-                                '%s/xh_bmpbt.cpp' % XMLLOC,
-                                '%s/xh_bttn.cpp' % XMLLOC,
-                                '%s/xh_cald.cpp' % XMLLOC,
-                                '%s/xh_chckb.cpp' % XMLLOC,
-
-                                '%s/xh_chckl.cpp' % XMLLOC,
-                                '%s/xh_choic.cpp' % XMLLOC,
-                                '%s/xh_combo.cpp' % XMLLOC,
-                                '%s/xh_dlg.cpp' % XMLLOC,
-                                '%s/xh_frame.cpp' % XMLLOC,
-
-                                '%s/xh_gauge.cpp' % XMLLOC,
-                                '%s/xh_gdctl.cpp' % XMLLOC,
-                                '%s/xh_html.cpp' % XMLLOC,
-                                '%s/xh_listb.cpp' % XMLLOC,
-                                '%s/xh_listc.cpp' % XMLLOC,
-                                '%s/xh_menu.cpp' % XMLLOC,
-
-                                '%s/xh_notbk.cpp' % XMLLOC,
-                                '%s/xh_panel.cpp' % XMLLOC,
-                                '%s/xh_radbt.cpp' % XMLLOC,
-                                '%s/xh_radbx.cpp' % XMLLOC,
-                                '%s/xh_scrol.cpp' % XMLLOC,
-
-                                '%s/xh_sizer.cpp' % XMLLOC,
-                                '%s/xh_slidr.cpp' % XMLLOC,
-                                '%s/xh_spin.cpp' % XMLLOC,
-                                '%s/xh_stbmp.cpp' % XMLLOC,
-                                '%s/xh_stbox.cpp' % XMLLOC,
-
-                                '%s/xh_stlin.cpp' % XMLLOC,
-                                '%s/xh_sttxt.cpp' % XMLLOC,
-                                '%s/xh_text.cpp' % XMLLOC,
-                                '%s/xh_toolb.cpp' % XMLLOC,
-                                '%s/xh_tree.cpp' % XMLLOC,
-
-                                '%s/xh_unkwn.cpp' % XMLLOC,
-                                '%s/xml.cpp' % XMLLOC,
-                                '%s/xmlres.cpp' % XMLLOC,
-                                '%s/xmlrsall.cpp' % XMLLOC,
-
-                             ] + swig_sources,
-
-                    include_dirs =  xmlres_includes,
+                    include_dirs =  includes,

                     define_macros = defines,
 
                     library_dirs = libdirs,
                     define_macros = defines,
 
                     library_dirs = libdirs,

-                    libraries = libs,
+                    libraries = libs + makeLibName('xrc'),

 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,


@@ -818,39 +1094,21 @@ if not GL_ONLY and BUILD_XRC:
 # Define the GIZMOS  extension module
 #----------------------------------------------------------------------
 
 # Define the GIZMOS  extension module
 #----------------------------------------------------------------------
 

-if not GL_ONLY and BUILD_GIZMOS:
+if BUILD_GIZMOS:

     msg('Preparing GIZMOS...')
     location = 'contrib/gizmos'
     msg('Preparing GIZMOS...')
     location = 'contrib/gizmos'

-    GIZMOLOC = opj(location, 'contrib/src/gizmos')
-    GIZMOINC = opj(location, 'contrib/include')

 
 

-    swig_files = ['gizmos.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)
 

-    gizmos_includes = includes[:]
-    gizmos_includes.append(GIZMOINC)
-
-
-    # make sure local copy of contrib files are up to date
-    if IN_CVS_TREE:
-        contrib_copy_tree(opj(CTRB_INC, 'gizmos'), opj(GIZMOINC, 'wx/gizmos'))
-        contrib_copy_tree(opj(CTRB_SRC, 'gizmos'), GIZMOLOC)
+    ext = Extension('_gizmos',
+                    [ '%s/treelistctrl.cpp' % location ] + swig_sources,

 
 

-    ext = Extension('gizmosc', [
-                                '%s/dynamicsash.cpp' % GIZMOLOC,
-                                '%s/editlbox.cpp' % GIZMOLOC,
-                                #'%s/multicell.cpp' % GIZMOLOC,
-                                '%s/splittree.cpp' % GIZMOLOC,
-                                '%s/ledctrl.cpp'   % GIZMOLOC,
-                             ] + swig_sources,
-
-                    include_dirs =  gizmos_includes,
+                    include_dirs =  includes + [ location ],

                     define_macros = defines,
 
                     library_dirs = libdirs,
                     define_macros = defines,
 
                     library_dirs = libdirs,

-                    libraries = libs,
+                    libraries = libs + makeLibName('gizmos'),

 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,


@@ -864,7 +1122,7 @@ if not GL_ONLY and BUILD_GIZMOS:
 # Define the DLLWIDGET  extension module
 #----------------------------------------------------------------------
 
 # Define the DLLWIDGET  extension module
 #----------------------------------------------------------------------
 

-if not GL_ONLY and BUILD_DLLWIDGET:
+if BUILD_DLLWIDGET:

     msg('Preparing DLLWIDGET...')
     location = 'contrib/dllwidget'
     swig_files = ['dllwidget_.i']
     msg('Preparing DLLWIDGET...')
     location = 'contrib/dllwidget'
     swig_files = ['dllwidget_.i']


@@ -892,53 +1150,69 @@ if not GL_ONLY and BUILD_DLLWIDGET:
     wxpExtensions.append(ext)
 
 
     wxpExtensions.append(ext)
 
 

+
+

 #----------------------------------------------------------------------
 # Tools and scripts
 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
 # Tools and scripts
 #----------------------------------------------------------------------
 

-## TOOLS = [("wxPython/tools",        glob.glob("tools/*.py")),
-##          ("wxPython/tools/XRCed",  glob.glob("tools/XRCed/*.py") +
-##                                    glob.glob("tools/XRCed/*.xrc") +
-##                                    ["tools/XRCed/CHANGES",
-##                                     "tools/XRCed/TODO",
-##                                     "tools/XRCed/README"]),
-##          ]
-
-

 if NO_SCRIPTS:
     SCRIPTS = None
 else:
 if NO_SCRIPTS:
     SCRIPTS = None
 else:

-    SCRIPTS = [opj('scripts/img2png'),
+    SCRIPTS = [opj('scripts/helpviewer'),
+               opj('scripts/img2png'),

                opj('scripts/img2xpm'),
                opj('scripts/img2py'),
                opj('scripts/xrced'),
                opj('scripts/pyshell'),
                opj('scripts/pycrust'),
                opj('scripts/img2xpm'),
                opj('scripts/img2py'),
                opj('scripts/xrced'),
                opj('scripts/pyshell'),
                opj('scripts/pycrust'),

+               opj('scripts/pywrap'),
+               opj('scripts/pywrap'),
+               opj('scripts/pyalacarte'),
+               opj('scripts/pyalamode'),

                ]
 
 
                ]
 
 

+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', '*.txt', '*.css', '*.html')
+
+

 #----------------------------------------------------------------------
 # Do the Setup/Build/Install/Whatever
 #----------------------------------------------------------------------
 
 if __name__ == "__main__":
 #----------------------------------------------------------------------
 # Do the Setup/Build/Install/Whatever
 #----------------------------------------------------------------------
 
 if __name__ == "__main__":

-    if not GL_ONLY:
-        setup(name             = PKGDIR,
+    if not PREP_ONLY:
+        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,

-
-              packages = [PKGDIR,
-                          PKGDIR+'.lib',
-                          PKGDIR+'.lib.editor',
-                          PKGDIR+'.lib.mixins',
-                          PKGDIR+'.lib.PyCrust',
-                          PKGDIR+'.tools',
-                          PKGDIR+'.tools.XRCed',
+              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.lib',
+                          'wx.lib.colourchooser',
+                          'wx.lib.editor',
+                          'wx.lib.mixins',
+                          'wx.py',
+                          'wx.py.wxd',
+                          'wx.tools',
+                          'wx.tools.XRCed',

                           ],
 
               ext_package = PKGDIR,
                           ],
 
               ext_package = PKGDIR,


@@ -946,29 +1220,13 @@ if __name__ == "__main__":
 
               options = { 'build' : { 'build_base' : BUILD_BASE }},
 
 
               options = { 'build' : { 'build_base' : BUILD_BASE }},
 

-              ##data_files = TOOLS,

               scripts = SCRIPTS,
               scripts = SCRIPTS,

-              )
-
-    else:
-
-        setup(name             = "wxPython-gl",
-              version          = VERSION,
-              description      = "wxGLCanvas class for wxPython",
-              author           = AUTHOR,
-              author_email     = AUTHOR_EMAIL,
-              url              = URL,
-              license          = LICENSE,

 
 

-              py_modules = [ "wxPython.glcanvas" ],
-
-              ext_package = PKGDIR,
-              ext_modules = wxpExtensions,
+              cmdclass = { 'install_data': smart_install_data},
+              data_files = DATA_FILES,

 
               )
 
 
 
               )
 
 

-
-

 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------