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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 748
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=748&view=rev
Author:   andy_miller
Date:     2008-09-21 01:06:49 +0000 (Sun, 21 Sep 2008)

Log Message:
-----------
Changes for Linux unstable -- Ogre 1.6.0RC1 and Boost 1_36 support

Modified Paths:
--------------
    trunk/python-ogre/PythonOgreConfig_posix.py
    trunk/python-ogre/boost/Makefile
    trunk/python-ogre/code_generators/bullet/customization_data.py
    trunk/python-ogre/code_generators/bullet/python_bullet.h
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================

--- trunk/python-ogre/PythonOgreConfig_posix.py	2008-09-19 09:55:35 UTC (rev 747)
+++ trunk/python-ogre/PythonOgreConfig_posix.py	2008-09-21 01:06:49 UTC (rev 748)
@@ -70,7 +70,7 @@
 PATH_NxOgre=        os.path.join(PATH_THIRDPARTY, 'nxogre')
 PATH_NxOgre_09=        os.path.join(PATH_THIRDPARTY, 'nxogre_0.9')
 # PATH_NxOgre=        os.path.join(BASE_DIR, 'nxogre/NxOgre')
-PATH_Bullet=        os.path.join(BASE_DIR, 'bullet-2.66') 
+PATH_Bullet=        os.path.join(BASE_DIR, 'bullet-2.69') 
 ###PATH_PhysX=         os.path.join(BASE_DIR, 'Physx/v2.7.3/SDKs')
 PATH_Theora=        os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
 PATH_ffmpeg=        os.path.join(BASE_DIR, 'ffmpeg')

Modified: trunk/python-ogre/boost/Makefile
===================================================================
--- trunk/python-ogre/boost/Makefile	2008-09-19 09:55:35 UTC (rev 747)
+++ trunk/python-ogre/boost/Makefile	2008-09-21 01:06:49 UTC (rev 748)
@@ -8,6 +8,8 @@
 CXXFLAGS=-g \
        -I.  \
        -I/usr/include/python${PYTHON_VERSION} \
+       -I${PREFIX}/include/ \
+       -I${PREFIX}/include/boost-${BOOST_VERSION_PATH} \
        -shared \
 		-Wl,-soname,libboost_python_index-gcc${GCC_VERSION}-${BOOST_VERSION}.so \
 		-o libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so -fPIC \
@@ -31,15 +33,15 @@
 
 install:
 	@make version
-	mkdir -p ${PREFIX}/usr/lib
-	@echo cp libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so ${PREFIX}/usr/lib
-	@cp libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so ${PREFIX}/usr/lib
-	@echo ln -sf /usr/lib/libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so ${PREFIX}/usr/lib/libboost_python_index.so
-	@ln -sf /usr/lib/libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so ${PREFIX}/usr/lib/libboost_python_index.so
+	mkdir -p ${PREFIX}/lib
+	@echo cp libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so ${PREFIX}/lib
+	@cp libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so ${PREFIX}/lib
+	@echo ln -sf /usr/lib/libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so ${PREFIX}/lib/libboost_python_index.so
+	@ln -sf /usr/lib/libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so ${PREFIX}/lib/libboost_python_index.so
 	
-	mkdir -p ${PREFIX}/usr/include
-	cp -rvf boost ${PREFIX}/usr/include
-	rm -rf `find ${PREFIX}/usr/include -name .svn -type d`
+	mkdir -p ${PREFIX}/include
+	cp -rvf boost ${PREFIX}/include
+	rm -rf `find ${PREFIX}/include -name .svn -type d`
 
 clean:
 	rm *.so

Modified: trunk/python-ogre/code_generators/bullet/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/bullet/customization_data.py	2008-09-19 09:55:35 UTC (rev 747)
+++ trunk/python-ogre/code_generators/bullet/customization_data.py	2008-09-21 01:06:49 UTC (rev 748)
@@ -1,6 +1,7 @@
 
 def header_files( version ):
-    return [ 'btBulletDynamicsCommon.h'
+    return [ 'btBulletDynamicsCommon.h'
+            ,'btBulletCollisionCommon.h'
             ,'LinearMath/btStackAlloc.h'
             ,'LinearMath/btPoolAllocator.h'
             ,'BulletCollision/CollisionDispatch/btSimulationIslandManager.h'
@@ -8,4 +9,4 @@
   
 def huge_classes( version ):
     return []
-   
\ No newline at end of file
+   

Modified: trunk/python-ogre/code_generators/bullet/python_bullet.h
===================================================================
--- trunk/python-ogre/code_generators/bullet/python_bullet.h	2008-09-19 09:55:35 UTC (rev 747)
+++ trunk/python-ogre/code_generators/bullet/python_bullet.h	2008-09-21 01:06:49 UTC (rev 748)
@@ -1,7 +1,9 @@
 
 #undef _MSC_VER
-#include "btBulletDynamicsCommon.h"
+#include "btBulletDynamicsCommon.h"
+#include "btBulletCollisionCommon.h"
 
+
 #include "LinearMath/btStackAlloc.h"
 #include "LinearMath/btPoolAllocator.h"
 #include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-09-19 09:55:35 UTC (rev 747)
+++ trunk/python-ogre/environment.py	2008-09-21 01:06:49 UTC (rev 748)
@@ -464,7 +464,8 @@
         if _STABLE:
             base = 'boost_1_34_1'
         else:
-            base = 'boost_1_37'
+            base = 'boost_1_36_0'
+            versionBase = '1_36' ## the version used on the library name
 
     if isLinux() or isMac():
         bjambase = 'boost-jam-3.1.16'
@@ -513,7 +514,8 @@
                 [0,'sed -i 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,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
                 [0,os.path.join(os.getcwd(), bjambase, "bjam.exe") + ' release --with-python ',os.path.join(os.getcwd(),base)] # --toolset=msvc-8
-                ]
+                ]
+    
     if not isWindows():
         # Figure out the gcc version we are running - this is needed by Boost
         # FIXME: This assumes that the gcc we are building with now was what we built boost with
@@ -522,18 +524,18 @@
         import re
         gcc_version = re.search(r'([0-9]+?\.[0-9]+?\.[0-9]+?)', gccp.communicate()[0]).groups()[0].split('.')
         # FIXME: Should this be the multithreaded version!? 
-        lib = "boost_python-gcc%s%s-mt-%s" % (gcc_version[0], gcc_version[1], base[6:])
+        lib = "boost_python-gcc%s%s-mt-%s" % (gcc_version[0], gcc_version[1], versionBase)
 
 class boost_python_index:
     """ only used for Linx
     """
-    active = True
-    source_version = boost.base[6:].replace("_",".")
+    active = True
+    source_version = boost.versionBase.replace("_",".")
     pythonModule = False
     ModuleName = ""
     base = "libboost-python%s-index" % source_version #.replace(".", "_")
     if isLinux() or isMac():
-        FLAGS = "PREFIX=%s BOOST_VERSION=%s MT=True" % (PREFIX, source_version)
+        FLAGS = "PREFIX=%s BOOST_VERSION=%s BOOST_VERSION_PATH=%s MT=True" % (PREFIX, boost.versionBase,boost.versionBase)
         source = [
              ["rm","-rf %s" % (base,), os.getcwd()],
              ["cp",'-rvf %s/ %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()],
@@ -616,11 +618,29 @@
         if _STABLE:
             version = "1.4"
             base = "ogre-v1-4-9"
+            buildCmds  = [
+                [0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
+                [0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()],
+                [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')],
+                [0, "make", os.path.join(os.getcwd(), 'ogre')],
+                [0, "make install", os.path.join(os.getcwd(), 'ogre')],
+                ]
         else:
-            version = "1.6"
+            version = "1.6.0RC1"
             base = "ogre-v1-6-0RC1"
-
-        libs=[boost.lib, boost_python_index.lib, 'OgreMain']
+            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.0RC1.patch -p0 ", os.getcwd()],
+                [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')],
+                [0, "make", os.path.join(os.getcwd(), 'ogre')],
+                [0, "make install", os.path.join(os.getcwd(), 'ogre')],
+                ]
+        libs=[boost.lib,  'OgreMain']
+        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'
@@ -628,15 +648,7 @@
         source = [
             [wget, "http://downloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
         ]
-        buildCmds  = [
-            [0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
-            [0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()],
-            [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')],
-            [0, "make", os.path.join(os.getcwd(), 'ogre')],
-            [0, "make install", os.path.join(os.getcwd(), 'ogre')],
-        ]
+        
 
     elif isMac():
         version = "1.6.0RC1"
@@ -1457,8 +1469,14 @@
     baseDir = os.path.join(os.getcwd(), base)
     parent = "ogre/physics"
     libs=[boost.lib,  'LibBulletCollision', 'LibBulletDynamics']
-    if os.name == 'nt':
-        libs.append('libbulletmath')
+    if isWindows():
+        libs.append('libbulletmath')
+    else:
+        libs.append('LibLinearMath')
+        libs.append('LibBulletSoftBody')
+        libs.append('LibBulletColladaConverter')
+        libs.append('LibBulletMultiThreaded')
+
     lib_dirs = [ Config.PATH_LIB_Boost
                 ,  Config.PATH_LIB_Bullet
                 ]
@@ -1498,7 +1516,9 @@
         'LibBulletCollision', 'LibBulletDynamics'
         ]
     if isWindows():
-        libs.append('LibBulletMath')        
+        libs.append('libbulletmath')
+    else:
+        libs.append('LibLinearMath')
     include_dirs = [Config.PATH_Boost
                     , Config.PATH_INCLUDE_Bullet
                     , os.path.join(Config.PATH_OgreBullet, 'Collisions' )
@@ -1527,7 +1547,9 @@
         'LibBulletCollision', 'LibBulletDynamics'
         ]
     if isWindows():
-        libs.append('LibBulletMath')        
+        libs.append('libbulletmath')
+    else:
+        libs.append('LibLinearMath')
     include_dirs = [Config.PATH_Boost
                     , Config.PATH_INCLUDE_Bullet
                     , os.path.join(Config.PATH_OgreBullet, 'Collisions' )


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


