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

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

Revision: 622
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=622&view=rev
Author:   andy_miller
Date:     2008-06-27 18:46:50 -0700 (Fri, 27 Jun 2008)

Log Message:
-----------
Fixes to get CEGUI to work under Linux.  Instead of patching CEGUI source we now
use a fix from Tim (Mithro) to force loading CEGUIBase correctly
Also further documentation parsing fixes for CEGUI

Modified Paths:
--------------
    trunk/python-ogre/code_generators/common_utils/extract_documentation.py
    trunk/python-ogre/demos/cegui/CEGUI_framework.py
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/code_generators/common_utils/extract_documentation.py
===================================================================
--- trunk/python-ogre/code_generators/common_utils/extract_documentation.py	2008-06-27 23:35:13 UTC (rev 621)
+++ trunk/python-ogre/code_generators/common_utils/extract_documentation.py	2008-06-28 01:46:50 UTC (rev 622)
@@ -190,6 +190,8 @@
     _str = clean(_str, "\\Return", "@return")
 #     _str = clean(_str, "@note", "Note: ")
     _str = clean(_str, "@remarks", "@see")
+    _str = clean(_str, "\\remarks", "@see")
+    _str = clean(_str, "\\Remarks", "@see")
 #     _str = clean(_str, "@see", "See: ")
     _str = clean(_str, "\\see", "@see")
     _str = clean(_str, "@ref", "@see")
@@ -220,7 +222,13 @@
     _str = clean(_str, "\\image", "Image: ")     ## nxPhysics
     
     _str = clean(_str, "\\examples", "Examples: ")     ## nxOgre
-    _str = clean(_str, "\\default", "Default: ")     ## nxOgre
+    _str = clean(_str, "\\default", "Default: ")     ## nxOgre
+
+    _str = clean(_str, "\\version", "@version ")     ## cegui
+    _str = clean(_str, "\\date", "@date ")     #
+    _str = clean(_str, "\\todo", "@todo ")     ## 
+    _str = clean(_str, "\\bug", "@Bug ")     ## 
+    _str = clean(_str, "\\author", "@Author ")     ## 
     
     
     ## now clean up the rest

Modified: trunk/python-ogre/demos/cegui/CEGUI_framework.py
===================================================================
--- trunk/python-ogre/demos/cegui/CEGUI_framework.py	2008-06-27 23:35:13 UTC (rev 621)
+++ trunk/python-ogre/demos/cegui/CEGUI_framework.py	2008-06-28 01:46:50 UTC (rev 622)
@@ -1,4 +1,17 @@
+import ctypes
+
+# The follow patch from Tim (Mithro) fixes a loder issue with CEGUI - previously we'd patched CEGUI to
+# ensure the CEGUIBase was linked to every module to solve the issue with Python dynamically loading
+# the _cegui_.so module without RTLD_GLOBAL set - then when CEGUI opened it's dynamic modules it
+# couldn't find all the symbols.
+
+print ctypes.CDLL("../../../root/usr/lib/libCEGUIBase.so", ctypes.RTLD_GLOBAL )
+
 import ogre.gui.CEGUI as CEGUI
+
+# Another fix for CEGUI to ensure we get a working parser..
+CEGUI.System.setDefaultXMLParserName("TinyXMLParser")
+
 import ogre.io.OIS as OIS
 import SampleFramework
 

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-06-27 23:35:13 UTC (rev 621)
+++ trunk/python-ogre/environment.py	2008-06-28 01:46:50 UTC (rev 622)
@@ -769,10 +769,10 @@
             source=[
                 [wget, "http://downloads.sourceforge.net/crayzedsgui/CEGUI-0.6.0.tar.gz", downloadPath]
                 ]
-                        
+                   
         buildCmds  = [
                 [0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",os.getcwd() ],
-                [0, "patch -s -N -i ../python-ogre/patch/cegui.patch -p0", os.path.join(os.getcwd(),base)],
+#                [0, "patch -s -N -i ../python-ogre/patch/cegui.patch -p0", os.path.join(os.getcwd(),base)],
                 [0, "echo 'EMPTY' >>./INSTALL", os.path.join(os.getcwd(),base)],
                 [0, "echo 'EMPTY' >>./NEWS", os.path.join(os.getcwd(),base)],
                 [0, "aclocal", os.path.join(os.getcwd(),base)],


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