]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/config.py
Some change notes
[wxWidgets.git] / wxPython / config.py
index 25e577433de68ecb3dbe033772079056c6c864d7..4eb36b185512842fc3636b444ef4818f3e1ec0aa 100644 (file)
@@ -38,7 +38,7 @@ import distutils.command.clean
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 2
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 2
-VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
+VER_SUBREL       = 9      # 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"
 VER_FLAGS        = "p"     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
@@ -129,7 +129,7 @@ WX_CONFIG = None   # Usually you shouldn't need to touch this, but you can set
                    # version, port, etc. and it will be looked for on the
                    # default $PATH.
 
                    # version, port, etc. and it will be looked for on the
                    # default $PATH.
 
-WXPORT = 'gtk    # On Linux/Unix there are several ports of wxWidgets available.
+WXPORT = 'gtk2'    # On Linux/Unix there are several ports of wxWidgets 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.
                    # 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.
@@ -159,6 +159,9 @@ HYBRID = 1         # If set and not debug or FINAL, then build a
                    # Version part of wxWidgets LIB/DLL names
 WXDLLVER = '%d%d' % (VER_MAJOR, VER_MINOR)
 
                    # Version part of wxWidgets LIB/DLL names
 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.
+
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 
@@ -168,7 +171,7 @@ def msg(text):
 
 
 def opj(*args):
 
 
 def opj(*args):
-    path = apply(os.path.join, args)
+    path = os.path.join(*args)
     return os.path.normpath(path)
 
 
     return os.path.normpath(path)
 
 
@@ -227,7 +230,7 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
 
 # String options
 for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'SWIG',
 
 # String options
 for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'SWIG',
-               'CONTRIBS_INC']:
+               'CONTRIBS_INC', 'WXPY_SRC']:
     for x in range(len(sys.argv)):
         if sys.argv[x].find(option) == 0:
             pos = sys.argv[x].find('=') + 1
     for x in range(len(sys.argv)):
         if sys.argv[x].find(option) == 0:
             pos = sys.argv[x].find('=') + 1
@@ -243,42 +246,36 @@ sys.argv = filter(None, sys.argv)
 #----------------------------------------------------------------------
 
 def Verify_WX_CONFIG():
 #----------------------------------------------------------------------
 
 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'.
