X error handler should be extern C (SunCC warning fix)

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index b9ebe12e749b6193f692380caa36e78ec9428a4a..a99dabd964a810e959cd792c0b771bb668fe40e8 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -37,10 +37,10 @@ import distutils.command.clean
 #----------------------------------------------------------------------
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
-VER_MINOR        = 5
-VER_RELEASE      = 4
-VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = "pre"     # release flags, such as prerelease num, unicode, etc.
+VER_MINOR        = 6
+VER_RELEASE      = 1
+VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS        = "pre"  # release flags, such as prerelease or RC num, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
@@ -79,14 +79,15 @@ Topic :: Software Development :: User Interfaces
 # 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_OGL = 0      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library
+BUILD_ANIMATE = 1  # Build a module for the animate contrib library
 BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
                    # to be loaded from a DLL and to be used from Python.
 
                    # Internet Explorer wrapper (experimental)
-BUILD_IEWIN = (os.name == 'nt')
+BUILD_IEWIN = 0 #(os.name == 'nt')
 BUILD_ACTIVEX = (os.name == 'nt')  # new version of IEWIN and more
 
 
@@ -233,14 +234,16 @@ if sys.platform[:6] == "darwin":
 if os.name == 'nt':
     WXPORT = 'msw'
 
+WXPYTHON_TYPE_TABLE = '_wxPython_table'
 
 #----------------------------------------------------------------------
 # Check for build flags on the command line
 #----------------------------------------------------------------------
 
 # Boolean (int) flags
-for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 
-             'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', 'BUILD_ACTIVEX',
+for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
+              'BUILD_GIZMOS', 'BUILD_GLCANVAS', 'BUILD_IEWIN',
+              'BUILD_OGL', 'BUILD_STC',     
              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
              'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
              'FULL_DOCS', 'INSTALL_MULTIVERSION', 'EP_ADD_OPTS',
@@ -632,6 +635,7 @@ if CORE_ONLY:
     BUILD_DLLWIDGET = 0
     BUILD_IEWIN = 0
     BUILD_ACTIVEX = 0
+    BUILD_ANIMATE = 0
 
 if debug:
     FINAL  = 0
@@ -665,7 +669,7 @@ if os.name == 'nt':
         WXDIR = '..'  # assumes in CVS tree
     WXPLAT = '__WXMSW__'
     GENDIR = 'msw'
-           
+
     includes = ['include', 'src',
                 opj(WXDIR, 'lib', 'vc_dll', 'msw'  + libFlag()),
                 opj(WXDIR, 'include'),
@@ -678,7 +682,7 @@ if os.name == 'nt':
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),
 
-                ('SWIG_TYPE_TABLE', '_wxPython_table'),
+                ('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),
                 ('WXP_USE_THREAD', '1'),
                 ]
 
@@ -732,7 +736,7 @@ if os.name == 'nt':
 elif os.name == 'posix':
     WXDIR = '..'
     includes = ['include', 'src']
-    defines = [('SWIG_TYPE_TABLE', 'wxPython_type_table'),
+    defines = [('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),
                ('HAVE_CONFIG_H', None),
                ('WXP_USE_THREAD', '1'),
                ]
@@ -748,6 +752,7 @@ elif os.name == 'posix':
     # uncomment this block to add the right flags to the link step and build
     # again.
     ## if os.uname()[0] == 'SunOS':
+    ##     import commands
     ##     libs.append('gcc')
     ##     libdirs.append(commands.getoutput("gcc -print-search-dirs | grep '^install' | awk '{print $2}'")[:-1])
 
@@ -839,7 +844,7 @@ VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
 # dirs as includes so we don't have to guess which is correct.
  
 wxfilesdir = ""
-i_subdir = opj("include", "wx", "wxPython", "i_files")
+i_subdir = opj("include", getExtraPath(), "wx", "wxPython", "i_files")
 if os.name != "nt":
     wxfilesdir = opj(WXPREFIX, i_subdir)
 else:
@@ -883,9 +888,7 @@ depends = [ #'include/wx/wxPython/wxPython.h',
 # BuildRenamers
 ####################################
 
-import pprint
-import xml.sax            
-
+import pprint, shutil
 try:
     import libxml2
     FOUND_LIBXML2 = True
@@ -971,11 +974,14 @@ class BuildRenamers:
         # blow away the old one if they are different.
         for dest, temp in [(swigDest, swigDestTemp),
                            (pyDest, pyDestTemp)]:
+            # NOTE: we don't use shutil.move() because it was introduced
+            # in Python 2.3. Eventually we can switch to it when people
+            # stop building using 2.2.
             if not os.path.exists(dest):
-                os.rename(temp, dest)
+                shutil.copyfile(temp, dest)
             elif open(dest).read() != open(temp).read():
                 os.unlink(dest)
-                os.rename(temp, dest)
+                shutil.copyfile(temp, dest)
             else:
                 print dest + " not changed."
                 os.unlink(temp)