added wxString::FromAscii(char*,size_t) for consistency with FromUTF8()

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 2fcb0a5f4a63afb39e01278369a9bdade7037834..21a8129f717f56367ac0851aaaf6bef64fbd3a8b 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        = 7
-VER_RELEASE      = 1
-VER_SUBREL       = 2      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = ""  # release flags, such as prerelease or RC num, etc.
+VER_MINOR        = 9
+VER_RELEASE      = 0
+VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS        = ""     # release flags, such as prerelease or RC num, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
@@ -105,7 +105,7 @@ FULL_DOCS = 0      # Some docstrings are split into a basic docstring and a
                    # cause the two strings to be combined and output
                    # as the full docstring.
 
-UNICODE = 0        # This will pass the 'wxUSE_UNICODE' flag to SWIG and
+UNICODE = 1        # This will pass the 'wxUSE_UNICODE' flag to SWIG and
                    # will ensure that the right headers are found and the
                    # right libs are linked.
 
@@ -200,6 +200,10 @@ WXDLLVER = '%d%d' % (VER_MAJOR, VER_MINOR)
 WXPY_SRC = '.'  # Assume we're in the source tree already, but allow the
                 # user to change it, particularly for extension building.
 
+ARCH = ''       # If this is set, add an -arch XXX flag to cflags
+                # Only tested (and presumably, needed) for OS X universal
+                # binary builds created using lipo.
+
 
 #----------------------------------------------------------------------
 
@@ -271,7 +275,7 @@ for flag in [ 'BUILD_ACTIVEX', 'BUILD_DLLWIDGET',
 # String options
 for option in ['WX_CONFIG', 'SYS_WX_CONFIG', 'WXDLLVER', 'BUILD_BASE',
                'WXPORT', 'SWIG', 'CONTRIBS_INC', 'WXPY_SRC', 'FLAVOUR',
-               'VER_FLAGS',
+               'VER_FLAGS', 'ARCH',
                ]:
     for x in range(len(sys.argv)):
         if sys.argv[x].find(option) == 0:
@@ -483,7 +487,10 @@ class wx_install_headers(distutils.command.install_headers.install_headers):
             return
 
         root = self.root
-        if root is None or WXPREFIX.startswith(root):
+        #print "WXPREFIX is %s, root is %s" % (WXPREFIX, root)
+        # hack for universal builds, which append i386/ppc
+        # to the root
+        if root is None or WXPREFIX.startswith(os.path.dirname(root)):
             root = ''
         for header, location in headers:
             install_dir = os.path.normpath(root +
@@ -552,6 +559,19 @@ def makeLibName(name):
     return [libname]
 
 
+def findLib(name, libdirs):
+    name = makeLibName(name)[0]
+    if os.name == 'posix':
+        dirs = libdirs + ['/usr/lib', '/usr/local/lib']
+        name = 'lib'+name
+    else:
+        dirs = libdirs[:]
+    for d in dirs:
+        p = os.path.join(d, name)
+        if glob.glob(p+'*') != []:
+            return True
+    return False
+
 
 def adjustCFLAGS(cflags, defines, includes):
     '''Extract the raw -I, -D, and -U flags and put them into
@@ -587,9 +607,9 @@ def adjustLFLAGS(lflags, libdirs, libs):
 
     # remove any flags for universal binaries, we'll get those from
     # distutils instead
-    return [flag for flag in newLFLAGS
-            if flag not in ['-isysroot', '-arch', 'ppc', 'i386'] and
-            not flag.startswith('/Developer') ]
+    return newLFLAGS #[flag for flag in newLFLAGS
+           # if flag not in ['-isysroot', '-arch', 'ppc', 'i386'] and
+           # not flag.startswith('/Developer') ]
 
 
 
@@ -599,11 +619,13 @@ def getExtraPath(shortVer=True, addOpts=False):
     if shortVer:
         # short version, just Major.Minor
         ep = "wx-%d.%d" % (VER_MAJOR, VER_MINOR)
-        
+         
         # plus release if minor is odd
         if VER_MINOR % 2 == 1:
             ep += ".%d" % VER_RELEASE
             
+        ##ep = "wx-%d.%d.%d" % (VER_MAJOR, VER_MINOR, VER_RELEASE)
+        
     else:
         # long version, full version 
         ep = "wx-%d.%d.%d.%d" % (VER_MAJOR, VER_MINOR, VER_RELEASE, VER_SUBREL)
@@ -774,6 +796,14 @@ elif os.name == 'posix':
         GENDIR = 'mac'
         libs = ['stdc++']
         NO_SCRIPTS = 1
+        if not ARCH == "":
+            cflags.append("-arch")
+            cflags.append(ARCH)
+            lflags.append("-arch")
+            lflags.append(ARCH)
+            #if ARCH == "ppc":
+            #    cflags.append("-isysroot")
+            #    cflags.append("/Developer/SDKs/MacOSX10.3.9.sdk")
 
 
     else:
@@ -856,11 +886,9 @@ except:
 
 if UNICODE:
     BUILD_BASE = BUILD_BASE + '.unicode'
-    ##VER_FLAGS += 'u'
 
 if os.path.exists('DAILY_BUILD'):
-    
-    VER_FLAGS += '-' + open('DAILY_BUILD').read().strip()
+    VER_FLAGS += '.' + open('DAILY_BUILD').read().strip()
 
 VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
                              VER_SUBREL, VER_FLAGS)