+    """ Called below for the builds that need wx-config, if WX_CONFIG
+        is not set then determins the flags needed based on build
+        options and searches for wx-config on the PATH.  
     """
     # if WX_CONFIG hasn't been set to an explicit value then construct one.
     global WX_CONFIG
     if WX_CONFIG is None:
     """
     # 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 wxWidgets...
-            df = 'd'
-        else:
-            df = ''
-        if UNICODE:
-            uf = 'u'
-        else:
-            uf = ''
-        ver2 = "%s.%s" % (VER_MAJOR, VER_MINOR)
+        WX_CONFIG='wx-config'
         port = WXPORT
         if port == "x11":
             port = "x11univ"
         port = WXPORT
         if port == "x11":
             port = "x11univ"
-        WX_CONFIG = 'wx%s%s%s-%s-config' % (port, uf, df, ver2)
+        flags =  ' --toolkit=%s' % port
+        flags += ' --unicode=%s' % (UNICODE and 'yes' or 'no')
+        flags += ' --version=%s.%s' % (VER_MAJOR, VER_MINOR)
 
         searchpath = os.environ["PATH"]
         for p in searchpath.split(':'):
 
         searchpath = os.environ["PATH"]
         for p in searchpath.split(':'):
-            fp = os.path.join(p, WX_CONFIG)
+            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)
             if os.path.exists(fp) and os.access(fp, os.X_OK):
                 # success
                 msg("Found wx-config: " + fp)
-                WX_CONFIG = fp
+                msg("    Using flags: " + flags)
+                WX_CONFIG = fp + flags
                 break
         else:
                 break
         else:
-            msg("WX_CONFIG not specified and %s not found on $PATH "
-                  "defaulting to \"wx-config\"" % WX_CONFIG)
-            WX_CONFIG = 'wx-config'
-
+            msg("ERROR: WX_CONFIG not specified and wx-config not found on the $PATH")
+            # should we exit?
 
 
+        # TODO:  exeucte WX_CONFIG --list and verify a matching config is found
+        
 
 def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
              swig_deps=[], add_under=False):
 
 def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
              swig_deps=[], add_under=False):
@@ -288,6 +285,8 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
         os.mkdir(os.path.join(dir, gendir))
 
     if USE_SWIG and not os.path.exists(os.path.join("docs", "xml-raw")):
         os.mkdir(os.path.join(dir, gendir))
 
     if USE_SWIG and not os.path.exists(os.path.join("docs", "xml-raw")):
+        if not os.path.exists("docs"):
+            os.mkdir("docs")
         os.mkdir(os.path.join("docs", "xml-raw"))
 
     sources = []
         os.mkdir(os.path.join("docs", "xml-raw"))
 
     sources = []
@@ -300,7 +299,7 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
         i_file   = os.path.join(dir, file)
         py_file  = os.path.join(dir, gendir, pre+basefile+'.py')
         cpp_file = os.path.join(dir, gendir, pre+basefile+'_wrap.cpp')
         i_file   = os.path.join(dir, file)
         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+pre+'_swig.xml')
 
         if add_under:
             interface = ['-interface', '_'+basefile+'_']
 
         if add_under:
             interface = ['-interface', '_'+basefile+'_']
@@ -321,7 +320,6 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
                 #i_file = opj(i_file)     #'/'.join(i_file.split('\\'))
 
                 if BUILD_RENAMERS:
                 #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
                     xmltemp = tempfile.mktemp('.xml')
 
                     # First run swig to produce the XML file, adding
@@ -334,10 +332,8 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
                     spawn(cmd)
 
                     # Next run build_renamers to process the XML
                     spawn(cmd)
 
                     # Next run build_renamers to process the XML
-                    cmd = [ sys.executable, '-u',
-                            './distrib/build_renamers.py', dir, pre+basefile, xmltemp]
-                    msg(' '.join(cmd))
-                    spawn(cmd)
+                    myRenamer = BuildRenamers()
+                    myRenamer.run(dir, pre+basefile, xmltemp)
                     os.remove(xmltemp)
 
                 # Then run swig for real
                     os.remove(xmltemp)
 
                 # Then run swig for real
@@ -426,7 +422,10 @@ class wx_install_headers(distutils.command.install_headers.install_headers):
         if root is None or WXPREFIX.startswith(root):
             root = ''
         for header, location in headers:
         if root is None or WXPREFIX.startswith(root):
             root = ''
         for header, location in headers:
-            install_dir = os.path.normpath(root + WXPREFIX + location)
+            install_dir = os.path.normpath(root +
+                                           WXPREFIX +
+                                           '/include/wx-%d.%d/wx' % (VER_MAJOR, VER_MINOR) +
+                                           location)
             self.mkpath(install_dir)
             (out, _) = self.copy_file(header, install_dir)
             self.outfiles.append(out)
             self.mkpath(install_dir)
             (out, _) = self.copy_file(header, install_dir)
             self.outfiles.append(out)
@@ -720,6 +719,9 @@ if UNICODE:
     BUILD_BASE = BUILD_BASE + '.unicode'
     VER_FLAGS += 'u'
 
     BUILD_BASE = BUILD_BASE + '.unicode'
     VER_FLAGS += 'u'
 
+if os.path.exists('DAILY_BUILD'):
+    
+    VER_FLAGS += '.' + open('DAILY_BUILD').read().strip()
 
 VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
                              VER_SUBREL, VER_FLAGS)
 
 VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
                              VER_SUBREL, VER_FLAGS)
@@ -740,7 +742,7 @@ swig_args = ['-c++',
              '-new_repr',
              '-modern',
 
              '-new_repr',
              '-modern',
 
-             '-I./src',
+             '-I' + opj(WXPY_SRC, 'src'),
              '-D'+WXPLAT,
              '-noruntime'
              ]
              '-D'+WXPLAT,
              '-noruntime'
              ]
@@ -751,9 +753,11 @@ if FULL_DOCS:
     swig_args.append('-D_DO_FULL_DOCS')
     
 
     swig_args.append('-D_DO_FULL_DOCS')
     
 
-swig_deps = [ 'src/my_typemaps.i',
-              'src/common.swg',
-              'src/pyrun.swg',
+swig_deps = [ opj(WXPY_SRC, 'src/my_typemaps.i'),
+              opj(WXPY_SRC, 'src/my_fragments.i'),
+              opj(WXPY_SRC, 'src/common.swg'),
+              opj(WXPY_SRC, 'src/pyrun.swg'),
+              opj(WXPY_SRC, 'src/python.swg'),
               ]
 
 depends = [ #'include/wx/wxPython/wxPython.h',
               ]
 
 depends = [ #'include/wx/wxPython/wxPython.h',
@@ -762,3 +766,237 @@ depends = [ #'include/wx/wxPython/wxPython.h',
             ]
 
 #----------------------------------------------------------------------
             ]
 
 #----------------------------------------------------------------------
+
+####################################
+# BuildRenamers
+####################################
+
+import pprint
+import xml.sax            
+
+try:
+    import libxml2
+    FOUND_LIBXML2 = True
+except ImportError:
+    FOUND_LIBXML2 = False
+
+#---------------------------------------------------------------------------
+
+
+renamerTemplateStart = """\
+// A bunch of %rename directives generated by BuildRenamers in config.py
+// in order to remove the wx prefix from all global scope names.
+
+#ifndef BUILDING_RENAMERS
+
+"""
+
+renamerTemplateEnd = """
+#endif
+"""
+
+wxPythonTemplateStart = """\
+## This file reverse renames symbols in the wx package to give
+## them their wx prefix again, for backwards compatibility.
+##
+## Generated by BuildRenamers in config.py
+
+# This silly stuff here is so the wxPython.wx module doesn't conflict
+# with the wx package.  We need to import modules from the wx package
+# here, then we'll put the wxPython.wx entry back in sys.modules.
+import sys
+_wx = None
+if sys.modules.has_key('wxPython.wx'):
+    _wx = sys.modules['wxPython.wx']
+    del sys.modules['wxPython.wx']
+
+import wx.%s
+
+sys.modules['wxPython.wx'] = _wx
+del sys, _wx
+
+
+# Now assign all the reverse-renamed names:
+"""
+
+wxPythonTemplateEnd = """
+
+"""
+
+
+
+#---------------------------------------------------------------------------
+class BuildRenamers:
+    def run(self, destdir, modname, xmlfile, wxPythonDir="wxPython"):    
+
+        assert FOUND_LIBXML2, "The libxml2 module is required to use the BuildRenamers functionality."
+            
+        if not os.path.exists(wxPythonDir):
+            os.mkdir(wxPythonDir)
+
+        swigDest = os.path.join(destdir, "_"+modname+"_rename.i")
+        pyDest = os.path.join(wxPythonDir, modname + '.py')
+    
+        swigDestTemp = tempfile.mktemp('.tmp')
+        swigFile = open(swigDestTemp, "w")
+        swigFile.write(renamerTemplateStart)
+    
+        pyDestTemp = tempfile.mktemp('.tmp')
+        pyFile = open(pyDestTemp, "w")
+        pyFile.write(wxPythonTemplateStart % modname)
+    
+        print "Parsing XML and building renamers..."
+        self.processXML(xmlfile, modname, swigFile, pyFile)
+        
+        self.checkOtherNames(pyFile, modname,
+                        os.path.join(destdir, '_'+modname+'_reverse.txt'))
+        pyFile.write(wxPythonTemplateEnd)        
+        pyFile.close()
+
+        swigFile.write(renamerTemplateEnd)
+        swigFile.close()
+
+        # Compare the files just created with the existing one and
+        # blow away the old one if they are different.
+        for dest, temp in [(swigDest, swigDestTemp),
+                           (pyDest, pyDestTemp)]:
+            if not os.path.exists(dest):
+                os.rename(temp, dest)
+            elif open(dest).read() != open(temp).read():
+                os.unlink(dest)
+                os.rename(temp, dest)
+            else:
+                print dest + " not changed."
+                os.unlink(temp)
+    
+    #---------------------------------------------------------------------------
+    
+    
+    def GetAttr(self, node, name):
+        path = "./attributelist/attribute[@name='%s']/@value" % name
+        n = node.xpathEval2(path)
+        if len(n):
+            return n[0].content
+        else:
+            return None
+        
+    
+    def processXML(self, xmlfile, modname, swigFile, pyFile):
+   
+        topnode = libxml2.parseFile(xmlfile).children
+    
+        # remove any import nodes as we don't need to do renamers for symbols found therein
+        imports = topnode.xpathEval2("*/import")
+        for n in imports:
+            n.unlinkNode()
+            n.freeNode()
+    
+        # do a depth first iteration over what's left
+        for node in topnode:
+            doRename = False
+            doPtr = False
+            addWX = False
+            revOnly = False
+    
+    
+            if node.name == "class":
+                lastClassName = name = self.GetAttr(node, "name")
+                lastClassSymName = sym_name = self.GetAttr(node, "sym_name")
+                doRename = True
+                doPtr = True
+                if sym_name != name:
+                    name = sym_name
+                    addWX = True
+    
+            # renamed constructors
+            elif node.name == "constructor":
+                name     = self.GetAttr(node, "name")
+                sym_name = self.GetAttr(node, "sym_name")
+                if sym_name != name:
+                    name = sym_name
+                    addWX = True
+                    doRename = True
+    
+            # only enumitems at the top level
+            elif node.name == "enumitem" and node.parent.parent.name == "include":
+                name     = self.GetAttr(node, "name")
+                sym_name = self.GetAttr(node, "sym_name")
+                doRename = True
+    
+    
+            elif node.name in ["cdecl", "constant"]:
+                name      = self.GetAttr(node, "name")
+                sym_name  = self.GetAttr(node, "sym_name")
+                toplevel  = node.parent.name == "include"
+    
+                # top-level functions
+                if toplevel and self.GetAttr(node, "view") == "globalfunctionHandler":
+                    doRename = True
+    
+                # top-level global vars
+                elif toplevel and self.GetAttr(node, "feature_immutable") == "1":
+                    doRename = True
+    
+                # static methods
+                elif self.GetAttr(node, "view") == "staticmemberfunctionHandler":
+                    name     = lastClassName + '_' + name
+                    sym_name = lastClassSymName + '_' + sym_name
+                    # only output the reverse renamer in this case
+                    doRename = revOnly = True
+           
+                if doRename and name != sym_name:
+                    name = sym_name
+                    addWX = True
+                   
+    
+            if doRename and name:
+                old = new = name
+                if old.startswith('wx') and not old.startswith('wxEVT_'):
+                    # remove all wx prefixes except wxEVT_ and write a %rename directive for it
+                    new = old[2:]
+                    if not revOnly:
+                        swigFile.write("%%rename(%s)  %35s;\n" % (new, old))
+    
+                # Write assignments to import into the old wxPython namespace
+                if addWX and not old.startswith('wx'):
+                    old = 'wx'+old
+                pyFile.write("%s = wx.%s.%s\n" % (old, modname, new))
+                if doPtr:
+                    pyFile.write("%sPtr = wx.%s.%sPtr\n" % (old, modname, new))
+                
+    
+    #---------------------------------------------------------------------------
+    
+    def checkOtherNames(self, pyFile, moduleName, filename):
+        if os.path.exists(filename):
+            prefixes = []
+            for line in file(filename):
+                if line.endswith('\n'):
+                    line = line[:-1]
+                if line and not line.startswith('#'):
+                    if line.endswith('*'):
+                        prefixes.append(line[:-1])
+                    elif line.find('=') != -1:
+                        pyFile.write("%s\n" % line)
+                    else:
+                        wxname = 'wx' + line
+                        if line.startswith('wx') or line.startswith('WX') or line.startswith('EVT'):
+                            wxname = line
+                        pyFile.write("%s = wx.%s.%s\n" % (wxname, moduleName, line))
+    
+            if prefixes:
+                pyFile.write(
+                    "\n\nd = globals()\nfor k, v in wx.%s.__dict__.iteritems():"
+                    % moduleName)
+                first = True
+                for p in prefixes:
+                    if first:
+                        pyFile.write("\n    if ")
+                        first = False
+                    else:
+                        pyFile.write("\n    elif ")
+                    pyFile.write("k.startswith('%s'):\n        d[k] = v" % p)
+                pyFile.write("\ndel d, k, v\n\n")
+
+                        
+#---------------------------------------------------------------------------