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

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

Revision: 794
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=794&view=rev
Author:   andy_miller
Date:     2008-11-16 22:49:25 +0000 (Sun, 16 Nov 2008)

Log Message:
-----------
Linux build updates

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

Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py	2008-11-15 01:16:12 UTC (rev 793)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py	2008-11-16 22:49:25 UTC (rev 794)
@@ -831,7 +831,13 @@
     ## handle a problem hashmap
     mb.member_function('::Ogre::Mesh::getSubMeshNameMap').exclude()
     stdex_ns = mb.global_ns.namespace("__gnu_cxx")
-    stdex_ns.class_('hash_map<std::string, unsigned short, __gnu_cxx::hash<std::string>, std::equal_to<std::string>, std::allocator<unsigned short> >').exclude
+    stdex_ns.class_('hash_map<std::string, unsigned short, __gnu_cxx::hash<std::string>, std::equal_to<std::string>, std::allocator<unsigned short> >').exclude
+    for f in mb.member_functions():
+        if f.name == 'getChildIterator':
+            print "LINUX SPECIAL:", f
+            ###f.exclude()
+    #mb.member_function('::Ogre::Node::getChildIterator').exclude()
+   # mb.member_functions('::Ogre::Bone::getChildIterator').exclude()
 
 
 def Fix_NT ( mb ):
@@ -1075,7 +1081,9 @@
     undefine_symbols=[]
     if environment._USE_THREADS:
         defined_symbols.append('BOOST_HAS_THREADS')
-        defined_symbols.append('BOOST_HAS_WINTHREADS')
+        if environment.isWindows():
+            defined_symbols.append('BOOST_HAS_WINTHREADS')
+
     defined_symbols.append( 'OGRE_VERSION_' + environment.ogre.version )  
     
     print os.getcwd()

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-11-15 01:16:12 UTC (rev 793)
+++ trunk/python-ogre/environment.py	2008-11-16 22:49:25 UTC (rev 794)
@@ -18,10 +18,6 @@
 _LOGGING_ON = False
 _PreCompiled = True
 
-##
-## set this to True if you compiled Ogre with Threads enabled
-##
-_USE_THREADS = True
 
 def log ( instring ):
     if _LOGGING_ON:
@@ -45,6 +41,14 @@
         return True
     return False
     
+##
+## set this to True if you compiled Ogre with Threads enabled
+##
+if isWindows():
+    _USE_THREADS = True
+else:
+    _USE_THREADS = False
+    
                     
 PythonOgreMajorVersion = "1"
 PythonOgreMinorVersion = "6" 
@@ -202,7 +206,7 @@
     else:
        source_version = "20080901"
        source = [
-                [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co  -D 01Sep2008 "+base, os.getcwd()]
+                [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co  "+base, os.getcwd()]
              ]
     if isLinux() or isMac():
         buildCmds =  [
@@ -373,7 +377,7 @@
     if isLinux() or isMac():
         base = 'FreeImage'
         source = [
-                    [wget, " http://prdownloads.sourceforge.net/freeimage/FreeImage3110.zip",downloadPath],
+                    [wget, " http://downloads.sourceforge.net/freeimage/FreeImage3110.zip",downloadPath],
                  ]
                  
         if isLinux():
@@ -498,7 +502,7 @@
                 [0, sed_ + " 's/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/' "+base+"/configure", '' ],
                 [0, sed_ + " s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ "+base+"/boost/python/detail/preprocessor.hpp", ''],
                 [0, sed_ + ' s/"# include <boost\/preprocessor\/cat.hpp>"/"\\n#define BOOST_PYTHON_NO_PY_SIGNATURES\\n# include <boost\/preprocessor\/cat.hpp>"/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
-                [0,"./configure --with-libraries=python --prefix=%s --without-icu --with-bjam=../root/usr/bin/bjam"  % PREFIX, os.path.join(os.getcwd(), base )],
+                [0,"./configure --with-libraries=python,thread,date_time --prefix=%s --without-icu --with-bjam=../root/usr/bin/bjam"  % PREFIX, os.path.join(os.getcwd(), base )],
                 [0,'make', os.path.join(os.getcwd(), base )],
                 [0,'make install', os.path.join(os.getcwd(), base )],
                 ]
@@ -563,7 +567,7 @@
     pythonModule = True
     name='ogre'
     ModuleName='OGRE'
-    CCFLAGS = ""
+    CCFLAGS = " "
     cflags=''
     moduleParentLocation = "renderer"
     parent = "ogre/renderer"
@@ -639,7 +643,8 @@
             base = "ogre-v1-6-0"
             buildCmds  = [
                 [0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
-                [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()],
+                [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()],
+                [0, "sed --in-place -s 's|#define OGRE_THREAD_SUPPORT 1|#define OGRE_THREAD_SUPPORT 0|' OgreConfig.h",os.path.join(os.getcwd(),"ogre","OgreMain", "include")],
                 [0, "aclocal", os.path.join(os.getcwd(), 'ogre')],
                 [0, "./bootstrap", os.path.join(os.getcwd(), 'ogre')],
                 [0, "./configure --prefix=%s --with-gui=Xt --disable-devil" % PREFIX, os.path.join(os.getcwd(), 'ogre')],
@@ -650,8 +655,8 @@
         libs.append ( boost_python_index.lib )
         lib_dirs=[Config.LOCAL_LIB]
         include_dirs=[Config.PATH_Boost, Config.PATH_INCLUDE_Ogre]
-        CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
-
+        CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D__PYTHONOGRE_BUILD_CODE '
+        
         source = [
             [wget, "http://downloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
         ]
@@ -878,8 +883,9 @@
 #                [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)],
-                [0, "automake" ,os.path.join(os.getcwd(), base )],
+#                [0, "aclocal", os.path.join(os.getcwd(),base)],
+#cl                [0, "automake" ,os.path.join(os.getcwd(), base )],
+                [0, "./bootstrap" ,os.path.join(os.getcwd(), base )],
                 [0,"./configure --prefix=%s --enable-freeimage=yes --with-default-xml-parser=TinyXMLParser --disable-samples --without-ogre-renderer --includedir=%s/include" %(PREFIX,PREFIX) ,os.path.join(os.getcwd(), base )],
                 [0,'make', os.path.join(os.getcwd(), base )],
                 [0,'make install', os.path.join(os.getcwd(), base )]


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