[Python-ogre-commit] SF.net SVN: python-ogre:[768] trunk/python-ogre

[<and...@us...>]

Revision: 768
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=768&view=rev
Author:   andy_miller
Date:     2008-10-21 02:37:39 +0000 (Tue, 21 Oct 2008)

Log Message:
-----------
Apply patch to pygccxml for type_traits - needed for Ogre wrapper and smart pointers

Modified Paths:
--------------
    trunk/python-ogre/environment.py

Added Paths:
-----------
    trunk/python-ogre/patch/pygccxml.patch

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-10-20 15:13:26 UTC (rev 767)
+++ trunk/python-ogre/environment.py	2008-10-21 02:37:39 UTC (rev 768)
@@ -285,17 +285,19 @@
                     [svn, " co -r 1383 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()]
                  ]
     else:                 
-        source_version = "1415"
+        source_version = "1441"
         source = [
-                    [svn, " co  http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()]
-                 ]             
+                    [svn, " co -r 1441 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()]
+                    ]             
     if isLinux() or isMac() :
         buildCmds =  [
-                [0,"python setup.py install  --prefix="+ PREFIX , os.path.join (os.getcwd(), base) ],
+                    [0, "patch -s -N -i ../python-ogre/patch/pygccxml.patch -p0 ", os.path.join(os.getcwd(), base) ],
+                    [0,"python setup.py install  --prefix="+ PREFIX , os.path.join (os.getcwd(), base) ],
                     ]                       
     if isWindows():
         buildCmds =  [
-                [0,"python setup.py install  " , os.path.join (os.getcwd(), base) ],
+                    [0, "patch -s -N -i ../python-ogre/patch/pygccxml.patch -p0 ", os.path.join(os.getcwd(), base) ],
+                    [0,"python setup.py install  " , os.path.join (os.getcwd(), base) ],
                     ]                       
                     
 
@@ -309,9 +311,9 @@
                     [svn, " co -r 1383 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
                  ]
     else:                 
-        source_version = "1415"
+        source_version = "1441"
         source = [
-                    [svn, " co http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
+                    [svn, " co -r 1441 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
                  ]             
     if isLinux() or isMac() :
         buildCmds =  [

Added: trunk/python-ogre/patch/pygccxml.patch
===================================================================
--- trunk/python-ogre/patch/pygccxml.patch	                        (rev 0)
+++ trunk/python-ogre/patch/pygccxml.patch	2008-10-21 02:37:39 UTC (rev 768)
@@ -0,0 +1,19 @@
+Index: pygccxml/declarations/type_traits.py
+===================================================================
+--- pygccxml/declarations/type_traits.py	(revision 1441)
++++ pygccxml/declarations/type_traits.py	(working copy)
+@@ -990,10 +990,11 @@
+         return type.decl_string.startswith( '::boost::shared_ptr<' )
+ 
+     @staticmethod
+-    def value_type( type ):
++    def value_type( type, check=True ):
+         """returns reference to boost::shared_ptr value type"""
+-        if not smart_pointer_traits.is_smart_pointer( type ):
+-            raise TypeError( 'Type "%s" is not instantiation of boost::shared_ptr' % type.decl_string )
++        if check:
++            if not smart_pointer_traits.is_smart_pointer( type ):
++                raise TypeError( 'Type "%s" is not instantiation of boost::shared_ptr' % type.decl_string )
+         type = remove_alias( type )
+         cls = remove_cv( type )
+         cls = remove_declarated( type )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.