configure didn't define __WXDEBUG__, fixed

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index ecd5a4a8700ad86904451b01f78c33f04c06f0ef..dc52ba0d25140c9a38dba6a5d115fd01e57f14ac 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -1,48 +1,58 @@
 #!/usr/bin/env python
 #----------------------------------------------------------------------
 
 #!/usr/bin/env python
 #----------------------------------------------------------------------
 

-import sys, os, string, glob
+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.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.3pre4"
+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/"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
 URL              = "http://wxPython.org/"

-LICENCE          = "wxWindows (LGPL derivative)"
+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
 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.
 """
 
 

+# 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.
 
                    # to be loaded from a DLL and to be used from Python.
 

-BUILD_IEWIN = 0    # Internet Explorer wrapper (experimental)
+                   # Internet Explorer wrapper (experimental)
+BUILD_IEWIN = (os.name == 'nt')

 
 

-CORE_ONLY = 0      # if true, don't build any of the above
+BUILD_CANVAS = 0   # Build a canvas module using the one in wx/contrib (experimental)
+BUILD_ART2D = 0    # Build a canvas module using code from the wxArt2D project (experimental)

 
 
 
 

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


@@ -51,9 +61,13 @@ 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.
 
                    # 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
+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.

 
 UNDEF_NDEBUG = 1   # Python 2.2 on Unix/Linux by default defines NDEBUG,
                    # and distutils will pick this up and use it on the
 
 UNDEF_NDEBUG = 1   # Python 2.2 on Unix/Linux by default defines NDEBUG,
                    # and distutils will pick this up and use it on the


@@ -64,27 +78,38 @@ UNDEF_NDEBUG = 1   # Python 2.2 on Unix/Linux by default defines NDEBUG,
                    # on then you end up with mismatched class structures,
                    # and wxPython will crash.
 
                    # on then you end up with mismatched class structures,
                    # and wxPython will crash.
 

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

 
 

-BUILD_BASE = "build"

 
 # Some MSW build settings
 
 
 # Some MSW build settings
 

-FINAL = 1          # Mirrors use of same flag in wx makefiles,
+FINAL = 0          # Mirrors use of same flag in wx makefiles,

                    # (0 or 1 only) should probably find a way to
                    # autodetect this...
 
                    # (0 or 1 only) should probably find a way to
                    # autodetect this...
 

-HYBRID = 0         # If set and not debug or FINAL, then build a
+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.)
 
                    # 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 = '233'   # Version part of wxWindows DLL name
+WXDLLVER = '250'   # Version part of wxWindows DLL name

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


@@ -117,18 +142,18 @@ def libFlag():
 
 PKGDIR = 'wxPython'
 wxpExtensions = []
 
 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
 
 
 force = '--force' in sys.argv or '-f' in sys.argv
 debug = '--debug' in sys.argv or '-g' 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'

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


@@ -137,21 +162,22 @@ if bcpp_compiling:
 
 # Boolean (int) flags
 for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
 
 # Boolean (int) flags
 for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',

-             'BUILD_GIZMOS', 'BUILD_DLLWIDGET',
-             'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE', 'UNDEF_NDEBUG'
+             '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)):
              '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']:

     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] = ''


@@ -159,6 +185,141 @@ 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))
+
+    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
+
+    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
+
+

 
 #----------------------------------------------------------------------
 # sanity checks
 
 #----------------------------------------------------------------------
 # sanity checks


@@ -170,16 +331,17 @@ if CORE_ONLY:
     BUILD_XRC = 0
     BUILD_GIZMOS = 0
     BUILD_DLLWIDGET = 0
     BUILD_XRC = 0
     BUILD_GIZMOS = 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

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


@@ -198,20 +360,13 @@ 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()),
                 opj(WXDIR, 'include'),
                 ]
 
     includes = ['src',
                 opj(WXDIR, 'lib', 'mswdll' + libFlag()),
                 opj(WXDIR, 'include'),
                 ]
 

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

                 ('_WINDOWS', None),
                 ('__WINDOWS__', None),
                 ('WINVER', '0x0400'),
                 ('_WINDOWS', None),
                 ('__WINDOWS__', None),
                 ('WINVER', '0x0400'),


@@ -226,66 +381,44 @@ if os.name == 'nt':
                 ('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'), 'build\\ilib']
+    libdirs = [ opj(WXDIR, 'lib') ]

     wxdll = 'wxmsw' + WXDLLVER + libFlag()
     wxdll = 'wxmsw' + WXDLLVER + libFlag()

-    libs = [wxdll]
-
-    if bcpp_compiling:
-        libs = ['wx'+WXBCPPLIBVER]
+    libs = [ wxdll ]

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

-    cflags = [
+    cflags = [ '/Gy',

              # '/GX-'  # workaround for internal compiler error in MSVC on some machines
              ]
     lflags = None
 
              # '/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 bcpp_compiling:  # overwrite it
-        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 and HYBRID and not bcpp_compiling:
-        cflags = cflags + ['/Od', '/Z7']
-        lflags = ['/DEBUG', ]
-
-    elif bcpp_compiling and not FINAL:
-        cflags = cflags + ['/Od', '/v', '/y']
-        lflags = lflags + ['/v', ]

 
 
 
 

+#----------------------------------------------------------------------

 
 elif os.name == 'posix' and sys.platform[:6] == "darwin":
     # Flags and such for a Darwin (Max OS X) build of Python
 
 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'
     WXDIR = '..'              # assumes IN_CVS_TREE
     WXPLAT = '__WXMAC__'
     GENDIR = 'mac'


@@ -295,54 +428,115 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin":
                ('HAVE_CONFIG_H', None),
                ('WXP_USE_THREAD', '1'),
                ]
                ('HAVE_CONFIG_H', None),
                ('WXP_USE_THREAD', '1'),
                ]

+    if UNDEF_NDEBUG:
+        defines.append( ('NDEBUG',) )  # using a 1-tuple makes it do an undef

     libdirs = []
     libdirs = []

-    libs = []
+    libs = ['stdc++']
+
+    Verify_WX_CONFIG()

 
     cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1]
 
     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')

 
     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

 
 
 
 

-elif os.name == 'posix':
-    # Set flags for Unix type platforms
+#----------------------------------------------------------------------

 
 

+elif os.name == 'posix':
+    # Set flags for other Unix type platforms

     WXDIR = '..'              # assumes IN_CVS_TREE
     WXDIR = '..'              # assumes IN_CVS_TREE

-    WXPLAT = '__WXGTK__'      # and assumes GTK...
-    GENDIR = 'gtk'            # Need to allow for Motif eventually too
+    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

 
     includes = ['src']
     defines = [('SWIG_GLOBAL', None),
                ('HAVE_CONFIG_H', None),
                ('WXP_USE_THREAD', '1'),
                ]
 
     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
+

     libdirs = []
     libs = []
 
     libdirs = []
     libs = []
 

-    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')
+    Verify_WX_CONFIG()
+
+    cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + portcfg
+
+    cflags = cflags.split()
+    if debug:
+        cflags.append('-g')
+        cflags.append('-O0')

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

 
 

+    # 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:
 else:

-    raise 'Sorry Charlie...'
+    raise 'Sorry Charlie, platform not supported...'

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

-# Check if the version file needs updated
+# post platform setup checks and tweaks, create the full version string

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

-#if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
-open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION)
+if UNICODE:
+    BUILD_BASE = BUILD_BASE + '.unicode'
+    VER_FLAGS += 'u'
+
+
+VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
+                             VER_SUBREL, VER_FLAGS)
+
+#----------------------------------------------------------------------
+# Update the version file
+#----------------------------------------------------------------------
+
+# 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())
+

 
 
 
 
 
 


@@ -367,104 +561,123 @@ swig_deps = ['src/my_typemaps.i']
 # Define the CORE extension module
 #----------------------------------------------------------------------
 
 # Define the CORE extension module
 #----------------------------------------------------------------------
 

-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'
-                   ]
-
-    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)
-    copy_file('src/wxc.pyd.manifest', PKGDIR, update=1, verbose=0)
-
-    if IN_CVS_TREE:   # update the licence files
-        mkpath('licence')
-        for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
-            copy_file(opj(WXDIR, 'docs', file), opj('licence',file), update=1, verbose=0)
-
-
-    if os.name == 'nt':
-        rc_file = ['src/wxc.rc']
-    else:
-        rc_file = []
-
+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'
+               ]

 
 

-    ext = Extension('wxc', ['src/helpers.cpp',
-                            'src/libpy.c',
-                            ] + rc_file + swig_sources,
+swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps)

 
 

-                    include_dirs = includes,
-                    define_macros = defines,
+copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
+copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)

 
 

-                    library_dirs = libdirs,
-                    libraries = libs,

 
 

-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-    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)

 
 
 
 

-    # 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)
-
-
-    # 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)
-
-
-    # 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)
+if os.name == 'nt':
+    build_locale_dir(opj(PKGDIR, 'locale'))
+    DATA_FILES += build_locale_list(opj(PKGDIR, 'locale'))

 
 
 
 

-    # 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':
+    rc_file = ['src/wxc.rc']
+else:
+    rc_file = []
+
+
+ext = Extension('wxc', ['src/helpers.cpp',
+                        'src/drawlist.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,
+                )
+wxpExtensions.append(ext)
+
+
+# Extension for the grid module
+swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps)
+ext = Extension('gridc', swig_sources,
+                include_dirs =  includes,
+                define_macros = defines,
+                library_dirs = libdirs,
+                libraries = libs,
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
+                )
+wxpExtensions.append(ext)
+
+
+# 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)
+
+
+# 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)
+
+
+# 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)
+
+
+# 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)

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


@@ -474,7 +687,7 @@ if not GL_ONLY:
 CTRB_SRC =  opj(WXDIR, 'contrib/src')
 CTRB_INC =  opj(WXDIR, 'contrib/include/wx')
 
 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'
     swig_files = ['glcanvas.i']
     msg('Preparing GLCANVAS...')
     location = 'contrib/glcanvas'
     swig_files = ['glcanvas.i']


@@ -486,7 +699,7 @@ if BUILD_GLCANVAS or GL_ONLY:
     gl_libs = []
     if os.name == 'posix':
         gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
     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:
         other_sources = [opj(location, 'msw/myglcanvas.cpp')]
         gl_libs = libs
     else:
         other_sources = [opj(location, 'msw/myglcanvas.cpp')]


@@ -513,7 +726,7 @@ 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'
     OGLLOC = opj(location, 'contrib/src/ogl')
     msg('Preparing OGL...')
     location = 'contrib/ogl'
     OGLLOC = opj(location, 'contrib/src/ogl')


@@ -562,7 +775,7 @@ 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'
     STCLOC = opj(location, 'contrib/src/stc')
     msg('Preparing STC...')
     location = 'contrib/stc'
     STCLOC = opj(location, 'contrib/src/stc')


@@ -578,6 +791,7 @@ if not GL_ONLY and BUILD_STC:
             msg('Running gen_iface.py, regenerating stc.h and stc.cpp...')
             cwd = os.getcwd()
             os.chdir(opj(CTRB_SRC, 'stc'))
             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)
             import gen_iface
             gen_iface.main([])
             os.chdir(cwd)


@@ -612,7 +826,11 @@ if not GL_ONLY and BUILD_STC:
 
 
     ext = Extension('stc_c',
 
 
     ext = Extension('stc_c',

-                    ['%s/scintilla/src/AutoComplete.cxx' % STCLOC,
+                    ['%s/PlatWX.cpp' % STCLOC,
+                     '%s/ScintillaWX.cpp' % STCLOC,
+                     '%s/stc.cpp' % STCLOC,
+
+                     '%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/CallTip.cxx' % STCLOC,
                      '%s/scintilla/src/CellBuffer.cxx' % STCLOC,
                      '%s/scintilla/src/ContractionState.cxx' % STCLOC,


@@ -631,31 +849,10 @@ if not GL_ONLY and BUILD_STC:
                      '%s/scintilla/src/UniConversion.cxx' % STCLOC,
                      '%s/scintilla/src/ViewStyle.cxx' % STCLOC,
                      '%s/scintilla/src/WindowAccessor.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,
+                     '%s/scintilla/src/XPM.cxx' % STCLOC,
+                     ]
+                    + glob.glob('%s/scintilla/src/Lex*.cxx' % STCLOC)
+                    + swig_sources,

 
                     include_dirs = stc_includes,
                     define_macros = stc_defines,
 
                     include_dirs = stc_includes,
                     define_macros = stc_defines,


@@ -675,7 +872,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'
 


@@ -686,6 +883,7 @@ if not GL_ONLY and BUILD_IEWIN:
 
 
     ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location,
 
 
     ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location,

+                               '%s/wxactivex.cpp' % location,

                              ] + swig_sources,
 
                     include_dirs =  includes,
                              ] + swig_sources,
 
                     include_dirs =  includes,


@@ -705,7 +903,7 @@ 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'
     XMLLOC = opj(location, 'contrib/src/xrc')
     msg('Preparing XRC...')
     location = 'contrib/xrc'
     XMLLOC = opj(location, 'contrib/src/xrc')


@@ -727,53 +925,17 @@ if not GL_ONLY and BUILD_XRC:
         contrib_copy_tree(opj(CTRB_INC, 'xrc'), opj(XMLINC, 'wx/xrc'))
         contrib_copy_tree(opj(CTRB_SRC, 'xrc'), XMLLOC)
 
         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,
+    ext = Extension('xrcc',
+                    ['%s/expat/xmlparse/xmlparse.c' % XMLLOC,
+                     '%s/expat/xmltok/xmlrole.c' % XMLLOC,
+                     '%s/expat/xmltok/xmltok.c' % XMLLOC,

 
 

-                             ] + swig_sources,
+                     ] + glob.glob('%s/xh_*.cpp' % XMLLOC) +
+
+                    [ '%s/xml.cpp' % XMLLOC,
+                      '%s/xmlres.cpp' % XMLLOC,
+                      '%s/xmlrsall.cpp' % XMLLOC,
+                      ] + swig_sources,

 
                     include_dirs =  xmlres_includes,
                     define_macros = defines,
 
                     include_dirs =  xmlres_includes,
                     define_macros = defines,


@@ -793,7 +955,7 @@ 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'
     GIZMOLOC = opj(location, 'contrib/src/gizmos')
     msg('Preparing GIZMOS...')
     location = 'contrib/gizmos'
     GIZMOLOC = opj(location, 'contrib/src/gizmos')


@@ -814,11 +976,14 @@ if not GL_ONLY and BUILD_GIZMOS:
         contrib_copy_tree(opj(CTRB_SRC, 'gizmos'), GIZMOLOC)
 
     ext = Extension('gizmosc', [
         contrib_copy_tree(opj(CTRB_SRC, 'gizmos'), GIZMOLOC)
 
     ext = Extension('gizmosc', [

-                                '%s/dynamicsash.cpp' % GIZMOLOC,
-                                '%s/editlbox.cpp' % GIZMOLOC,
-                                #'%s/multicell.cpp' % GIZMOLOC,
-                                '%s/splittree.cpp' % GIZMOLOC,
-                                '%s/ledctrl.cpp'   % GIZMOLOC,
+                                '%s/dynamicsash.cpp'  % GIZMOLOC,
+                                '%s/editlbox.cpp'     % GIZMOLOC,
+                                '%s/splittree.cpp'    % GIZMOLOC,
+                                '%s/ledctrl.cpp'      % GIZMOLOC,
+                                #'%s/multicell.cpp'    % GIZMOLOC,
+
+                                '%s/treelistctrl.cpp' % location,
+

                              ] + swig_sources,
 
                     include_dirs =  gizmos_includes,
                              ] + swig_sources,
 
                     include_dirs =  gizmos_includes,


@@ -839,7 +1004,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']


@@ -867,19 +1032,143 @@ if not GL_ONLY and BUILD_DLLWIDGET:
     wxpExtensions.append(ext)
 
 
     wxpExtensions.append(ext)
 
 

+#----------------------------------------------------------------------
+# Define the CANVAS extension module
+#----------------------------------------------------------------------
+
+if BUILD_CANVAS:
+    msg('Preparing CANVAS...')
+    location = 'contrib/canvas'
+    CANVASLOC = opj(location, 'contrib/src/canvas')
+    CANVASINC = opj(location, 'contrib/include')
+
+    swig_files = ['canvas.i']
+
+    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, 'canvas'), opj(CANVASINC, 'wx/canvas'))
+        contrib_copy_tree(opj(CTRB_SRC, 'canvas'), CANVASLOC)
+
+    ext = Extension('canvasc', ['%s/bbox.cpp' % CANVASLOC,
+                                '%s/liner.cpp' % CANVASLOC,
+                                '%s/polygon.cpp' % CANVASLOC,
+                                '%s/canvas.cpp' % CANVASLOC,
+                                ] + swig_sources,
+
+                    include_dirs = [CANVASINC] + includes,
+                    define_macros = defines,
+
+                    library_dirs = libdirs,
+                    libraries = libs,
+
+                    extra_compile_args = cflags,
+                    extra_link_args = lflags,
+                    )
+
+    wxpExtensions.append(ext)
+
+
+#----------------------------------------------------------------------
+# Define the ART2D extension module
+#----------------------------------------------------------------------
+
+if BUILD_ART2D:
+    msg('Preparing ART2D...')
+    location = 'contrib/art2d'
+    ART2DLOC = opj(location, 'modules/canvas/src')
+    ART2DINC = opj(location, 'modules/canvas/include')
+    EXPATLOC = opj(location, 'modules/expat')
+    EXPATINC = opj(location, 'modules/expat/include')
+
+    swig_files = ['art2d.i',
+                  'art2d_misc.i',
+                  'art2d_base.i',
+                  'art2d_canvas.i',
+                  ]
+
+    swig_sources = run_swig(swig_files, location, '', PKGDIR,
+                            USE_SWIG, swig_force, swig_args, swig_deps)
+
+    if IN_CVS_TREE:
+        # Don't copy data in this case as the code snapshots are
+        # taken manually
+        pass
+
+    ext = Extension('art2dc', [ opj(ART2DLOC, 'afmatrix.cpp'),
+                                opj(ART2DLOC, 'bbox.cpp'),
+                                opj(ART2DLOC, 'cancom.cpp'),
+                                opj(ART2DLOC, 'candoc.cpp'),
+                                opj(ART2DLOC, 'canglob.cpp'),
+                                opj(ART2DLOC, 'canobj3d.cpp'),
+                                opj(ART2DLOC, 'canobj.cpp'),
+                                opj(ART2DLOC, 'canprim.cpp'),
+                                opj(ART2DLOC, 'canprop.cpp'),
+                                opj(ART2DLOC, 'canvas.cpp'),
+                                opj(ART2DLOC, 'docviewref.cpp'),
+                                opj(ART2DLOC, 'drawer.cpp'),
+                                opj(ART2DLOC, 'eval.cpp'),
+                                opj(ART2DLOC, 'graph.cpp'),
+                                opj(ART2DLOC, 'layerinf.cpp'),
+                                opj(ART2DLOC, 'liner.cpp'),
+                                opj(ART2DLOC, 'meta.cpp'),
+                                opj(ART2DLOC, 'objlist.cpp'),
+                                opj(ART2DLOC, 'polygon.cpp'),
+                                opj(ART2DLOC, 'recur.cpp'),
+                                opj(ART2DLOC, 'rendimg.cpp'),
+                                opj(ART2DLOC, 'tools.cpp'),
+                                opj(ART2DLOC, 'vpath.cpp'),
+                                opj(ART2DLOC, 'xmlpars.cpp'),
+
+                                opj(EXPATLOC, 'xmlparse/xmlparse.c'),
+                                opj(EXPATLOC, 'xmltok/xmlrole.c'),
+                                opj(EXPATLOC, 'xmltok/xmltok.c'),
+
+                                ] + swig_sources,
+
+                    include_dirs = [ ART2DINC,
+                                     EXPATINC,
+                                     opj(EXPATLOC, 'xmltok'),
+                                     opj(EXPATLOC, 'xmlparse'),
+                                     ] + includes,
+                    define_macros = defines,
+
+                    library_dirs = libdirs,
+                    libraries = libs,
+
+                    extra_compile_args = cflags,
+                    extra_link_args = lflags,
+                    )
+
+    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:
+    SCRIPTS = [opj('scripts/helpviewer'),
+               opj('scripts/img2png'),
+               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')

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


@@ -887,7 +1176,7 @@ TOOLS = [("wxPython/tools",        glob.glob("tools/*.py")),
 #----------------------------------------------------------------------
 
 if __name__ == "__main__":
 #----------------------------------------------------------------------
 
 if __name__ == "__main__":

-    if not GL_ONLY:
+    if not PREP_ONLY:

         setup(name             = PKGDIR,
               version          = VERSION,
               description      = DESCRIPTION,
         setup(name             = PKGDIR,
               version          = VERSION,
               description      = DESCRIPTION,


@@ -895,42 +1184,41 @@ if __name__ == "__main__":
               author           = AUTHOR,
               author_email     = AUTHOR_EMAIL,
               url              = URL,
               author           = AUTHOR,
               author_email     = AUTHOR_EMAIL,
               url              = URL,

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

                           ],
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
 
                           ],
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
 

-              options = { 'build' : { 'build_base' : BUILD_BASE }}
-
-              ##data_files = TOOLS,
-              )
-
-    else:
-
-        setup(name             = "wxPython-gl",
-              version          = VERSION,
-              description      = "wxGLCanvas class for wxPython",
-              author           = AUTHOR,
-              author_email     = AUTHOR_EMAIL,
-              url              = URL,
-              licence          = LICENCE,
+              options = { 'build' : { 'build_base' : BUILD_BASE }},

 
 

-              py_modules = [ "wxPython.glcanvas" ],
+              scripts = SCRIPTS,

 
 

-              ext_package = PKGDIR,
-              ext_modules = wxpExtensions,
+              cmdclass = { 'install_data': smart_install_data},
+              data_files = DATA_FILES,

 
               )
 
 
 
               )
 
 

-
-

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