added defines for wxchar workaround

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 6ff33be0059f23d15b8c5eca4c8c25cacb6acff9..f981ddbfe15907d4deba428e67ee3db191d9e68a 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -38,8 +38,8 @@ import distutils.command.clean
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 1
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 1

-VER_SUBREL       = 2      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = "p"    # release flags, such as prerelease num, unicode, etc.
+VER_SUBREL       = 6      # wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS        = "p"     # release flags, such as prerelease num, unicode, etc.

 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"


@@ -87,7 +87,7 @@ BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
 
                    # Internet Explorer wrapper (experimental)
 BUILD_IEWIN = (os.name == 'nt')
 
                    # Internet Explorer wrapper (experimental)
 BUILD_IEWIN = (os.name == 'nt')

-BUILD_ACTIVEX = (os.name == 'nt')  # new version of IEWIN
+BUILD_ACTIVEX = (os.name == 'nt')  # new version of IEWIN and more

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


@@ -158,7 +158,7 @@ WXDLLVER = '%d%d' % (VER_MAJOR, VER_MINOR)
 #----------------------------------------------------------------------
 
 def msg(text):
 #----------------------------------------------------------------------
 
 def msg(text):

-    if sys.setup_is_main:
+    if hasattr(sys, 'setup_is_main') and sys.setup_is_main:

         print text
 
 
         print text
 
 


@@ -274,7 +274,8 @@ def Verify_WX_CONFIG():
 
 
 
 
 
 

-def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=[]):
+def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
+             swig_deps=[], add_under=False):

     """Run SWIG the way I want it done"""
 
     if USE_SWIG and not os.path.exists(os.path.join(dir, gendir)):
     """Run SWIG the way I want it done"""
 
     if USE_SWIG and not os.path.exists(os.path.join(dir, gendir)):


@@ -285,13 +286,21 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=
 
     sources = []
 
 
     sources = []
 

+    if add_under:  pre = '_'
+    else:          pre = ''
+        

     for file in files:
         basefile = os.path.splitext(file)[0]
         i_file   = os.path.join(dir, file)
     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')
+        py_file  = os.path.join(dir, gendir, pre+basefile+'.py')
+        cpp_file = os.path.join(dir, gendir, pre+basefile+'_wrap.cpp')

         xml_file = os.path.join("docs", "xml-raw", basefile+'_swig.xml')
 
         xml_file = os.path.join("docs", "xml-raw", basefile+'_swig.xml')
 

+        if add_under:
+            interface = ['-interface', '_'+basefile+'_']
+        else:
+            interface = []
+            

         sources.append(cpp_file)
 
         if not cleaning and USE_SWIG:
         sources.append(cpp_file)
 
         if not cleaning and USE_SWIG:


@@ -320,14 +329,14 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=
 
                     # Next run build_renamers to process the XML
                     cmd = [ sys.executable, '-u',
 
                     # Next run build_renamers to process the XML
                     cmd = [ sys.executable, '-u',

-                            './distrib/build_renamers.py', dir, basefile, xmltemp]
+                            './distrib/build_renamers.py', dir, pre+basefile, xmltemp]

                     msg(' '.join(cmd))
                     spawn(cmd)
                     os.remove(xmltemp)
 
                 # Then run swig for real
                     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]
+                cmd = [ swig_cmd ] + swig_args + interface + \
+                      ['-I'+dir, '-o', cpp_file, '-xmlout', xml_file, i_file]

                 msg(' '.join(cmd))
                 spawn(cmd)
 
                 msg(' '.join(cmd))
                 spawn(cmd)
 


@@ -408,7 +417,7 @@ class wx_install_headers(distutils.command.install_headers.install_headers):
             return
 
         root = self.root
             return
 
         root = self.root

-        if WXPREFIX.startswith(root):
+        if root is None or WXPREFIX.startswith(root):

             root = ''
         for header, location in headers:
             install_dir = os.path.normpath(root + WXPREFIX + location)
             root = ''
         for header, location in headers:
             install_dir = os.path.normpath(root + WXPREFIX + location)