Thread: [Python-ogre-commit] SF.net SVN: python-ogre:[660] trunk/python-ogre/environment.py
Brought to you by:
andy_miller,
roman_yakovenko
From: <mi...@us...> - 2008-07-17 05:46:54
|
Revision: 660 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=660&view=rev Author: mithro Date: 2008-07-17 05:47:03 +0000 (Thu, 17 Jul 2008) Log Message: ----------- Fixed the src command for boost_index_python. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-07-16 08:18:07 UTC (rev 659) +++ trunk/python-ogre/environment.py 2008-07-17 05:47:03 UTC (rev 660) @@ -525,7 +525,7 @@ base = "libboost-python%s-index" % boost.base[6:].replace("_",".") if isLinux() or isMac(): source = [ - ["cp",'-rf %s %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()], + ["cp",'-rf %s/ %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()], ] # FIXME: This should have build commands! buildCmds = [] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-07-22 04:45:14
|
Revision: 664 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=664&view=rev Author: mithro Date: 2008-07-22 04:45:24 +0000 (Tue, 22 Jul 2008) Log Message: ----------- Clean the directory before retreiving the boost-python-index package. Fixed the base name for boost. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-07-18 13:58:55 UTC (rev 663) +++ trunk/python-ogre/environment.py 2008-07-22 04:45:24 UTC (rev 664) @@ -455,7 +455,7 @@ base = 'boost_1_34_1' lib= 'boost_python-vc90-mt-1_34_1' else: - base = 'boost_1_35_0' + base = 'boost_1_35' lib = 'boost_python-vc90-mt-1_36' if isLinux() or isMac(): @@ -525,7 +525,8 @@ base = "libboost-python%s-index" % boost.base[6:].replace("_",".") if isLinux() or isMac(): source = [ - ["cp",'-rf %s/ %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()], + ["rm","-rf %s" % (base,), os.getcwd()], + ["cp",'-rvf %s/ %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()], ] # FIXME: This should have build commands! buildCmds = [] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-07-22 09:52:42
|
Revision: 666 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=666&view=rev Author: mithro Date: 2008-07-22 09:52:48 +0000 (Tue, 22 Jul 2008) Log Message: ----------- Remove the boost python indexing extras as they are now in a seperate build target. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-07-22 09:51:07 UTC (rev 665) +++ trunk/python-ogre/environment.py 2008-07-22 09:52:48 UTC (rev 666) @@ -481,7 +481,6 @@ ## and now boost [0, tar + ' zxf ' + os.path.join(downloadPath, base) + '.tar.gz', ''], [0,'chmod -R +rw *', os.path.join(os.getcwd(), base ) ], - [0,cp + ' -R '+os.path.join('python-ogre','boost','*') +' ' + base , ''], # need to overwrite the boost with our files [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', '' ], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-07-23 06:12:08
|
Revision: 669 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=669&view=rev Author: mithro Date: 2008-07-23 06:12:17 +0000 (Wed, 23 Jul 2008) Log Message: ----------- Link OgreAL against boost_python_index. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-07-23 06:08:39 UTC (rev 668) +++ trunk/python-ogre/environment.py 2008-07-23 06:12:17 UTC (rev 669) @@ -1320,7 +1320,7 @@ [0, "aclocal\n./autogen.sh", os.path.join(os.getcwd(),"openal-0.0.8")], [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")] ] - libs=[boost.lib, 'OgreMain', + libs=[boost.lib, boost_python_index.lib, 'OgreMain', 'ogg', 'vorbis','vorbisfile','vorbisenc', 'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-07-23 11:38:54
|
Revision: 671 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=671&view=rev Author: mithro Date: 2008-07-23 11:39:02 +0000 (Wed, 23 Jul 2008) Log Message: ----------- Fixed some packages missing boost_python_index. Fixed some excess linking for ogreal. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-07-23 10:04:31 UTC (rev 670) +++ trunk/python-ogre/environment.py 2008-07-23 11:39:02 UTC (rev 671) @@ -945,7 +945,7 @@ Config.PATH_LIB_Ogre_OgreMain ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] + libs=[ boost.lib, boost_python_index.lib, 'OgreMain' ] ModuleName="caelum" class ogreode: @@ -1197,7 +1197,7 @@ if os.name == "nt": libs = [ boost.lib, 'winmm', 'User32','wsock32', 'opengl32.lib','glu32.lib' ] else: - libs = [ boost.lib ] # Note sure what linux libraries are needed + libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed class physx: active = True @@ -1320,9 +1320,9 @@ [0, "aclocal\n./autogen.sh", os.path.join(os.getcwd(),"openal-0.0.8")], [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")] ] - libs=[boost.lib, boost_python_index.lib, 'OgreMain', - 'ogg', - 'vorbis','vorbisfile','vorbisenc', + libs=[boost.lib, boost_python_index.lib, 'OgreMain', 'vorbisfile', + #'ogg', + #'vorbis','vorbisfile','vorbisenc', 'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves ModuleName = 'OgreAL' @@ -1386,7 +1386,7 @@ version= "2.2" name='et' parent = "ogre/addons" - libs=[ boost.lib, 'OgreMain' ] + libs=[ boost.lib, boost_python_index.lib, 'OgreMain' ] lib_dirs = [ Config.PATH_LIB_Boost, Config.PATH_LIB_Ogre_OgreMain ] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-08-02 02:45:07
|
Revision: 683 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=683&view=rev Author: andy_miller Date: 2008-08-02 02:45:14 +0000 (Sat, 02 Aug 2008) Log Message: ----------- Fixes for Windows compile with ode 0.10.1 Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-08-01 15:46:47 UTC (rev 682) +++ trunk/python-ogre/environment.py 2008-08-02 02:45:14 UTC (rev 683) @@ -735,7 +735,7 @@ [0, "make install", baseDir], ] if isWindows(): - libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer'] + libs=[boost.lib, 'OgreMain', 'ode_single', 'ReferenceAppLayer'] else: libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer'] lib_dirs = [ Config.PATH_LIB_Boost @@ -881,10 +881,12 @@ version= "0.10" name ='ode' parent = "ogre/physics" - libs=[boost.lib, 'ode'] + odeLibraryName = 'ode' + libs=[boost.lib, odeLibraryName] if isWindows(): - libs= [boost.lib, 'ode_single', 'User32'] # needed for MessageBox function + odeLibraryName = 'ode_single' + libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function lib_dirs = [ Config.PATH_LIB_Boost , Config.PATH_LIB_ODE @@ -1000,7 +1002,11 @@ [0, "make install", baseDir], ] - libs=[boost.lib, 'OgreMain', 'ode', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ] + libs=[boost.lib, 'OgreMain', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ] + if isLinux(): + libs.append('ode') + else: + libs.append('ode_single') CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19' CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'ode/ode.h', 'ode/odecpp.h', 'OgreOde_Core.h', 'OgreOde_Loader.h', 'Ogreode_Prefab.h'] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-08-18 01:57:36
|
Revision: 692 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=692&view=rev Author: mithro Date: 2008-08-18 01:57:45 +0000 (Mon, 18 Aug 2008) Log Message: ----------- Use a regex to find the version number (rather then a split). Should work on SUSE and other people who modify the version line. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-08-17 13:10:15 UTC (rev 691) +++ trunk/python-ogre/environment.py 2008-08-18 01:57:45 UTC (rev 692) @@ -511,8 +511,8 @@ # FIXME: This assumes that the gcc we are building with now was what we built boost with import subprocess gccp = subprocess.Popen (["gcc", "--version"], stdout=subprocess.PIPE) - gcc_version = gccp.communicate()[0].split('\n')[0].split()[2].split('.') - + import re + gcc_version = re.search(r'([0-9]+?\.[0-9]+?\.[0-9]+?)', gccp.communicate()[0]).groups()[0] # FIXME: Should this be the multithreaded version!? lib = "boost_python-gcc%s%s-%s" % (gcc_version[0], gcc_version[1], base[6:]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-08-18 02:01:10
|
Revision: 693 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=693&view=rev Author: mithro Date: 2008-08-18 02:01:21 +0000 (Mon, 18 Aug 2008) Log Message: ----------- Fixed an unescaped untar. Andy, could you look at this line? I don't think this will work properly under Windows. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-08-18 01:57:45 UTC (rev 692) +++ trunk/python-ogre/environment.py 2008-08-18 02:01:21 UTC (rev 693) @@ -904,7 +904,8 @@ ["wget", "http://downloads.sourceforge.net/opende/ode-0.10.1.tar.gz",downloadPath] ] buildCmds = [ - [0, untar + os.path.join(downloadPath,"ode-0.10.1.tar.gz"), ''], + # FIXME: Should this untar not use the unTarGz method mentioned above? + [0, 'untar' + os.path.join(downloadPath,"ode-0.10.1.tar.gz"), ''], [0, "chmod +x autogen.sh", baseDir], [0, "./autogen.sh", baseDir], [0, "./configure --prefix=%s --includedir=%s/include" %(PREFIX, PREFIX), baseDir], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-08-18 04:12:26
|
Revision: 694 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=694&view=rev Author: mithro Date: 2008-08-18 04:12:37 +0000 (Mon, 18 Aug 2008) Log Message: ----------- Fixed the boost directory and make sure it exists. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-08-18 02:01:21 UTC (rev 693) +++ trunk/python-ogre/environment.py 2008-08-18 04:12:37 UTC (rev 694) @@ -455,7 +455,7 @@ base = 'boost_1_34_1' lib= 'boost_python-vc90-mt-1_34_1' else: - base = 'boost_1_35' + base = 'boost_1_35_0' lib = 'boost_python-vc90-mt-1_36' if isLinux() or isMac(): @@ -475,9 +475,9 @@ ## first handle bjam [0, tar + ' zxf ' + os.path.join(downloadPath, bjambase) + '.tgz --overwrite', ''], [0,"./build.sh " + bjambuildset, os.path.join(os.getcwd(), bjambase )], + [0,"mkdir -p %s/bin/" % PREFIX, os.path.join(os.getcwd(), bjambase )], + [0,cp + " bjam %s/bin/" % PREFIX, os.path.join(os.getcwd(), bjambase, bjambuilddir )], ## may need to change on 64 bit systems - [0,cp + " bjam %s/bin" % PREFIX, os.path.join(os.getcwd(), bjambase, bjambuilddir )], ## may need to change on 64 bit systems - ## and now boost [0, tar + ' zxf ' + os.path.join(downloadPath, base) + '.tar.gz', ''], [0,'chmod -R +rw *', os.path.join(os.getcwd(), base ) ], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-08-18 08:35:36
|
Revision: 696 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=696&view=rev Author: mithro Date: 2008-08-18 08:35:42 +0000 (Mon, 18 Aug 2008) Log Message: ----------- Second try and trying to get the regex to work. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-08-18 08:33:08 UTC (rev 695) +++ trunk/python-ogre/environment.py 2008-08-18 08:35:42 UTC (rev 696) @@ -512,9 +512,9 @@ import subprocess gccp = subprocess.Popen (["gcc", "--version"], stdout=subprocess.PIPE) import re - gcc_version = re.search(r'([0-9]+?\.[0-9]+?\.[0-9]+?)', gccp.communicate()[0]).groups()[0] + 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-%s" % (gcc_version[0], gcc_version[1], base[6:]) + lib = "boost_python-gcc%s%s-mt-%s" % (gcc_version[0], gcc_version[1], base[6:]) class boost_python_index: active = True This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-09-02 08:21:01
|
Revision: 722 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=722&view=rev Author: mithro Date: 2008-09-02 08:21:07 +0000 (Tue, 02 Sep 2008) Log Message: ----------- On Linux use Boost 1.34.0 on the stable version. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-09-02 07:53:57 UTC (rev 721) +++ trunk/python-ogre/environment.py 2008-09-02 08:21:07 UTC (rev 722) @@ -453,13 +453,19 @@ pythonModule = False ModuleName = "" - if _STABLE: - base = 'boost_1_36_0' - lib= 'boost_python-vc90-mt-1_36' - else: - base = 'boost_1_37' - lib = 'boost_python-vc90-mt-1_37' - + if isWindows(): + if _STABLE: + base = 'boost_1_36_0' + lib= 'boost_python-vc90-mt-1_36' + else: + base = 'boost_1_37' + lib = 'boost_python-vc90-mt-1_37' + else: + if _STABLE: + base = 'boost_1_34_0' + else: + base = 'boost_1_37' + if isLinux() or isMac(): bjambase = 'boost-jam-3.1.16' if isMac(): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-09-02 08:31:32
|
Revision: 723 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=723&view=rev Author: mithro Date: 2008-09-02 08:31:40 +0000 (Tue, 02 Sep 2008) Log Message: ----------- Opps, ment 1_34_1 not 1_34_0. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-09-02 08:21:07 UTC (rev 722) +++ trunk/python-ogre/environment.py 2008-09-02 08:31:40 UTC (rev 723) @@ -462,7 +462,7 @@ lib = 'boost_python-vc90-mt-1_37' else: if _STABLE: - base = 'boost_1_34_0' + base = 'boost_1_34_1' else: base = 'boost_1_37' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-09-28 00:14:48
|
Revision: 749 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=749&view=rev Author: andy_miller Date: 2008-09-28 00:14:41 +0000 (Sun, 28 Sep 2008) Log Message: ----------- Force gccxml to 01Sep for unstable version Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-09-21 01:06:49 UTC (rev 748) +++ trunk/python-ogre/environment.py 2008-09-28 00:14:41 UTC (rev 749) @@ -200,9 +200,9 @@ [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D 22May2008 "+base, os.getcwd()] ] else: - source_version = "20080627" + source_version = "20080901" source = [ - [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co "+base, os.getcwd()] + [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D 01Sep2008 "+base, os.getcwd()] ] if isLinux() or isMac(): buildCmds = [ @@ -285,9 +285,9 @@ [svn, " co -r 1383 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()] ] else: - source_version = "9999" + source_version = "1415" source = [ - [svn, " co http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()] + [svn, " co -r 1415 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()] ] if isLinux() or isMac() : buildCmds = [ @@ -309,9 +309,9 @@ [svn, " co -r 1383 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()] ] else: - source_version = "9999" + source_version = "1415" source = [ - [svn, " co http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()] + [svn, " co -r 1415 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()] ] if isLinux() or isMac() : buildCmds = [ @@ -578,7 +578,7 @@ [0, unzip + os.path.join(downloadPath,"ogre-v1-6-0RC1.zip"),os.getcwd() ], [0, unzip + os.path.join(downloadPath,"OgreDependencies_VC9_Eihort_20080203.zip"), os.path.join(os.getcwd(), 'ogre') ], - [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0RC1.patch -p0 ", os.getcwd()], + [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0RC2.patch -p0 ", os.getcwd()], [0,'echo Please use MSVC Express Edition to build Ogre Release.',''] ] else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-09-28 00:17:25
|
Revision: 750 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=750&view=rev Author: andy_miller Date: 2008-09-28 00:17:18 +0000 (Sun, 28 Sep 2008) Log Message: ----------- Environment.py correct this time.. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-09-28 00:14:41 UTC (rev 749) +++ trunk/python-ogre/environment.py 2008-09-28 00:17:18 UTC (rev 750) @@ -457,14 +457,17 @@ if _STABLE: base = 'boost_1_36_0' lib = 'boost_python-vc90-mt-1_36' + versionBase = '1_36' ## the version used on the library name else: base = 'boost_1_36_0' lib = 'boost_python-vc90-mt-1_36' + versionBase = '1_36' ## the version used on the library name else: if _STABLE: base = 'boost_1_34_1' + versionBase = '1_34' ## the version used on the library name else: - base = 'boost_1_36_0' + base = 'boost_1_36_0' versionBase = '1_36' ## the version used on the library name if isLinux() or isMac(): @@ -514,7 +517,7 @@ [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 @@ -529,7 +532,7 @@ class boost_python_index: """ only used for Linx """ - active = True + active = True source_version = boost.versionBase.replace("_",".") pythonModule = False ModuleName = "" @@ -626,7 +629,7 @@ [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.0RC1" base = "ogre-v1-6-0RC1" @@ -639,7 +642,7 @@ [0, "make", os.path.join(os.getcwd(), 'ogre')], [0, "make install", os.path.join(os.getcwd(), 'ogre')], ] - libs=[boost.lib, 'OgreMain'] + libs=[boost.lib, 'OgreMain'] libs.append ( boost_python_index.lib ) lib_dirs=[Config.LOCAL_LIB] include_dirs=[Config.PATH_Boost, Config.PATH_INCLUDE_Ogre] @@ -1470,12 +1473,12 @@ parent = "ogre/physics" libs=[boost.lib, 'LibBulletCollision', 'LibBulletDynamics'] if isWindows(): - libs.append('libbulletmath') - else: - libs.append('LibLinearMath') - libs.append('LibBulletSoftBody') - libs.append('LibBulletColladaConverter') - libs.append('LibBulletMultiThreaded') + 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 @@ -1516,9 +1519,9 @@ 'LibBulletCollision', 'LibBulletDynamics' ] if isWindows(): - libs.append('libbulletmath') - else: - libs.append('LibLinearMath') + libs.append('libbulletmath') + else: + libs.append('LibLinearMath') include_dirs = [Config.PATH_Boost , Config.PATH_INCLUDE_Bullet , os.path.join(Config.PATH_OgreBullet, 'Collisions' ) @@ -1547,9 +1550,9 @@ 'LibBulletCollision', 'LibBulletDynamics' ] if isWindows(): - libs.append('libbulletmath') - else: - libs.append('LibLinearMath') + 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. |
From: <and...@us...> - 2008-10-07 09:49:18
|
Revision: 754 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=754&view=rev Author: andy_miller Date: 2008-10-07 09:44:57 +0000 (Tue, 07 Oct 2008) Log Message: ----------- Change to use FreeImage 3110 along with a couple of other updates for Linux 'unstable' build Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-10-05 07:08:22 UTC (rev 753) +++ trunk/python-ogre/environment.py 2008-10-07 09:44:57 UTC (rev 754) @@ -287,7 +287,7 @@ else: source_version = "1415" source = [ - [svn, " co -r 1415 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()] + [svn, " co http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()] ] if isLinux() or isMac() : buildCmds = [ @@ -311,7 +311,7 @@ else: source_version = "1415" source = [ - [svn, " co -r 1415 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()] + [svn, " co http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()] ] if isLinux() or isMac() : buildCmds = [ @@ -371,12 +371,12 @@ if isLinux() or isMac(): base = 'FreeImage' source = [ - [wget, " http://prdownloads.sourceforge.net/freeimage/FreeImage3100.zip",downloadPath], + [wget, " http://prdownloads.sourceforge.net/freeimage/FreeImage3110.zip",downloadPath], ] if isLinux(): buildCmds = [ - [0, unzip + " -q -o " + os.path.join(downloadPath,base) + "3100.zip", ''], + [0, unzip + " -q -o " + os.path.join(downloadPath,base) + "3110.zip", ''], ## # Note the use of a single command that does multiple sed's ## @@ -389,7 +389,7 @@ ] if isMac(): ## mac has a crap sed command implementation and a different shell interaction, plus make file is a little different (or course) buildCmds = [ - [0, unzip + " -q -o " + os.path.join(downloadPath,base) + "3100.zip", ''], + [0, unzip + " -q -o " + os.path.join(downloadPath,base) + "3110.zip", ''], ## # Note the use of a single command that does multiple sed's ## @@ -405,10 +405,10 @@ pythonModule = False active = True if isLinux() or isMac(): - base = 'cmake-2.6.1-Linux-i386' + base = 'cmake-2.6.2-Linux-i386' if isMac(): - base = 'cmake-2.6.1-Darwin-universal' + base = 'cmake-2.6.2-Darwin-universal' source = [ [wget, "http://www.cmake.org/files/v2.6/"+base+".tar.gz",downloadPath], @@ -420,9 +420,9 @@ [0,cp + "-R * " + PREFIX, os.path.join (os.getcwd(), base) ] # copy to our bin area ] if isWindows(): - source = [ [wget, "http://www.cmake.org/files/v2.6/cmake-2.6.1-win32-x86.exe", downloadPath ]] + source = [ [wget, "http://www.cmake.org/files/v2.6/cmake-2.6.2-win32-x86.exe", downloadPath ]] buildCmds = [ - [0, os.path.join(downloadPath, "cmake-2.6.1-win32-x86.exe"), '' ] + [0, os.path.join(downloadPath, "cmake-2.6.2-win32-x86.exe"), '' ] ] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-11-17 11:44:32
|
Revision: 797 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=797&view=rev Author: andy_miller Date: 2008-11-17 11:44:30 +0000 (Mon, 17 Nov 2008) Log Message: ----------- Ode build fix Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-11-17 00:13:14 UTC (rev 796) +++ trunk/python-ogre/environment.py 2008-11-17 11:44:30 UTC (rev 797) @@ -954,7 +954,7 @@ ] buildCmds = [ # FIXME: Should this untar not use the unTarGz method mentioned above? - [0, 'untar' + os.path.join(downloadPath,"ode-0.10.1.tar.gz"), ''], + [0, 'tar zxf ' + os.path.join(downloadPath,"ode-0.10.1.tar.gz"), ''], [0, "chmod +x autogen.sh", baseDir], [0, "./autogen.sh", baseDir], [0, "./configure --prefix=%s --includedir=%s/include" %(PREFIX, PREFIX), baseDir], @@ -1019,6 +1019,7 @@ name='ogreode' parent = "ogre/physics" base = 'ogreaddons/ogreode' + baseDir = os.path.join(os.getcwd(), base ) lib_dirs = [ Config.PATH_LIB_Boost , Config.PATH_LIB_OgreOde @@ -1040,9 +1041,8 @@ ] else: source = [ - [svn, "https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/ogreode", os.getcwd()] + [svn, " co https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/ogreode " + baseDir, os.getcwd()] ] - baseDir = os.path.join(os.getcwd(), base ) buildCmds = [ [0, "patch -s -N -i ../../python-ogre/patch/ogreode.patch -p0", baseDir], [0, "chmod +x autogen.sh", baseDir], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-11-18 23:09:49
|
Revision: 801 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=801&view=rev Author: andy_miller Date: 2008-11-18 23:09:45 +0000 (Tue, 18 Nov 2008) Log Message: ----------- Add indexing lib to modules for Linux build Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-11-18 13:33:14 UTC (rev 800) +++ trunk/python-ogre/environment.py 2008-11-18 23:09:45 UTC (rev 801) @@ -749,7 +749,8 @@ libs=['OIS_Static',boost.lib] else: - libs=['OIS',boost.lib] + libs=['OIS',boost.lib] + libs.append ( boost_python_index.lib ) if os.name=="nt": libs.append ( "User32" ) # needed for static linking include_dirs = [ Config.PATH_Boost @@ -784,7 +785,8 @@ if isWindows(): libs=[boost.lib, 'OgreMain', 'ode_single', 'ReferenceAppLayer'] else: - libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer'] + libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer'] + libs.append ( boost_python_index.lib ) lib_dirs = [ Config.PATH_LIB_Boost , Config.PATH_LIB_Ogre_OgreMain , Config.PATH_LIB_ODE @@ -809,7 +811,8 @@ if isWindows(): libs = ['Newton', boost.lib, 'OgreNewt_Main', 'OgreMain'] else: - libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain'] + libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain'] + libs.append ( boost_python_index.lib ) if _STABLE: source = [ [cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()] @@ -823,7 +826,7 @@ [0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir], #[0, "cp SConscript OgreNewt_Main", baseDir], #[0, "rm SConscript", baseDir], - [0, rm + " ./OgreNewt_Main/inc/boost", baseDir], + [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir], [0, "scons prefix=%s boost=%s/include/boost-1_34_1 install" % (PREFIX, PREFIX), baseDir], ##WARNING -- boost include dir name is different than build name (dash not underscore) ] if isWindows(): @@ -864,7 +867,8 @@ pchincludes = ['boost/python.hpp', 'cegui.h'] libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'OgreGUIRenderer' ] else: - libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ] + libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ] + libs.append ( boost_python_index.lib ) if isLinux(): if _STABLE: @@ -936,7 +940,8 @@ if isWindows(): odeLibraryName = 'ode_single' libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function - + else: + libs.append ( boost_python_index.lib ) lib_dirs = [ Config.PATH_LIB_Boost , Config.PATH_LIB_ODE ] @@ -977,7 +982,9 @@ version= "1.3" name = 'opcode' parent = "ogre/physics" - libs=[boost.lib] + libs=[boost.lib] + if isLinux(): + libs.append ( boost_python_index.lib ) lib_dirs = [ Config.PATH_LIB_Boost ] include_dirs = [ Config.PATH_Boost @@ -1054,7 +1061,8 @@ libs=[boost.lib, 'OgreMain', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ] if isLinux(): - libs.append('ode') + libs.append('ode') + libs.append ( boost_python_index.lib ) else: libs.append('ode_single') CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19' @@ -1090,7 +1098,9 @@ ##,Config.PATH_LIB_quickgui ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] + libs=[ boost.lib, 'OgreMain' ] + if isLinux(): + libs.append ( boost_python_index.lib ) ModuleName="QuickGUI" class navi: @@ -1143,7 +1153,9 @@ CheckIncludes=[] libs=[ boost.lib, 'OgreMain', 'OIS_Static' ] if os.name=="nt": - libs.append ( "User32" ) # needed for static linking + libs.append ( "User32" ) # needed for static linking + else: + libs.append ( boost_python_index.lib ) ModuleName="betagui" @@ -1163,7 +1175,9 @@ Config.PATH_LIB_Ogre_OgreMain ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] + libs=[ boost.lib, 'OgreMain' ] + if isLinux(): + libs.append ( boost_python_index.lib ) ModuleName="ogreforests" @@ -1184,7 +1198,9 @@ Config.PATH_LIB_particleuniverse ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ] + libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ] + if isLinux(): + libs.append ( boost_python_index.lib ) ModuleName="particleuniverse" class nxogre: @@ -1219,7 +1235,8 @@ if os.name =='nt': libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader','OgreMain','NxOgre' ] #, 'NxOgreStatic'] #'NxExtensions', else: - libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ] + libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ] + libs.append ( boost_python_index.lib ) ModuleName="NxOgre" @@ -1248,7 +1265,9 @@ Config.PATH_LIB_Theora, ] CheckIncludes=[] - libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ] + libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ] + if isLinux(): + libs.append ( boost_python_index.lib ) ModuleName="theora" class plib: @@ -1269,7 +1288,8 @@ if os.name == "nt": libs = [ boost.lib, 'winmm', 'User32','wsock32', 'opengl32.lib','glu32.lib' ] else: - libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed + libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed + libs.append ( boost_python_index.lib ) class physx: active = True @@ -1296,7 +1316,8 @@ if isWindows(): libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader' ] elif isLinux(): - libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ] + libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ] + libs.append ( boost_python_index.lib ) source = [ [wget, "http://developer.download.nvidia.com/PhysX/2.8.1/PhysX_2.8.1_SDK_CoreLinux_deb.tar.gz", downloadPath] ] @@ -1422,7 +1443,7 @@ #'ogg', #'vorbis','vorbisfile','vorbisenc', 'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves - + libs.append ( boost_python_index.lib ) ModuleName = 'OgreAL' CheckIncludes = ['OgreAL.h'] @@ -1516,7 +1537,8 @@ libs.append('libbulletmath') libs.append('libbulletsoftbody') #libs.append('libbulletcolladaconverter') - libs.append('libbulletmultithreaded') + libs.append('libbulletmultithreaded') + libs.append ( boost_python_index.lib ) lib_dirs = [ Config.PATH_LIB_Boost , Config.PATH_LIB_Bullet @@ -1578,7 +1600,8 @@ if isWindows(): CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP ' else: - CCFLAGS = ' -D_PRECOMP ' + CCFLAGS = ' -D_PRECOMP ' + libs.append ( boost_python_index.lib ) ModuleName = 'OgreBulletC' CheckIncludes=['boost/python.hpp', 'Ogre.h'] @@ -1611,7 +1634,8 @@ if isWindows(): CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP ' else: - CCFLAGS = ' -D_PRECOMP ' + CCFLAGS = ' -D_PRECOMP ' + libs.append ( boost_python_index.lib ) ModuleName = 'OgreBulletD' CheckIncludes=['boost/python.hpp', 'Ogre.h'] descText = "Ogre Bullet Dynamics (physics) implementation" @@ -1629,9 +1653,11 @@ os.path.join(Config.PATH_INCLUDE_noise, 'module') ] lib_dirs = [Config.PATH_LIB_Boost - ] + ] CheckIncludes=[] libs=[ boost.lib] + if isLinux(): + libs.append ( boost_python_index.lib ) ModuleName="noise" descText = "Generate 'noise'" @@ -1650,7 +1676,9 @@ Config.PATH_LIB_Ogre_OgreMain ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] + libs=[ boost.lib, 'OgreMain' ] + if isLinux(): + libs.append ( boost_python_index.lib ) ModuleName="watermesh" descText = "C++ code from Ogre Water demo -- use Hydrax instead" @@ -1669,7 +1697,9 @@ Config.PATH_LIB_Ogre_OgreMain ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] + libs=[ boost.lib, 'OgreMain' ] + if isLinux(): + libs.append ( boost_python_index.lib ) ModuleName="ofusion" descText = "Import Ogre 'Scenes' from 3dMax using the ofusion exporter" @@ -1688,7 +1718,9 @@ Config.PATH_LIB_Ogre_OgreMain ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] + libs=[ boost.lib, 'OgreMain' ] + if isLinux(): + libs.append ( boost_python_index.lib ) ModuleName="cadunetree" descText = "Generate realistic trees" @@ -1704,10 +1736,13 @@ Config.PATH_INCLUDE_ogrepcz ] lib_dirs = [Config.PATH_LIB_Boost, - Config.PATH_LIB_Ogre_OgreMain + Config.PATH_LIB_Ogre_OgreMain, + os.path.join(Config.PATH_LIB_Ogre_OgreMain, 'OGRE') ] CheckIncludes=[] - libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ] + libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ] + if isLinux(): + libs.append ( boost_python_index.lib ) ModuleName="ogrepcz" descText = "Portal SceneManager - seamlessly move from interior to exterior scene management" @@ -1726,7 +1761,9 @@ Config.PATH_LIB_opensteer ] CheckIncludes=[] - libs=[ boost.lib, 'opensteer' ] + libs=[ boost.lib, 'opensteer' ] + if isLinux(): + libs.append ( boost_python_index.lib ) ModuleName="opensteer" class hydrax: @@ -1744,7 +1781,9 @@ Config.PATH_LIB_Ogre_OgreMain ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] + libs=[ boost.lib, 'OgreMain' ] + if isLinux(): + libs.append ( boost_python_index.lib ) ModuleName="hydrax" descText = "Fantastic water/ocean effects" @@ -1764,7 +1803,9 @@ Config.PATH_LIB_hikari ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ] + libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ] + if isLinux(): + libs.append ( boost_python_index.lib ) ModuleName="hikari" descText = "Use Flash controls within Ogre" descLink = "http://hikari-library.googlecode.com/" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-11-23 07:41:39
|
Revision: 810 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=810&view=rev Author: mithro Date: 2008-11-23 07:41:33 +0000 (Sun, 23 Nov 2008) Log Message: ----------- Fixed the line endings. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-11-23 02:15:43 UTC (rev 809) +++ trunk/python-ogre/environment.py 2008-11-23 07:41:33 UTC (rev 810) @@ -482,7 +482,7 @@ bjambuilddir = 'bin.macosxx86' bjambuildset = 'darwin' else: - bjambuilddir = 'bin.linuxx86' + bjambuilddir = 'bin.linuxx86_64' bjambuildset = 'gcc' source = [ @@ -749,7 +749,7 @@ libs=['OIS_Static',boost.lib] else: - libs=['OIS',boost.lib] + libs=['OIS',boost.lib] libs.append ( boost_python_index.lib ) if os.name=="nt": libs.append ( "User32" ) # needed for static linking @@ -785,7 +785,7 @@ if isWindows(): libs=[boost.lib, 'OgreMain', 'ode_single', 'ReferenceAppLayer'] else: - libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer'] + libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer'] libs.append ( boost_python_index.lib ) lib_dirs = [ Config.PATH_LIB_Boost , Config.PATH_LIB_Ogre_OgreMain @@ -811,14 +811,14 @@ if isWindows(): libs = ['Newton', boost.lib, 'OgreNewt_Main', 'OgreMain'] else: - libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain'] + libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain'] libs.append ( boost_python_index.lib ) if _STABLE: source = [ [cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()] ] else: - source = [ + source = [ [svn, " co https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/ogrenewt " + base, os.getcwd()] ] baseDir = os.path.join(os.getcwd(), base ) @@ -867,7 +867,7 @@ pchincludes = ['boost/python.hpp', 'cegui.h'] libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'OgreGUIRenderer' ] else: - libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ] + libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ] libs.append ( boost_python_index.lib ) if isLinux(): @@ -940,7 +940,7 @@ if isWindows(): odeLibraryName = 'ode_single' libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function - else: + else: libs.append ( boost_python_index.lib ) lib_dirs = [ Config.PATH_LIB_Boost , Config.PATH_LIB_ODE @@ -982,8 +982,8 @@ version= "1.3" name = 'opcode' parent = "ogre/physics" - libs=[boost.lib] - if isLinux(): + libs=[boost.lib] + if isLinux(): libs.append ( boost_python_index.lib ) lib_dirs = [ Config.PATH_LIB_Boost ] @@ -1061,7 +1061,7 @@ libs=[boost.lib, 'OgreMain', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ] if isLinux(): - libs.append('ode') + libs.append('ode') libs.append ( boost_python_index.lib ) else: libs.append('ode_single') @@ -1098,8 +1098,8 @@ ##,Config.PATH_LIB_quickgui ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] - if isLinux(): + libs=[ boost.lib, 'OgreMain' ] + if isLinux(): libs.append ( boost_python_index.lib ) ModuleName="QuickGUI" @@ -1153,8 +1153,8 @@ CheckIncludes=[] libs=[ boost.lib, 'OgreMain', 'OIS_Static' ] if os.name=="nt": - libs.append ( "User32" ) # needed for static linking - else: + libs.append ( "User32" ) # needed for static linking + else: libs.append ( boost_python_index.lib ) ModuleName="betagui" @@ -1175,8 +1175,8 @@ Config.PATH_LIB_Ogre_OgreMain ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] - if isLinux(): + libs=[ boost.lib, 'OgreMain' ] + if isLinux(): libs.append ( boost_python_index.lib ) ModuleName="ogreforests" @@ -1198,8 +1198,8 @@ Config.PATH_LIB_particleuniverse ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ] - if isLinux(): + libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ] + if isLinux(): libs.append ( boost_python_index.lib ) ModuleName="particleuniverse" @@ -1235,7 +1235,7 @@ if os.name =='nt': libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader','OgreMain','NxOgre' ] #, 'NxOgreStatic'] #'NxExtensions', else: - libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ] + libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ] libs.append ( boost_python_index.lib ) ModuleName="NxOgre" @@ -1265,8 +1265,8 @@ Config.PATH_LIB_Theora, ] CheckIncludes=[] - libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ] - if isLinux(): + libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ] + if isLinux(): libs.append ( boost_python_index.lib ) ModuleName="theora" @@ -1288,7 +1288,7 @@ if os.name == "nt": libs = [ boost.lib, 'winmm', 'User32','wsock32', 'opengl32.lib','glu32.lib' ] else: - libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed + libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed libs.append ( boost_python_index.lib ) class physx: @@ -1316,7 +1316,7 @@ if isWindows(): libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader' ] elif isLinux(): - libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ] + libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ] libs.append ( boost_python_index.lib ) source = [ [wget, "http://developer.download.nvidia.com/PhysX/2.8.1/PhysX_2.8.1_SDK_CoreLinux_deb.tar.gz", downloadPath] @@ -1532,13 +1532,13 @@ parent = "ogre/physics" libs=[boost.lib, 'LibBulletCollision', 'LibBulletDynamics','LibLinearMath'] if isWindows(): - pass + pass #libs.append('libbulletMath') else: #libs.append('libbulletmath') libs.append('LibBulletSoftBody') #libs.append('libbulletcolladaconverter') - libs.append('LibBulletMultiThreaded') + libs.append('LibBulletMultiThreaded') libs.append ( boost_python_index.lib ) lib_dirs = [ Config.PATH_LIB_Boost @@ -1558,8 +1558,8 @@ [0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir], [0, "make", baseDir], # [0, "make install", baseDir], -# [0, "jam", baseDir], -# [0, "jam install", baseDir] +# [0, "jam", baseDir], +# [0, "jam install", baseDir] [0, "find . -name *.a -execdir cp {} %s/lib \;" % PREFIX, baseDir] ] @@ -1602,10 +1602,10 @@ if isWindows(): CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP ' else: - CCFLAGS = ' -D_PRECOMP -fno-inline ' + CCFLAGS = ' -D_PRECOMP -fno-inline ' libs.append ( boost_python_index.lib ) ModuleName = 'OgreBulletC' - CheckIncludes=['boost/python.hpp', 'Ogre.h'] + CheckIncludes=['boost/python.hpp', 'Ogre.h'] class ogrebulletd: # @@ -1636,7 +1636,7 @@ if isWindows(): CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP ' else: - CCFLAGS = ' -D_PRECOMP -fno-inline ' + CCFLAGS = ' -D_PRECOMP -fno-inline ' libs.append ( boost_python_index.lib ) ModuleName = 'OgreBulletD' CheckIncludes=['boost/python.hpp', 'Ogre.h'] @@ -1655,10 +1655,10 @@ os.path.join(Config.PATH_INCLUDE_noise, 'module') ] lib_dirs = [Config.PATH_LIB_Boost - ] + ] CheckIncludes=[] libs=[ boost.lib] - if isLinux(): + if isLinux(): libs.append ( boost_python_index.lib ) ModuleName="noise" descText = "Generate 'noise'" @@ -1678,8 +1678,8 @@ Config.PATH_LIB_Ogre_OgreMain ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] - if isLinux(): + libs=[ boost.lib, 'OgreMain' ] + if isLinux(): libs.append ( boost_python_index.lib ) ModuleName="watermesh" descText = "C++ code from Ogre Water demo -- use Hydrax instead" @@ -1699,8 +1699,8 @@ Config.PATH_LIB_Ogre_OgreMain ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] - if isLinux(): + libs=[ boost.lib, 'OgreMain' ] + if isLinux(): libs.append ( boost_python_index.lib ) ModuleName="ofusion" descText = "Import Ogre 'Scenes' from 3dMax using the ofusion exporter" @@ -1720,8 +1720,8 @@ Config.PATH_LIB_Ogre_OgreMain ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] - if isLinux(): + libs=[ boost.lib, 'OgreMain' ] + if isLinux(): libs.append ( boost_python_index.lib ) ModuleName="cadunetree" descText = "Generate realistic trees" @@ -1738,12 +1738,12 @@ Config.PATH_INCLUDE_ogrepcz ] lib_dirs = [Config.PATH_LIB_Boost, - Config.PATH_LIB_Ogre_OgreMain, + Config.PATH_LIB_Ogre_OgreMain, os.path.join(Config.PATH_LIB_Ogre_OgreMain, 'OGRE') ] CheckIncludes=[] - libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ] - if isLinux(): + libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ] + if isLinux(): libs.append ( boost_python_index.lib ) ModuleName="ogrepcz" descText = "Portal SceneManager - seamlessly move from interior to exterior scene management" @@ -1763,8 +1763,8 @@ Config.PATH_LIB_opensteer ] CheckIncludes=[] - libs=[ boost.lib, 'opensteer' ] - if isLinux(): + libs=[ boost.lib, 'opensteer' ] + if isLinux(): libs.append ( boost_python_index.lib ) ModuleName="opensteer" @@ -1783,8 +1783,8 @@ Config.PATH_LIB_Ogre_OgreMain ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain' ] - if isLinux(): + libs=[ boost.lib, 'OgreMain' ] + if isLinux(): libs.append ( boost_python_index.lib ) ModuleName="hydrax" descText = "Fantastic water/ocean effects" @@ -1805,8 +1805,8 @@ Config.PATH_LIB_hikari ] CheckIncludes=[] - libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ] - if isLinux(): + libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ] + if isLinux(): libs.append ( boost_python_index.lib ) ModuleName="hikari" descText = "Use Flash controls within Ogre" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-11-23 07:56:42
|
Revision: 811 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=811&view=rev Author: andy_miller Date: 2008-11-23 07:56:36 +0000 (Sun, 23 Nov 2008) Log Message: ----------- Removed MyGui from environemtn until furthre tested Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-11-23 07:41:33 UTC (rev 810) +++ trunk/python-ogre/environment.py 2008-11-23 07:56:36 UTC (rev 811) @@ -1812,28 +1812,28 @@ descText = "Use Flash controls within Ogre" descLink = "http://hikari-library.googlecode.com/" -class mygui: - active = True - pythonModule = True - version="2.2.0RC1" - name='mygui' - parent="ogre/gui" - cflags = "" - include_dirs = [ Config.PATH_Boost, - Config.PATH_INCLUDE_mygui - , Config.PATH_INCLUDE_Ogre - ,Config.PATH_INCLUDE_Ogre_Dependencies - ] - lib_dirs = [Config.PATH_LIB_Boost - ,Config.PATH_LIB_Ogre_OgreMain - ,Config.PATH_LIB_mygui - - ] - CheckIncludes=[] - libs=[ boost.lib, 'OgreMain', 'MyGUI' ] ##, 'hikari' ] - ModuleName="mygui" - descText = "MyGUI Interface System" - descLink = "http://sourceforge.net/projects/my-gui/" +# class mygui: +# active = False +# pythonModule = True +# version="2.2.0RC1" +# name='mygui' +# parent="ogre/gui" +# cflags = "" +# include_dirs = [ Config.PATH_Boost, +# Config.PATH_INCLUDE_mygui +# , Config.PATH_INCLUDE_Ogre +# ,Config.PATH_INCLUDE_Ogre_Dependencies +# ] +# lib_dirs = [Config.PATH_LIB_Boost +# ,Config.PATH_LIB_Ogre_OgreMain +# ,Config.PATH_LIB_mygui +# +# ] +# CheckIncludes=[] +# libs=[ boost.lib, 'OgreMain', 'MyGUI' ] ##, 'hikari' ] +# ModuleName="mygui" +# descText = "MyGUI Interface System" +# descLink = "http://sourceforge.net/projects/my-gui/" ############################################################################################ @@ -1876,7 +1876,7 @@ , 'ogrepcz' : ogrepcz , 'hydrax' : hydrax , 'hikari' : hikari - , 'mygui' : mygui +# , 'mygui' : mygui } # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-11-23 15:37:20
|
Revision: 813 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=813&view=rev Author: mithro Date: 2008-11-23 15:37:17 +0000 (Sun, 23 Nov 2008) Log Message: ----------- Add a few extra 64bit build differences. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-11-23 12:24:12 UTC (rev 812) +++ trunk/python-ogre/environment.py 2008-11-23 15:37:17 UTC (rev 813) @@ -40,6 +40,12 @@ if os.sys.platform == 'darwin': return True return False + +def is64(): + if os.uname()[4] == 'x86_64': + return True + return False + ## ## set this to True if you compiled Ogre with Threads enabled @@ -53,8 +59,7 @@ PythonOgreMajorVersion = "1" PythonOgreMinorVersion = "6" PythonOgrePatchVersion = "0" - - + ## ## these should be fine with auto create - however override them as necessary ## @@ -334,7 +339,10 @@ pythonModule = False active = True if isLinux(): - base = 'Cg-2.0_May2008_x86' + if is64(): + base = 'Cg-2.0_May2008_x86_64' + else: + base = 'Cg-2.0_May2008_x86' source = [ [wget, " http://developer.download.nvidia.com/cg/Cg_2.0/2.0.0015/"+base+".tgz",downloadPath] ] @@ -482,7 +490,10 @@ bjambuilddir = 'bin.macosxx86' bjambuildset = 'darwin' else: - bjambuilddir = 'bin.linuxx86_64' + if is64(): + bjambuilddir = 'bin.linuxx86_64' + else: + bjambuilddir = 'bin.linuxx86' bjambuildset = 'gcc' source = [ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2008-11-23 15:39:08
|
Revision: 814 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=814&view=rev Author: mithro Date: 2008-11-23 15:39:04 +0000 (Sun, 23 Nov 2008) Log Message: ----------- Remove all that extra whitespace. Modified Paths: -------------- trunk/python-ogre/environment.py Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-11-23 15:37:17 UTC (rev 813) +++ trunk/python-ogre/environment.py 2008-11-23 15:39:04 UTC (rev 814) @@ -7,7 +7,7 @@ ## Jan 2007 modification ## ## This will now look for external config files. -## +## ## first it will look for PythonOgreConfig_<username>.py ## ## if that fails it will look for PythonOgreConfig_<platform>.py @@ -24,15 +24,15 @@ print __file__, "LOG::", instring def isWindows(): - if os.name == 'nt': + if os.name == 'nt': return True return False - + def isLinux(): if os.name == 'posix' and os.sys.platform != 'darwin': return True - return False - + return False + def isDebian(): return os.path.exists("/etc/debian_version") @@ -44,9 +44,9 @@ def is64(): if os.uname()[4] == 'x86_64': return True - return False + return False - + ## ## set this to True if you compiled Ogre with Threads enabled ## @@ -54,12 +54,12 @@ _USE_THREADS = True else: _USE_THREADS = False - - + + PythonOgreMajorVersion = "1" -PythonOgreMinorVersion = "6" +PythonOgreMinorVersion = "6" PythonOgrePatchVersion = "0" - + ## ## these should be fine with auto create - however override them as necessary ## @@ -67,7 +67,7 @@ ## I want a version string 2.4 or 2.5 etc PythonVersionString = str(sys.version_info[0]) + '.' + str(sys.version_info[1]) -if isWindows(): +if isWindows(): python_include_dirs = os.path.join ( PATH_Python, 'include') python_lib_dirs = os.path.join ( PATH_Python, 'libs' ) ## @@ -89,8 +89,8 @@ sys.path.append( os.path.join( root_dir, 'common_utils' ) ) shared_ptr_dir = os.path.join( root_dir, 'shared_ptr' ) include_dir = os.path.join( root_dir, 'include' ) -generated_dir_name = 'generated' -package_dir_name = 'packages'+ "_" + PythonVersionString +generated_dir_name = 'generated' +package_dir_name = 'packages'+ "_" + PythonVersionString generated_dir = os.path.join( root_dir, generated_dir_name ) declarations_cache_dir = os.path.join( root_dir, 'code_generators', 'cache' ) @@ -119,26 +119,26 @@ s= 'PythonOgreConfig_system' else: s= 'PythonOgreConfig_' + _SystemType ## + '.py' - + Config = __import__( s ) _ConfigSet = True log ( "Loaded Config (based on systemtype) from %s" % (s)) except ImportError: - pass + pass if not _ConfigSet: log ( " Going to use internal config setting") ## These need to be adjusted based upon your system ## ## PLEASE use an external PythonOgreConfig_<username>.py to hold these value !!!! - ## + ## print "\n\n You DO need to create a PythonOgreConfig_%s.py file with config details" % ( _SystemType) sys.exit(-1) _STABLE = os.path.exists(os.path.join(os.path.split(__file__)[0], "STABLE")) # set to true if using specific versions of CVS and SVN checkouts.. ###################### -downloadPath = os.path.abspath("downloads") +downloadPath = os.path.abspath("downloads") wget = "wget -c -nc " tar = "tar " gzip = "gzip " @@ -163,13 +163,13 @@ sed_ = "sed -i '' " else: sed_ = "sed --in-place " - -if isMac(): + +if isMac(): Config.PATH_Boost = os.path.join(Config.LOCAL_INCLUDE, 'boost-1_34_1') Config.LIB_Boost = 'libboost_python-1_34_1' Config.RPATH="" - -## BIG assumption about where you want things put + +## BIG assumption about where you want things put if UseSystem: ROOT = '/' PREFIX = '/usr' @@ -191,12 +191,12 @@ ] return ret - + #################################################### ## -## These are the base tools and libraries +## These are the base tools and libraries ## #################################################### class gccxml: @@ -219,39 +219,39 @@ [0,"cmake ../gccxml -DCMAKE_INSTALL_PREFIX:PATH="+ PREFIX,os.path.join(os.getcwd(),'gccxml-build')], [0,"make", os.path.join(os.getcwd(),'gccxml-build')], [0,"make install",os.path.join(os.getcwd(),'gccxml-build')] - ] + ] else: - - buildCmds = [ + + buildCmds = [ [0,'echo Please use CMAKE to create a msvc build projects for gccxml',''], [0,'echo ie. Run Cmake (from the windows menu)',''], [0,'echo specific the gccxml for both directories and run configure',''], [0,'echo ignore any errors - you will need to run configure twice and then OK',''], [0,'echo Now run MSVC and load the gccxml project (in the gccxml directory) and build it',''] ] - + class install: pythonModule = False active = True source = [ ] - + buildCmds = [ [0,"python setup.py install --prefix=%s" % PREFIX, os.path.join(os.getcwd(),'python-ogre')] - ] - + ] + class newton: pythonModule = False active = True # if not os.path.exists( os.path.join(os.getcwd(), 'ogreaddons/ogrenewt')): -# os.makedirs ( os.path.join(os.getcwd(), 'ogreaddons/ogrenewt') ) +# os.makedirs ( os.path.join(os.getcwd(), 'ogreaddons/ogrenewt') ) if isLinux(): base = 'newton' source = [ [wget, "http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz", downloadPath] ] - + buildCmds = [ [0, "tar zxf " + os.path.join(downloadPath, "newtonLinux-1.53.tar.gz"), ''], [0,"patch -s -i ./python-ogre/patch/Newton.patch -p0 ", ''], @@ -264,7 +264,7 @@ source = [ [wget, "http://www.newtondynamics.com/downloads/NewtonMac-1.53.zip", downloadPath] ] - + buildCmds = [ [0, "unzip -q -o " + os.path.join(downloadPath, "NewtonMac-1.53.zip"), ''], [0,"patch -s -i ./python-ogre/patch/Newton.patch -p0 ", ''], @@ -272,18 +272,18 @@ [0, "cp newtonSDK/sdk/*.a %s/lib" % PREFIX, ''], [0, "cp newtonSDK/sdk/*.a ogreaddons/ogrenewt" , ''] ] - + if isWindows(): base = 'newton' source = [ [wget, "http://www.newtondynamics.com/downloads/NewtonWin-1.53.zip", downloadPath] ] - + buildCmds = [ [0, unzip + os.path.join(downloadPath, "NewtonWin-1.53.zip"), ''], [0, "setup.exe", ''], ] - + class pygccxml: pythonModule = False active = True @@ -293,23 +293,23 @@ source = [ [svn, " co -r 1383 https://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()] ] - else: + else: source_version = "1446" source = [ [svn, " co -r 1446 https://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()] - ] + ] if isLinux() or isMac() : buildCmds = [ # # [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, "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) ], - ] - + ] + class pyplusplus: pythonModule = False active = True @@ -319,23 +319,23 @@ source = [ [svn, " co -r 1383 https://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()] ] - else: + else: source_version = "1446" source = [ [svn, " co -r 1446 https://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()] - ] + ] if isLinux() or isMac() : buildCmds = [ [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) ] - ] - + ] + class cg: ## we don't need this for Windows as it's part of the Ogre dependencies package - + pythonModule = False active = True if isLinux(): @@ -346,20 +346,20 @@ source = [ [wget, " http://developer.download.nvidia.com/cg/Cg_2.0/2.0.0015/"+base+".tgz",downloadPath] ] - + buildCmds = [ [0,tar + " xvzf "+ os.path.join(downloadPath,base) + ".tgz --overwrite", ROOT], # unpack it directly into 'our' root - ] + ] if isMac(): source = [ [wget, "http://developer.download.nvidia.com/cg/Cg_2.0/2.0.0015/Cg-2.0_May2008.dmg", downloadPath ] - - ] + + ] buildCmds = [ ] -## "http://downloads.sourceforge.net/ogre/OgreDependenciesOSX_20070929.zip" +## "http://downloads.sourceforge.net/ogre/OgreDependenciesOSX_20070929.zip" - + class zziplib: ## The 'install' "fails" on the mac however it's actually OK pythonModule = False @@ -369,16 +369,16 @@ source = [ [wget, " http://downloads.sourceforge.net/zziplib/"+base+".tar.bz2",downloadPath], ] - + buildCmds = [ - [0,tar + " xjf "+ os.path.join(downloadPath,base) + ".tar.bz2 --overwrite", ''], + [0,tar + " xjf "+ os.path.join(downloadPath,base) + ".tar.bz2 --overwrite", ''], [0,"aclocal", os.path.join(os.getcwd(), base) ], [0,"./configure --prefix=%s --datadir=%s/share --includedir=%s/include " % (PREFIX,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) ] - ] - - + ] + + class freeimage: pythonModule = False active = True @@ -387,12 +387,12 @@ source = [ [wget, " http://downloads.sourceforge.net/freeimage/FreeImage3110.zip",downloadPath], ] - + if isLinux(): buildCmds = [ [0, unzip + " -q -o " + os.path.join(downloadPath,base) + "3110.zip", ''], ## - # Note the use of a single command that does multiple sed's + # Note the use of a single command that does multiple sed's ## [0, """sed --in-place -s 's|/usr/include|\$(DESTINC)|' Makefile.*\n\ sed --in-place -s 's|/usr/lib|\$(DESTLIB)|' Makefile.*\n\ @@ -400,35 +400,35 @@ sed --in-place -s 's|ldconfig||' Makefile.*""", os.path.join(os.getcwd(), base) ], [0, "make", os.path.join(os.getcwd(), base) ], [0, "make DESTINC=%s/include DESTLIB=%s/lib install " % (PREFIX, PREFIX) ,os.path.join(os.getcwd(), base) ] - ] + ] if isMac(): ## mac has a crap sed command implementation and a different shell interaction, plus make file is a little different (or course) buildCmds = [ [0, unzip + " -q -o " + os.path.join(downloadPath,base) + "3110.zip", ''], ## - # Note the use of a single command that does multiple sed's + # Note the use of a single command that does multiple sed's ## [0, """sed -i '' 's|/usr/local|$(DEST)|' Makefile.*\n\ sed -i '' 's|-o root -g wheel||' Makefile.*\n\ sed -i '' 's|ldconfig||' Makefile.*""", os.path.join(os.getcwd(), base) ], [0, "make", os.path.join(os.getcwd(), base) ], [0, "make DEST=%s install " % PREFIX ,os.path.join(os.getcwd(), base) ] - ] - - + ] + + class cmake: pythonModule = False active = True if isLinux() or isMac(): base = 'cmake-2.6.2-Linux-i386' - + if isMac(): base = 'cmake-2.6.2-Darwin-universal' - + source = [ [wget, "http://www.cmake.org/files/v2.6/"+base+".tar.gz",downloadPath], ] - - + + buildCmds = [ [0,tar + " xzf "+ os.path.join(downloadPath,base) + ".tar.gz --overwrite", ''], # unpack it [0,cp + "-R * " + PREFIX, os.path.join (os.getcwd(), base) ] # copy to our bin area @@ -438,8 +438,8 @@ buildCmds = [ [0, os.path.join(downloadPath, "cmake-2.6.2-win32-x86.exe"), '' ] ] - - + + class scons: pythonModule = False active = True @@ -447,20 +447,20 @@ source = [ [wget, "http://prdownloads.sourceforge.net/scons/"+base+".tar.gz",downloadPath], ] - - # the utils in Windows don't handle paths or tar spawing gzip hence the work arounds + + # the utils in Windows don't handle paths or tar spawing gzip hence the work arounds if isLinux() or isMac(): buildCmds = [ [0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",'' ], [0,"python setup.py install --prefix=%s" % PREFIX , os.path.join (os.getcwd(), base) ] ] - + else: buildCmds = unTarGz( base, downloadPath ) +\ [ [0,"python setup.py install ", os.path.join (os.getcwd(), base) ] ] - + class boost: ## also included bjam active = True version = "3.5" @@ -472,7 +472,7 @@ base = 'boost_1_36_0' lib = 'boost_python-vc90-mt-1_36' versionBase = '1_36' ## the version used on the library name - else: + else: base = 'boost_1_36_0' lib = 'boost_python-vc90-mt-1_36' versionBase = '1_36' ## the version used on the library name @@ -495,18 +495,18 @@ else: bjambuilddir = 'bin.linuxx86' bjambuildset = 'gcc' - + source = [ [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.16.tgz', downloadPath], [wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath] - ] + ] buildCmds = [ ## first handle bjam [0, tar + ' zxf ' + os.path.join(downloadPath, bjambase) + '.tgz --overwrite', ''], [0,"./build.sh " + bjambuildset, os.path.join(os.getcwd(), bjambase )], [0,"mkdir -p %s/bin/" % PREFIX, os.path.join(os.getcwd(), bjambase )], [0,cp + " bjam %s/bin/" % PREFIX, os.path.join(os.getcwd(), bjambase, bjambuilddir )], ## may need to change on 64 bit systems - + ## and now boost [0, tar + ' zxf ' + os.path.join(downloadPath, base) + '.tar.gz', ''], [0,'chmod -R +rw *', os.path.join(os.getcwd(), base ) ], @@ -517,14 +517,14 @@ [0,'make', os.path.join(os.getcwd(), base )], [0,'make install', os.path.join(os.getcwd(), base )], ] - + if isWindows(): bjambase = 'boost-jam-3.1.16-1-ntx86' source = [ [wget,'http://downloads.sourceforge.net/boost/'+bjambase+'.zip',downloadPath] , [wget,'http://downloads.sourceforge.net/boost/'+base+'.zip',downloadPath] - ] - + ] + buildCmds = [ [0,unzip + os.path.join(downloadPath, bjambase+".zip"), ''], [0,unzip + os.path.join(downloadPath, base + ".zip"), ''], @@ -535,7 +535,7 @@ [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 @@ -543,7 +543,7 @@ gccp = subprocess.Popen (["gcc", "--version"], stdout=subprocess.PIPE) 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!? + # FIXME: Should this be the multithreaded version!? lib = "boost_python-gcc%s%s-mt-%s" % (gcc_version[0], gcc_version[1], versionBase) class boost_python_index: @@ -564,7 +564,7 @@ [0,'make all %s' % FLAGS, os.path.join(os.getcwd(), base)], [0,'make install %s' % FLAGS, os.path.join(os.getcwd(), base)], ] - + lib = boost.lib.replace("python", "python_index") #################################################### @@ -572,7 +572,7 @@ ## Now for the actual Python-Ogre Modules ## #################################################### - + class ogre: active = True pythonModule = True @@ -586,9 +586,9 @@ myLibraryPaths = [] myLibraries = ['OgreMain'] libraries = myLibraries - - if isWindows(): - + + if isWindows(): + if _STABLE or not _STABLE: ## temp force to this version... version="1.6.0" source = [ @@ -601,9 +601,9 @@ os.path.join(os.getcwd(), 'ogre') ], [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()], [0,'echo Please use MSVC Express Edition to build Ogre Release.',''] - ] + ] # else: -# +# # version="trunk" # source = [ # [ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC9_Eihort_20080203.zip", downloadPath], @@ -614,8 +614,8 @@ # os.path.join(os.getcwd(), 'ogre') ], # [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.patch -p0 ", os.getcwd()], # [0,'echo Please use MSVC Express Edition to build Ogre Release.',''] -# ] - +# ] + # requirements to build a precompiled header on the fly if _PreCompiled: pchstop = 'python_ogre_precompiled.h' @@ -629,8 +629,8 @@ , Config.PATH_LIB_Ogre_Dependencies #needed for ceguibase.lib etc , Config.PATH_LIB_CEGUI ] - include_dirs = [ Config.PATH_Boost - , Config.PATH_INCLUDE_Ogre + include_dirs = [ Config.PATH_Boost + , Config.PATH_INCLUDE_Ogre , Config.PATH_INCLUDE_NEDMALLOC ] CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 ' @@ -667,19 +667,19 @@ lib_dirs=[Config.LOCAL_LIB] include_dirs=[Config.PATH_Boost, Config.PATH_INCLUDE_Ogre] CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D__PYTHONOGRE_BUILD_CODE ' - + source = [ [wget, "http://downloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath], ] - + elif isMac(): version = "1.6.0RC1" base = "ogre-linux_osx-v1-4-9" basedep = "OgreDependenciesOSX_20070929" source = [ [wget, "http://prdownloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath], - [wget, "http://downloads.sourceforge.net/ogre/" +basedep +".zip",downloadPath], + [wget, "http://downloads.sourceforge.net/ogre/" +basedep +".zip",downloadPath], ] buildCmds = [ [0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ], @@ -696,21 +696,21 @@ [0, "xcodebuild -project ogre/Mac/Samples/Samples.xcodeproj -configuration Release", ''], [0, "cp -R *.framework " + Config.FRAMEWORK_DIR, os.path.join(os.getcwd() ,'ogre',"Mac", "build", "Release") ] ] - + libs=[boost.lib] lib_dirs = [ Config.PATH_LIB_Boost ] - include_dirs = [ Config.PATH_Boost + include_dirs = [ Config.PATH_Boost , Config.PATH_INCLUDE_Ogre , python_include_dirs ] - + CCFLAGS = '' LINKFLAGS = '' cflags += '' - + CheckIncludes=['boost/python.hpp', 'Ogre.h'] - - + + class ois: active = True pythonModule = True @@ -735,7 +735,7 @@ # [0,'make', os.path.join(os.getcwd(), base )], # [0,'make install', os.path.join(os.getcwd(), base )] # ] - + buildCmds = [ [0, tar + " zxf " + os.path.join(downloadPath,'ois_1.2.0')+".tar.gz --overwrite",os.getcwd() ], [0, "./bootstrap" ,os.path.join(os.getcwd(), base )], @@ -751,23 +751,23 @@ # [0, '"c:/Program Files/Microsoft Visual Studio 8/vc/vcpackages/vcbuild.exe" /useenv ois_VC8.sln ', os.path.join(os.getcwd(), base, 'Win32' )], # [0, VCBUILD + " ois_vc8.sln " + "\"Release|Win32\"", os.path.join(os.getcwd(), base, 'Win32' )] ] - + if os.name=='nt': if _PreCompiled: pchstop = 'OIS.h' pchbuild = 'buildpch.cpp' pchincludes = ['boost/python.hpp', 'OIS.h'] - + libs=['OIS_Static',boost.lib] else: libs=['OIS',boost.lib] libs.append ( boost_python_index.lib ) if os.name=="nt": libs.append ( "User32" ) # needed for static linking - include_dirs = [ Config.PATH_Boost + include_dirs = [ Config.PATH_Boost , Config.PATH_INCLUDE_OIS ] - lib_dirs = [ Config.PATH_LIB_Boost + lib_dirs = [ Config.PATH_LIB_Boost , Config.PATH_LIB_OIS ] ModuleName = 'OIS' @@ -777,7 +777,7 @@ LINKFLAGS = '-framework Python -framework Carbon' else: LINKFLAGS = "-l%s" % boost_python_index.lib - + class ogrerefapp: active = True pythonModule = True @@ -803,7 +803,7 @@ , Config.PATH_LIB_ODE , Config.PATH_LIB_OgreRefApp ] - include_dirs = [ Config.PATH_Boost + include_dirs = [ Config.PATH_Boost ,Config.PATH_INCLUDE_Ogre ,Config.PATH_INCLUDE_OgreRefApp ,Config.PATH_INCLUDE_ODE @@ -811,7 +811,7 @@ CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19' ModuleName = 'OgreRefApp' CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'OgreReferenceAppLayer.h', 'ode/ode.h'] - + class ogrenewt: active = True pythonModule = True @@ -834,7 +834,7 @@ ] baseDir = os.path.join(os.getcwd(), base ) buildCmds = [ - [0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir], + [0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir], #[0, "cp SConscript OgreNewt_Main", baseDir], #[0, "rm SConscript", baseDir], [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir], @@ -842,13 +842,13 @@ ] if isWindows(): buildCmds = [ - [0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir], + [0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir], [0, "rm -r ./OgreNewt_Main/inc/boost", baseDir], ] include_dirs = [Config.PATH_Boost , Config.PATH_Newton # only one path for Newton - , Config.PATH_INCLUDE_Ogre + , Config.PATH_INCLUDE_Ogre , Config.PATH_INCLUDE_OgreNewt , Config.PATH_INCLUDE_Ogre_Dependencies #needed for OIS/OIS.h ] @@ -856,21 +856,21 @@ ,Config.PATH_LIB_Newton ,Config.PATH_LIB_OgreNewt , Config.PATH_LIB_Ogre_OgreMain - + ] CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19' ModuleName = 'OgreNewt' CheckIncludes=['boost/python.hpp', 'Ogre.h', 'OgreNewt.h', 'Newton.h'] - + class cegui: active = True pythonModule = True parent = "ogre/gui" name = 'cegui' if _STABLE: - version = "0.5.0b" + version = "0.5.0b" else: - version = "0.6.1" + version = "0.6.1" if isWindows(): if _PreCompiled: pchstop = 'cegui.h' @@ -892,7 +892,7 @@ source=[ [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.1.tar.gz?download", 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)], @@ -905,19 +905,19 @@ [0,'make', os.path.join(os.getcwd(), base )], [0,'make install', os.path.join(os.getcwd(), base )] ] - if isWindows(): - version = "0.6.1" + if isWindows(): + version = "0.6.1" base = "CEGUI-0.6.1" source=[ [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.1.zip?download", downloadPath] ] buildCmds = [ [0, unzip + " " + os.path.join(downloadPath,base)+".zip", os.getcwd()], - [0, 'echo Now run build_vs2008.bat from the CEGUI makefiles\premake directory',''], + [0, 'echo Now run build_vs2008.bat from the CEGUI makefiles\premake directory',''], [0, 'echo then use MSVC to build the CEGUI Release project',''], [0, 'echo WARNING - Check that RTTI is enabled in the compiler options',''], [0, 'echo Then ensure that OgreGUIRender is compiled with this version of CEGUI',''] - ] + ] include_dirs = [Config.PATH_Boost ,Config.PATH_INCLUDE_CEGUI ,Config.PATH_CEGUI @@ -925,16 +925,16 @@ , Config.PATH_INCLUDE_Ogre , Config.PATH_INCLUDE_Ogre_Dependencies ## needed as OgreCEGUI uses CEGUI/.. in #includes ] - + lib_dirs = [ Config.PATH_LIB_Boost ##, Config.PATH_LIB_Ogre_CEGUIRenderer , Config.PATH_LIB_Ogre_OgreMain , Config.PATH_LIB_CEGUI - , Config.PATH_LIB_Ogre_Dependencies + , Config.PATH_LIB_Ogre_Dependencies ] CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19' ModuleName = 'CEGUI' - CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'CEGUI.h', 'OgreCEGUIRenderer.h'] + CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'CEGUI.h', 'OgreCEGUIRenderer.h'] if isLinux(): LINKFLAGS = "-l%s" % boost_python_index.lib @@ -947,22 +947,22 @@ parent = "ogre/physics" odeLibraryName = 'ode' libs=[boost.lib, odeLibraryName] - + if isWindows(): odeLibraryName = 'ode_single' libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function else: - libs.append ( boost_python_index.lib ) + libs.append ( boost_python_index.lib ) lib_dirs = [ Config.PATH_LIB_Boost , Config.PATH_LIB_ODE ] - include_dirs = [ Config.PATH_Boost + include_dirs = [ Config.PATH_Boost , Config.PATH_INCLUDE_ODE , os.path.join(Config.PATH_ODE, 'OPCODE') ] ModuleName = 'ODE' - CheckIncludes = ['boost/python.hpp', 'ode/ode.h'] + CheckIncludes = ['boost/python.hpp', 'ode/ode.h'] baseDir = os.path.join(os.getcwd(),"ode-0.10.1") if not isWindows(): source = [ @@ -976,7 +976,7 @@ [0, "./configure --prefix=%s --includedir=%s/include" %(PREFIX, PREFIX), baseDir], [0, "make", baseDir], [0, "make install", baseDir] - + ] else: source = [ @@ -984,9 +984,9 @@ ] buildCmds = [ [0, unzip + os.path.join(downloadPath,"ode-src-0.10.1.zip"), ''], - ] - - + ] + + class opcode: active = True pythonModule = True @@ -998,15 +998,15 @@ libs.append ( boost_python_index.lib ) lib_dirs = [ Config.PATH_LIB_Boost ] - include_dirs = [ Config.PATH_Boost + include_dirs = [ Config.PATH_Boost , Config.PATH_INCLUDE_OPCODE , os.path.join(Config.PATH_INCLUDE_OPCODE, 'Ice' ) ] CCFLAGS = ' -DBAN_OPCODE_AUTOLINK -DICE_NO_DLL ' ModuleName = 'Opcode' - CheckIncludes = ['boost/python.hpp', 'Opcode.h'] - + CheckIncludes = ['boost/python.hpp', 'Opcode.h'] + class caelum: active = True pythonModule = True @@ -1024,11 +1024,11 @@ CheckIncludes=[] if isLinux(): libs=[ boost.lib, boost_python_index.lib, 'OgreMain' ] - else: + else: libs=[ boost.lib, 'OgreMain' ] - - ModuleName="caelum" - + + ModuleName="caelum" + class ogreode: active = True pythonModule = True @@ -1046,7 +1046,7 @@ , Config.PATH_LIB_Ogre_OgreMain , Config.PATH_LIB_ODE ] - include_dirs = [ Config.PATH_Boost + include_dirs = [ Config.PATH_Boost , Config.PATH_INCLUDE_ODE , Config.PATH_INCLUDE_OgreOde , Config.PATH_INCLUDE_OgreOdePrefab @@ -1062,7 +1062,7 @@ [svn, " co https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/ogreode " + baseDir, os.getcwd()] ] buildCmds = [ - [0, "patch -s -N -i ../../python-ogre/patch/ogreode.patch -p0", baseDir], + [0, "patch -s -N -i ../../python-ogre/patch/ogreode.patch -p0", baseDir], [0, "chmod +x autogen.sh", baseDir], [0, "./autogen.sh", baseDir], [0, "./configure --without-SAMPLES --prefix=%s" % PREFIX, baseDir], @@ -1075,13 +1075,13 @@ libs.append('ode') libs.append ( boost_python_index.lib ) else: - libs.append('ode_single') + libs.append('ode_single') CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19' - CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'ode/ode.h', 'ode/odecpp.h', 'OgreOde_Core.h', 'OgreOde_Loader.h', - 'Ogreode_Prefab.h'] - + CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'ode/ode.h', 'ode/odecpp.h', 'OgreOde_Core.h', 'OgreOde_Loader.h', + 'Ogreode_Prefab.h'] + ModuleName='OgreOde' - + class quickgui: active = True pythonModule = True @@ -1089,9 +1089,9 @@ name ='quickgui' parent="ogre/gui" ## note the defined for _QuickGUIExport forces non dll usage - if os.name=='nt': - ## note the defined for _QuickGUIExport forces non dll usage - CCFLAGS = ' -DWIN32 -DNDEBUG -DWINDOWS -D_QuickGUIExport="" -D_PRECOMP' + if os.name=='nt': + ## note the defined for _QuickGUIExport forces non dll usage + CCFLAGS = ' -DWIN32 -DNDEBUG -DWINDOWS -D_QuickGUIExport="" -D_PRECOMP' # if _PreCompiled: # pchstop = 'boost/python.hpp' # pchbuild = 'buildpch.cpp' @@ -1112,7 +1112,7 @@ libs=[ boost.lib, 'OgreMain' ] if isLinux(): libs.append ( boost_python_index.lib ) - ModuleName="QuickGUI" + ModuleName="QuickGUI" class navi: active = False @@ -1120,7 +1120,7 @@ version="1.6" parent="ogre/gui" name ='navi' - CCFLAGS = '-D"WIN32" -D"NDEBUG", -D"WINDOWS", -D"_WIN32", -D"NAVI_DYNAMIC_LIB" ' + CCFLAGS = '-D"WIN32" -D"NDEBUG", -D"WINDOWS", -D"_WIN32", -D"NAVI_DYNAMIC_LIB" ' cflags="" base = 'navi' include_dirs = [ Config.PATH_Boost @@ -1137,12 +1137,12 @@ libs=[ boost.lib, 'Navi_DLL', 'OgreMain','Astral', 'user32', 'kernel32.lib', 'gdi32.lib', 'winspool.lib', 'comdlg32.lib', 'advapi32.lib', 'shell32.lib','ole32.lib','oleaut32.lib','uuid.lib' ] - ModuleName="navi" + ModuleName="navi" source = [ [svn, " checkout http://navi.googlecode.com/svn/trunk/ "+base, os.getcwd()] ] - - + + class betagui: active = True pythonModule = True @@ -1167,9 +1167,9 @@ libs.append ( "User32" ) # needed for static linking else: libs.append ( boost_python_index.lib ) - - ModuleName="betagui" + ModuleName="betagui" + class ogreforests: active = True pythonModule = True @@ -1189,16 +1189,16 @@ libs=[ boost.lib, 'OgreMain' ] if isLinux(): libs.append ( boost_python_index.lib ) - ModuleName="ogreforests" + ModuleName="ogreforests" - + class particleuniverse: active = True pythonModule = True version="0.81" name='particleuniverse' parent="ogre/addons" - CCFLAGS = ' ' + CCFLAGS = ' ' cflags="" include_dirs = [ Config.PATH_Boost, Config.PATH_INCLUDE_Ogre, @@ -1212,8 +1212,8 @@ libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ] if isLinux(): libs.append ( boost_python_index.lib ) - ModuleName="particleuniverse" - + ModuleName="particleuniverse" + class nxogre: active = True pythonModule = True @@ -1235,7 +1235,7 @@ # pchincludes = ['boost/python.hpp', 'nxogre.h'] else: - CCFLAGS = ' -DNX_LINUX -DLINUX -DNX_DISABLE_FLUIDS ' + CCFLAGS = ' -DNX_LINUX -DLINUX -DNX_DISABLE_FLUIDS ' lib_dirs = [Config.PATH_LIB_Boost, Config.PATH_LIB_Ogre_OgreMain, Config.PATH_LIB_NxOgre, @@ -1248,10 +1248,10 @@ else: libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ] libs.append ( boost_python_index.lib ) - ModuleName="NxOgre" - - - + ModuleName="NxOgre" + + + class theora: active = True pythonModule = True @@ -1263,14 +1263,14 @@ Config.PATH_INCLUDE_Ogre, Config.PATH_INCLUDE_Theora, Config.PATH_INCLUDE_TheoraDemo - + ] for d in Config.PATH_INCLUDE_OggVorbisTheora: include_dirs.append( d ) - + if os.name == 'nt': CCFLAGS = ' -D"WIN32" ' - + lib_dirs = [Config.PATH_LIB_Boost, Config.PATH_LIB_Ogre_OgreMain, Config.PATH_LIB_Theora, @@ -1279,8 +1279,8 @@ libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ] if isLinux(): libs.append ( boost_python_index.lib ) - ModuleName="theora" - + ModuleName="theora" + class plib: active = True pythonModule = True @@ -1288,12 +1288,12 @@ name='plib' parent="ogre/addons" cflags="" - CCFLAGS = ' -D"_CRT_SECURE_NO_WARNINGS" ' + CCFLAGS = ' -D"_CRT_SECURE_NO_WARNINGS" ' include_dirs= [ Config.PATH_INCLUDE_plib, Config.PATH_THIRDPARTY # needed as net.h includes via plib/xxxx ] lib_dirs = [ Config.PATH_LIB_Boost, - ] + ] ModuleName = "plib" CheckIncludes=[] if os.name == "nt": @@ -1301,7 +1301,7 @@ else: libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed libs.append ( boost_python_index.lib ) - + class physx: active = True pythonModule = True @@ -1318,7 +1318,7 @@ CCFLAGS = ' -D"WIN32" ' ## CCFLAGS = ' ' ## try to not define WIN 32 to remove inline assembly code that GCCxml doesn't like else: - CCFLAGS = ' -D"LINUX" -D"NX_USE_SDK_DLLS" -D"_USRDLL" -D"NX_DISABLE_FLUIDS" ' + CCFLAGS = ' -D"LINUX" -D"NX_USE_SDK_DLLS" -D"_USRDLL" -D"NX_DISABLE_FLUIDS" ' lib_dirs = [Config.PATH_LIB_Boost, Config.PATH_LIB_Ogre_OgreMain, Config.PATH_LIB_PhysX @@ -1332,7 +1332,7 @@ source = [ [wget, "http://developer.download.nvidia.com/PhysX/2.8.1/PhysX_2.8.1_SDK_CoreLinux_deb.tar.gz", downloadPath] ] - + buildCmds = [ [0, "tar zxf " + os.path.join(downloadPath, "PhysX_2.8.1_SDK_CoreLinux_deb.tar.gz"), ''], [0, "sudo dpkg -i libphysx-common_2.8.1-4_i386.deb", ''], @@ -1341,7 +1341,7 @@ [0, "sudo dpkg -i libphysx-extras-2.8.1_4_i386.deb", ''] ] - ModuleName="PhysX" + ModuleName="PhysX" # class nxogre_09: # active = False # True @@ -1358,9 +1358,9 @@ # include_dirs.append( d ) # if os.name == 'nt': # CCFLAGS = ' -DWIN32 -DNxExport="" ' -# +# # else: -# CCFLAGS = ' -DNX_LINUX -DLINUX -DNX_DISABLE_FLUIDS ' +# CCFLAGS = ' -DNX_LINUX -DLINUX -DNX_DISABLE_FLUIDS ' # lib_dirs = [Config.PATH_LIB_Boost, # Config.PATH_LIB_Ogre_OgreMain, # Config.PATH_LIB_PhysX @@ -1370,7 +1370,7 @@ # libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'NxExtensions', 'PhysXLoader','OgreMain' ] # else: # libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain' ] -# ModuleName="NxOgre_09" +# ModuleName="NxOgre_09" class ogreal: active = True @@ -1378,33 +1378,33 @@ version="r115" name='ogreal' cflags = '' - + parent = "ogre/sound" - + include_dirs = [ Config.PATH_Boost , Config.PATH_INCLUDE_Ogre , Config.PATH_INCLUDE_OgreAL , Config.PATH_INCLUDE_OGG , Config.PATH_INCLUDE_VORBIS , Config.PATH_INCLUDE_OPENAL - ] - - if isWindows(): + ] + + if isWindows(): lib_dirs = [ Config.PATH_LIB_Boost - ,Config.PATH_LIB_Ogre_OgreMain + ,Config.PATH_LIB_Ogre_OgreMain ,os.path.join(Config.PATH_OGG, 'win32', 'Static_Release') ,os.path.join(Config.PATH_VORBIS, 'win32','Vorbis_Static_Release') ,os.path.join(Config.PATH_VORBIS, 'win32','VorbisEnc_Static_Release') ,os.path.join(Config.PATH_VORBIS, 'win32','VorbisFile_Static_Release') ,os.path.join(Config.PATH_OPENAL, 'Release' ) #'libs','Win32') ,Config.PATH_LIB_OgreAL - ] - CCFLAGS = ' -DWIN32 -DNDEBUG -D_LIB -D_WIN32 -D_WINDOWS ' #-DVORBIS_IEEE_FLOAT32 -D_USE_NON_INTEL_COMPILER ' - libs=[boost.lib, 'OgreMain', - 'ogg_static', + ] + CCFLAGS = ' -DWIN32 -DNDEBUG -D_LIB -D_WIN32 -D_WINDOWS ' #-DVORBIS_IEEE_FLOAT32 -D_USE_NON_INTEL_COMPILER ' + libs=[boost.lib, 'OgreMain', + 'ogg_static', 'vorbis_static','vorbisfile_static', #'vorbisenc_static', - 'OpenAL32', + 'OpenAL32', #'EFX-Util' ] # -- going to compile OgreAL ourselves @@ -1423,8 +1423,8 @@ ] else: lib_dirs = [ Config.PATH_LIB_Boost - ,Config.PATH_LIB_Ogre_OgreMain - ] + ,Config.PATH_LIB_Ogre_OgreMain + ] source = [ # ["wget", "http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz",downloadPath], ["wget", "http://connect.creativelabs.com/openal/Downloads/openal-soft-1.5.304.tar.bz2",downloadPath], @@ -1441,24 +1441,24 @@ [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")], - [0,"cmake -DCMAKE_INSTALL_PREFIX:PATH="+ PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304')], - [0,"make ", os.path.join(os.getcwd(),'openal-soft-1.5.304')], + [0,"cmake -DCMAKE_INSTALL_PREFIX:PATH="+ PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304')], + [0,"make ", os.path.join(os.getcwd(),'openal-soft-1.5.304')], [0,"cp -p libopenal* %s/lib " % PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304')], [0,"cp -p * %s/include " % PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304', 'include','AL')] - + # [0, "sed --in-place -s 's|( ALCvoid )|()|' alc.h",os.path.join(os.getcwd(),"openal-0.0.8","common", "include", "AL")], # [0, "aclocal\n./autogen.sh", os.path.join(os.getcwd(),"openal-0.0.8")], # [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")] ] libs=[boost.lib, boost_python_index.lib, 'OgreMain', 'vorbisfile', - #'ogg', + #'ogg', #'vorbis','vorbisfile','vorbisenc', 'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves - libs.append ( boost_python_index.lib ) + libs.append ( boost_python_index.lib ) ModuleName = 'OgreAL' CheckIncludes = ['OgreAL.h'] - + class ogrevideoffmpeg: active = False pythonModule = True @@ -1484,7 +1484,7 @@ 'libvorbisenc','libvorbisfile','libtheora','libgsm','libvfw32','libgcc' ] else: libs=[ boost.lib, 'OgreMain', 'avformat', 'avcodec', 'avutil', 'z', 'GL', 'GLU', 'Xxf86vm', 'Xext', 'X11' ] - ModuleName="ogrevideoffmpeg" + ModuleName="ogrevideoffmpeg" class ogredshow: active = False @@ -1492,9 +1492,9 @@ version="0.1" name='ogredshow' parent="ogre/addons" - if os.name=='nt': - ## note the defined for _ETManagerExport forces non dll usage - CCFLAGS = ' -DWIN32 -DNDEBUG -DWINDOWS -D_ETManagerExport="" ' + if os.name=='nt': + ## note the defined for _ETManagerExport forces non dll usage + CCFLAGS = ' -DWIN32 -DNDEBUG -DWINDOWS -D_ETManagerExport="" ' else: CCFLAGS = '' cflags = "" @@ -1504,12 +1504,12 @@ ] lib_dirs = [Config.PATH_LIB_Boost, Config.PATH_LIB_Ogre_OgreMain, - + ] CheckIncludes=[] libs=[ boost.lib, 'OgreMain','Strmiids' , 'ole32'] - ModuleName="ogredshow" - + ModuleName="ogredshow" + class et: ## editable terrain active = True pythonModule = True @@ -1520,7 +1520,7 @@ libs=[ boost.lib, boost_python_index.lib, 'OgreMain' ] else: libs=[ boost.lib, 'OgreMain' ] - + lib_dirs = [ Config.PATH_LIB_Boost, Config.PATH_LIB_Ogre_OgreMain ] @@ -1529,10 +1529,10 @@ Config.PATH_et ] ModuleName = 'et' - CheckIncludes = ['boost/python.hpp'] + CheckIncludes = ['boost/python.hpp'] CCFLAGS = " " cflags='' - + class bullet: active = True pythonModule = True @@ -1555,7 +1555,7 @@ lib_dirs = [ Config.PATH_LIB_Boost , Config.PATH_LIB_Bullet ] - include_dirs = [ Config.PATH_Boost + include_dirs = [ Config.PATH_Boost , Config.PATH_INCLUDE_Bullet ] if not isWindows(): @@ -1581,19 +1581,19 @@ buildCmds = [ [0, unzip +os.path.join(downloadPath, base)+".zip", ''], ] - + ModuleName = 'bullet' - CheckIncludes = ['boost/python.hpp'] + CheckIncludes = ['boost/python.hpp'] cflags = "" - -class ogrebulletc: # + +class ogrebulletc: # active = True pythonModule = True name='ogrebulletc' version = "r2493" cflags = "" parent = "ogre/physics" - libs = [boost.lib, 'OgreMain', + libs = [boost.lib, 'OgreMain', 'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody','LibLinearMath' ] # if isWindows(): @@ -1603,8 +1603,8 @@ include_dirs = [Config.PATH_Boost , Config.PATH_INCLUDE_Bullet , os.path.join(Config.PATH_OgreBullet, 'Collisions' ) - , Config.PATH_INCLUDE_Ogre - , Config.PATH_INCLUDE_Ogre_Dependencies + , Config.PATH_INCLUDE_Ogre + , Config.PATH_INCLUDE_Ogre_Dependencies ] lib_dirs = [ Config.PATH_LIB_Boost ,Config.PATH_LIB_Bullet @@ -1616,17 +1616,17 @@ CCFLAGS = ' -D_PRECOMP -fno-inline ' libs.append ( boost_python_index.lib ) ModuleName = 'OgreBulletC' - CheckIncludes=['boost/python.hpp', 'Ogre.h'] + CheckIncludes=['boost/python.hpp', 'Ogre.h'] -class ogrebulletd: # +class ogrebulletd: # active = True pythonModule = True version = "r2493" name='ogrebulletd' cflags = "" parent = "ogre/physics" - libs = [boost.lib, 'OgreMain', + libs = [boost.lib, 'OgreMain', 'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody','LibLinearMath' ] # if isWindows(): @@ -1637,8 +1637,8 @@ , Config.PATH_INCLUDE_Bullet , os.path.join(Config.PATH_OgreBullet, 'Collisions' ) , os.path.join(Config.PATH_OgreBullet, 'Dynamics' ) - , Config.PATH_INCLUDE_Ogre - , Config.PATH_INCLUDE_Ogre_Dependencies + , Config.PATH_INCLUDE_Ogre + , Config.PATH_INCLUDE_Ogre_Dependencies ] lib_dirs = [ Config.PATH_LIB_Boost ,Config.PATH_LIB_Bullet @@ -1650,9 +1650,9 @@ CCFLAGS = ' -D_PRECOMP -fno-inline ' libs.append ( boost_python_index.lib ) ModuleName = 'OgreBulletD' - CheckIncludes=['boost/python.hpp', 'Ogre.h'] + CheckIncludes=['boost/python.hpp', 'Ogre.h'] descText = "Ogre Bullet Dynamics (physics) implementation" - + class noise: active = True pythonModule = True @@ -1671,9 +1671,9 @@ libs=[ boost.lib] if isLinux(): libs.append ( boost_python_index.lib ) - ModuleName="noise" + ModuleName="noise" descText = "Generate 'noise'" - + class watermesh: active = True pythonModule = True @@ -1692,9 +1692,9 @@ libs=[ boost.lib, 'OgreMain' ] if isLinux(): libs.append ( boost_python_index.lib ) - ModuleName="watermesh" + ModuleName="watermesh" descText = "C++ code from Ogre Water demo -- use Hydrax instead" - + class ofusion: active = True pythonModule = True @@ -1713,9 +1713,9 @@ libs=[ boost.lib, 'OgreMain' ] if isLinux(): libs.append ( boost_python_index.lib ) - ModuleName="ofusion" + ModuleName="ofusion" descText = "Import Ogre 'Scenes' from 3dMax using the ofusion exporter" - + class cadunetree: active = True pythonModule = True @@ -1734,8 +1734,8 @@ libs=[ boost.lib, 'OgreMain' ] if isLinux(): libs.append ( boost_python_index.lib ) - ModuleName="cadunetree" - descText = "Generate realistic trees" + ModuleName="cadunetree" + descText = "Generate realistic trees" class ogrepcz: active = True @@ -1756,9 +1756,9 @@ libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ] if isLinux(): libs.append ( boost_python_index.lib ) - ModuleName="ogrepcz" - descText = "Portal SceneManager - seamlessly move from interior to exterior scene management" - + ModuleName="ogrepcz" + descText = "Portal SceneManager - seamlessly move from interior to exterior scene management" + class opensteer: active = False pythonModule = True @@ -1777,7 +1777,7 @@ libs=[ boost.lib, 'opensteer' ] if isLinux(): libs.append ( boost_python_index.lib ) - ModuleName="opensteer" + ModuleName="opensteer" class hydrax: active = True @@ -1797,8 +1797,8 @@ libs=[ boost.lib, 'OgreMain' ] if isLinux(): libs.append ( boost_python_index.lib ) - ModuleName="hydrax" - descText = "Fantastic water/ocean effects" + ModuleName="hydrax" + descText = "Fantastic water/ocean effects" class hikari: active = True @@ -1819,7 +1819,7 @@ libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ] if isLinux(): libs.append ( boost_python_index.lib ) - ModuleName="hikari" + ModuleName="hikari" descText = "Use Flash controls within Ogre" descLink = "http://hikari-library.googlecode.com/" @@ -1838,19 +1838,19 @@ # lib_dirs = [Config.PATH_LIB_Boost # ,Config.PATH_LIB_Ogre_OgreMain # ,Config.PATH_LIB_mygui -# +# # ] # CheckIncludes=[] # libs=[ boost.lib, 'OgreMain', 'MyGUI' ] ##, 'hikari' ] -# ModuleName="mygui" +# ModuleName="mygui" # descText = "MyGUI Interface System" # descLink = "http://sourceforge.net/projects/my-gui/" - + ############################################################################################ ## Here is the master list.... ## Keep eveything here in lowercase so the over rides work :) - + projects = { 'ois' : ois , 'ogre' : ogre @@ -1888,11 +1888,11 @@ , 'hydrax' : hydrax , 'hikari' : hikari # , 'mygui' : mygui -} +} # # let's setup some defaults -# +# def CheckPaths ( cls , name): """ lets check we can find files listed in the CheckIncludes list somewhere in the include_dirs directories also look for libs in the lib_dirs. @@ -1908,7 +1908,7 @@ if not found: pass # print "WARNING: Unable to find %s include file (%s class) in include_dirs" % (incfile, name) -# # if os.name =='nt': +# # if os.name =='nt': # # for libfile in cls.libs : # # libfile += '.lib' # # found = False @@ -1919,14 +1919,14 @@ # # break # # if not found: # # print "WARNING: Unable to find %s library (%s class) in lib_dirs" % (libfile, name) - + # # a couple of specials that should be done differently gccxml_bin = Config.gccxml_bin -pyplusplus_install_dir = Config.pyplusplus_install_dir - -rpath= Config.RPATH - +pyplusplus_install_dir = Config.pyplusplus_install_dir + +rpath= Config.RPATH + for name, cls in projects.items(): # little hack to allow overriding of settings from the PythonOgreConfig_xxxxx.py file @@ -1935,10 +1935,10 @@ _class = Config.__dict__[name] # get the class for key, value in _class.__dict__.items(): if not key.startswith('_'): - cls.__dict__[key] = value - print "Set %s.%s to %s" % (name, key, value) - - + cls.__dict__[key] = value + print "Set %s.%s to %s" % (name, key, value) + + ##CheckPaths( cls, name ) cls.root_dir = os.path.join( root_dir, 'code_generators', name ) cls.dir_name = name + '_' + str(cls.version) @@ -1946,8 +1946,8 @@ cls.cache_file = os.path.join( declarations_cache_dir, cls.dir_name + '_cache.xml' ) if isMac(): # On the mac the Ogre library is lined in with the -framework command in scons - try: - cls.libs.remove('OgreMain') + try: + cls.libs.remove('OgreMain') except: pass ## and we have a commond set of flags that I will set here... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2009-03-24 12:46:45
|
Revision: 919 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=919&view=rev Author: mithro Date: 2009-03-24 12:46:38 +0000 (Tue, 24 Mar 2009) Log Message: ----------- Updated for OIS building on MSVC with certain includes (xref..) Added -D"_HAS_TR1=0" to gccxml builds Modified Paths: -------------- trunk/python-ogre/environment.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2009-03-24 12:47:14
|
Revision: 920 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=920&view=rev Author: mithro Date: 2009-03-24 12:47:05 +0000 (Tue, 24 Mar 2009) Log Message: ----------- Added patch to implement a much simplified CEGUI patch under linux. Added comment code in case someone needs to build bjam from source on Linux -- currently using the pre-built binary. Will leave it this way unless people start having issues with the pre-built binary... Modified Paths: -------------- trunk/python-ogre/environment.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2009-03-24 12:47:36
|
Revision: 921 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=921&view=rev Author: mithro Date: 2009-03-24 12:47:31 +0000 (Tue, 24 Mar 2009) Log Message: ----------- added cflags option to ogre windows code generation that solves <map> issues on some compiler (see previous ois related commit) Modified Paths: -------------- trunk/python-ogre/environment.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mi...@us...> - 2009-03-24 12:48:06
|
Revision: 922 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=922&view=rev Author: mithro Date: 2009-03-24 12:47:58 +0000 (Tue, 24 Mar 2009) Log Message: ----------- Moving stable back to 1.36 as that is the version most recent distros ship with. Modified Paths: -------------- trunk/python-ogre/environment.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |