|
From: <and...@us...> - 2007-09-28 14:52:50
|
Revision: 397
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=397&view=rev
Author: andy_miller
Date: 2007-09-28 07:52:54 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
Type on Ogre module name
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-09-28 14:45:20 UTC (rev 396)
+++ trunk/python-ogre/environment.py 2007-09-28 14:52:54 UTC (rev 397)
@@ -106,7 +106,7 @@
class Default:
version = ""
pythonModule = False
- moduleName = ""
+ ModuleName = ""
myHome = ""
myLibraryPaths = [ ]
myLibraries = [ ]
@@ -126,7 +126,7 @@
class boost:
version = "3.4"
pythonModule = False
- moduleName = ""
+ ModuleName = ""
myHome = 'boost'
myLibraryPaths = [ 'boost/bin.v2/libs/python2.5/build/msvc-8.0/release/threading-multi' ]
myLibraries = [ 'boost_python-vc80-mt-1_35']
@@ -149,7 +149,7 @@
pythonModule = True
version = "1.4"
myName='ogre'
- moduleName='OGRE'
+ ModuleName='OGRE'
cflags = ""
moduleParentLocation = "renderer"
parent = "ogre/renderer"
@@ -226,8 +226,11 @@
class ogrerefapp:
active = True
version = "1.4"
- parent = "ogre/physics"
- libs=[Config.LIB_Boost, 'OgreMain', 'ode', 'ReferenceAppLayer']
+ parent = "ogre/physics"
+ if os.name=="nt":
+ libs=[Config.LIB_Boost, 'OgreMain', 'ode', 'ReferenceAppLayer']
+ else:
+ libs=[Config.LIB_Boost, 'OgreMain', 'ode', 'ReferenceAppLayer']
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_ODE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-11 03:11:09
|
Revision: 467
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=467&view=rev
Author: andy_miller
Date: 2007-11-10 19:11:11 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
Issue with some auto building I'm working in
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-11-11 01:31:00 UTC (rev 466)
+++ trunk/python-ogre/environment.py 2007-11-11 03:11:11 UTC (rev 467)
@@ -368,12 +368,13 @@
ModuleName="caelum"
active=True
-class newton:
- version= "1.0"
- active=False
- include_dirs = [r'c:/development/newtonsdk/sdk']
- ModuleName = 'NEWTON'
- parent = ""
+# class newton:
+# version= "1.0"
+# active=False
+# include_dirs = [r'c:/development/newtonsdk/sdk']
+# lib_dirs=[]
+# ModuleName = 'NEWTON'
+# parent = ""
class ogreode:
version= "1.0"
parent = "ogre/physics"
@@ -812,7 +813,7 @@
, 'ogre' : ogre
, 'cegui' : cegui
, 'ode' : ode
- , 'newton' : newton
+# , 'newton' : newton
, 'ogrerefapp' : ogrerefapp
, 'ogrenewt' : ogrenewt
, 'ogreode' : ogreode
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-01-06 07:08:03
|
Revision: 529
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=529&view=rev
Author: andy_miller
Date: 2008-01-05 23:08:09 -0800 (Sat, 05 Jan 2008)
Log Message:
-----------
Changed pygccxml source to use http and not https
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-01-06 05:41:58 UTC (rev 528)
+++ trunk/python-ogre/environment.py 2008-01-06 07:08:09 UTC (rev 529)
@@ -228,7 +228,7 @@
if isLinux() or isMac():
base = 'pygccxml'
source = [
- [svn, " co https://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
+ [svn, " co http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
]
buildCmds = [
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-01-18 05:56:06
|
Revision: 555
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=555&view=rev
Author: andy_miller
Date: 2008-01-17 21:56:11 -0800 (Thu, 17 Jan 2008)
Log Message:
-----------
More OgreNewt fixes
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-01-18 05:50:51 UTC (rev 554)
+++ trunk/python-ogre/environment.py 2008-01-18 05:56:11 UTC (rev 555)
@@ -624,11 +624,11 @@
]
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 -r ./OgreNewt_Main/inc/boost", baseDir],
- [0, "scons prefix=%s boost=%s/include/boost-1_34_1" % (PREFIX, PREFIX), baseDir], ##WARNING -- boost include dir name is different than build name (dash not underscore)
+ [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)
]
include_dirs = [Config.PATH_Boost
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-04-01 04:05:34
|
Revision: 582
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=582&view=rev
Author: andy_miller
Date: 2008-03-31 21:05:25 -0700 (Mon, 31 Mar 2008)
Log Message:
-----------
Pygccxml to rev 1234
Revision Links:
--------------
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=1234&view=rev
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-03-31 00:27:47 UTC (rev 581)
+++ trunk/python-ogre/environment.py 2008-04-01 04:05:25 UTC (rev 582)
@@ -178,18 +178,22 @@
class gccxml:
pythonModule = False
active = True
+ base = 'gccxml'
+ source = [
+ [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co "+base, os.getcwd()]
+ ]
if isLinux() or isMac():
- base = 'gccxml'
- source = [
- [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co "+base, os.getcwd()]
- ]
-
buildCmds = [
[0,"mkdir -p gccxml-build", ''],
[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:
+# print "Use cmake to create a build file for gccxml (point cmake at your ./gccxml directory"
+# print "Then use MSVC to build gccxml"
+ buildCmds=[]
+
class install:
pythonModule = False
active = True
@@ -236,7 +240,7 @@
class pygccxml:
pythonModule = False
active = True
- if isLinux() or isMac():
+ if isLinux() or isMac() or isWindows():
base = 'pygccxml'
source = [
[svn, " co -r 1234 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
@@ -342,6 +346,10 @@
[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
]
+ if isWindows():
+ print "Retrieve latest from http://www.cmake.org and install it yourself"
+ source=[]
+ buildCmds=[]
class scons:
pythonModule = False
@@ -352,7 +360,7 @@
]
# the utils in Windows don't handle paths or tar spawing gzip hence the work arounds
- if isLinux():
+ 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) ]
@@ -361,7 +369,7 @@
else:
buildCmds = unTarGz( base, downloadPath ) +\
[
- [0,"python setup.py install --prefix=%s" % PREFIX , os.path.join (os.getcwd(), base) ]
+ [0,"python setup.py install" , os.path.join (os.getcwd(), base) ]
]
class boost: ## also included bjam
@@ -1496,7 +1504,7 @@
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)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gam...@us...> - 2008-05-22 04:50:35
|
Revision: 591
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=591&view=rev
Author: Game_Ender
Date: 2008-05-21 21:50:44 -0700 (Wed, 21 May 2008)
Log Message:
-----------
Replaced catch "except:" with "except ImportError:", allows catching of typos and other errors when import PythonOgreConfig_*.py modules
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-05-20 09:42:51 UTC (rev 590)
+++ trunk/python-ogre/environment.py 2008-05-22 04:50:44 UTC (rev 591)
@@ -97,14 +97,14 @@
Config = __import__( s )
_ConfigSet = True
log ( "Loaded Config (based on username) from %s" % (s ))
-except:
+except ImportError:
try:
s= 'PythonOgreConfig_' + _SystemType ## + '.py'
Config = __import__( s )
_ConfigSet = True
log ( "Loaded Config (based on systemtype) from %s" % (s))
- except:
+ except ImportError:
pass
if not _ConfigSet:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-06-27 03:42:50
|
Revision: 618
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=618&view=rev
Author: andy_miller
Date: 2008-06-26 20:42:53 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
Fix gccxml cvs version to todays..
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-06-27 03:29:32 UTC (rev 617)
+++ trunk/python-ogre/environment.py 2008-06-27 03:42:53 UTC (rev 618)
@@ -187,7 +187,7 @@
]
else:
source = [
- [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co "+base, os.getcwd()]
+ [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D 27June2008 "+base, os.getcwd()]
]
if isLinux() or isMac():
buildCmds = [
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-06-27 23:35:04
|
Revision: 621
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=621&view=rev
Author: andy_miller
Date: 2008-06-27 16:35:13 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
Small typo
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-06-27 23:28:55 UTC (rev 620)
+++ trunk/python-ogre/environment.py 2008-06-27 23:35:13 UTC (rev 621)
@@ -501,10 +501,10 @@
source = [
[ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC8SP1_Eihort_20071227.zip", downloadPath],
- [ wget, "http://downloads.sourceforge.net/ogre/ogre-win32-v1-4-7.zip", downloadPath],
+ [ wget, "http://downloads.sourceforge.net/ogre/ogre-win32-v1-4-9.zip", downloadPath],
]
buildCmds = [
- [0, unzip + os.path.join(downloadPath,"ogre-win32-v1-4-7.zip"),os.getcwd() ],
+ [0, unzip + os.path.join(downloadPath,"ogre-win32-v1-4-9.zip"),os.getcwd() ],
[0, unzip + os.path.join(downloadPath,"OgreDependencies_VC8SP1_Eihort_20071227.zip"),
os.path.join(os.getcwd(), 'ogrenew') ],
[0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-06-28 23:56:53
|
Revision: 626
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=626&view=rev
Author: andy_miller
Date: 2008-06-28 16:57:01 -0700 (Sat, 28 Jun 2008)
Log Message:
-----------
Fixed CEGUI default XML parser as part of the Linux CEGUI Build (thanks Dermont)
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-06-28 12:14:12 UTC (rev 625)
+++ trunk/python-ogre/environment.py 2008-06-28 23:57:01 UTC (rev 626)
@@ -777,7 +777,7 @@
[0, "echo 'EMPTY' >>./NEWS", os.path.join(os.getcwd(),base)],
[0, "aclocal", os.path.join(os.getcwd(),base)],
[0, "automake" ,os.path.join(os.getcwd(), base )],
- [0,"./configure --prefix=%s --enable-freeimage=yes --disable-samples --without-ogre-renderer --includedir=%s/include" %(PREFIX,PREFIX) ,os.path.join(os.getcwd(), base )],
+ [0,"./configure --prefix=%s --enable-freeimage=yes --with-default-xml-parser=TinyXMLParser --disable-samples --without-ogre-renderer --includedir=%s/include" %(PREFIX,PREFIX) ,os.path.join(os.getcwd(), base )],
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )]
]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-15 02:16:22
|
Revision: 634
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=634&view=rev
Author: mithro
Date: 2008-07-14 19:16:28 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Fix normal builds of pygccxml and pyplusplus.
(Broke after I split the commands apart for debian packaging.)
Thanks Ivan Vucica.
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-14 06:33:46 UTC (rev 633)
+++ trunk/python-ogre/environment.py 2008-07-15 02:16:28 UTC (rev 634)
@@ -292,11 +292,11 @@
]
if isLinux() or isMac() :
buildCmds = [
- [0,"python setup.py install --prefix="+ PREFIX , os.path.join (os.getcwd(), base, "pygccxml_dev") ],
+ [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, "pygccxml_dev") ],
+ [0,"python setup.py install " , os.path.join (os.getcwd(), base) ],
]
@@ -314,11 +314,11 @@
]
if isLinux() or isMac() :
buildCmds = [
- [0,"python setup.py install --prefix=" + PREFIX , os.path.join (os.getcwd(), base, "pyplusplus_dev") ]
+ [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, "pyplusplus_dev") ]
+ [0,"python setup.py install " , os.path.join (os.getcwd(), base) ]
]
class cg:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-15 13:17:01
|
Revision: 646
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=646&view=rev
Author: mithro
Date: 2008-07-15 06:17:08 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Use the boost version we built rather then a hardcoded one.
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-15 13:14:53 UTC (rev 645)
+++ trunk/python-ogre/environment.py 2008-07-15 13:17:08 UTC (rev 646)
@@ -128,7 +128,6 @@
print "\n\n You DO need to create a PythonOgreConfig_%s.py file with config details" % ( _SystemType)
sys.exit(-1)
-
######################
downloadPath = os.path.abspath("downloads")
wget = "wget -c -nc "
@@ -508,23 +507,30 @@
[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 --toolset=msvc-8',os.path.join(os.getcwd(),base)]
]
-
-
+ # 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
+ import subprocess
+ gccp = subprocess.Popen (["gcc", "--version"], stdout=subprocess.PIPE)
+ gcc_version = gccp.communicate()[0].split('\n')[0].split()[2].split('.')
+
+ # FIXME: Should this be the multithreaded version!?
+ lib = "boost_python-gcc%s%s-%s" % (gcc_version[0], gcc_version[1], base[6:])
class boost_python_index:
active = True
version = "1.34.1"
pythonModule = False
ModuleName = ""
- base = "boost-python-index"
+ 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()],
- ]
+ ]
+ # FIXME: This should have build commands!
buildCmds = []
-
-
-
+
+ lib = boost.lib.replace("python", "python_index")
+
####################################################
##
## Now for the actual Python-Ogre Modules
@@ -567,7 +573,7 @@
pchbuild = 'buildpch.cpp'
pchincludes = ['python_ogre_precompiled.h']
#
- libs=[Config.LIB_Boost, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
+ libs=[boost.lib, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_Ogre_CEGUIRenderer
, Config.PATH_LIB_Ogre_OgreMain
@@ -582,7 +588,7 @@
externalFiles=['OgreMain.dll', 'OgreGuiRender.dll', Config.LIB_Boost+'.dll']
elif isLinux():
version = "1.4" #### UGLY OVERRIDE AT MOMENT...
- libs=[Config.LIB_Boost, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
+ libs=[boost.lib, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
base = "ogre-v1-4-9"
source = [
[wget, "http://downloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
@@ -600,14 +606,13 @@
[0, "make install", os.path.join(os.getcwd(), 'ogre')],
]
- libs=[Config.LIB_Boost, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
+ libs=[boost.lib, boost_python_index.lib, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
lib_dirs = [ Config.LOCAL_LIB
]
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Ogre
]
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
- LINKFLAGS = '-lboost_python_index-gcc42-1_34_1'
elif isMac():
base = "ogre-linux_osx-v1-4-9"
basedep = "OgreDependenciesOSX_20070929"
@@ -631,7 +636,7 @@
[0, "cp -R *.framework " + Config.FRAMEWORK_DIR, os.path.join(os.getcwd() ,'ogre',"Mac", "build", "Release") ]
]
- libs=[Config.LIB_Boost]
+ libs=[boost.lib]
lib_dirs = [ Config.PATH_LIB_Boost ]
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Ogre
@@ -692,9 +697,9 @@
pchbuild = 'buildpch.cpp'
pchincludes = ['boost/python.hpp', 'OIS.h']
- libs=['OIS_Static',Config.LIB_Boost]
+ libs=['OIS_Static',boost.lib]
else:
- libs=['OIS',Config.LIB_Boost]
+ libs=['OIS',boost.lib]
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
include_dirs = [ Config.PATH_Boost
@@ -709,7 +714,7 @@
if os.sys.platform == 'darwin':
LINKFLAGS = '-framework Python -framework Carbon'
else:
- LINKFLAGS = '-lboost_python_index-gcc42-1_34_1'
+ LINKFLAGS = "-l%s" % boost_python_index.lib
class ogrerefapp:
active = True
@@ -727,9 +732,9 @@
[0, "make install", baseDir],
]
if isWindows():
- libs=[Config.LIB_Boost, 'OgreMain', 'ode', 'ReferenceAppLayer']
+ libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
else:
- libs=[Config.LIB_Boost, 'OgreMain', 'ode', 'ReferenceAppLayer']
+ libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_ODE
@@ -752,9 +757,9 @@
parent = "ogre/physics"
base = 'ogreaddons/ogrenewt'
if isWindows():
- libs = ['Newton', Config.LIB_Boost, 'OgreNewt_Main', 'OgreMain']
+ libs = ['Newton', boost.lib, 'OgreNewt_Main', 'OgreMain']
else:
- libs = ['Newton', Config.LIB_Boost, 'OgreNewt', 'OgreMain']
+ libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain']
if _STABLE:
source = [
[cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()]
@@ -807,9 +812,9 @@
pchstop = 'cegui.h'
pchbuild = 'buildpch.cpp'
pchincludes = ['boost/python.hpp', 'cegui.h']
- libs=[Config.LIB_Boost, 'CEGUIBase', 'OgreMain', 'OgreGUIRenderer' ]
+ libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'OgreGUIRenderer' ]
else:
- libs=[Config.LIB_Boost, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
+ libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
if isLinux():
if _STABLE:
@@ -856,7 +861,7 @@
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
ModuleName = 'CEGUI'
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'CEGUI.h', 'OgreCEGUIRenderer.h']
- LINKFLAGS = '-lboost_python_index-gcc42-1_34_1'
+ LINKFLAGS = "-l%s" % boost_python_index.lib
class ode:
@@ -865,7 +870,7 @@
version= "0.9"
name ='ode'
parent = "ogre/physics"
- libs=[Config.LIB_Boost, 'ode']
+ libs=[boost.lib, 'ode']
if os.name=="nt":
libs.append ( "User32" ) # needed for MessageBox function
lib_dirs = [ Config.PATH_LIB_Boost
@@ -904,7 +909,7 @@
version= "1.3"
name = 'opcode'
parent = "ogre/physics"
- libs=[Config.LIB_Boost]
+ libs=[boost.lib]
lib_dirs = [ Config.PATH_LIB_Boost
]
include_dirs = [ Config.PATH_Boost
@@ -931,7 +936,7 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
ModuleName="caelum"
class ogreode:
@@ -974,7 +979,7 @@
[0, "make install", baseDir],
]
- libs=[Config.LIB_Boost, 'OgreMain', 'ode', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ]
+ libs=[boost.lib, 'OgreMain', 'ode', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ]
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']
@@ -1008,7 +1013,7 @@
##,Config.PATH_LIB_quickgui
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
ModuleName="QuickGUI"
class navi:
@@ -1031,7 +1036,7 @@
,os.path.join(Config.PATH_navi,'..','Dependencies','win32','astral','lib')
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'Navi_DLL', 'OgreMain','Astral', 'user32',
+ 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"
@@ -1057,7 +1062,7 @@
Config.PATH_LIB_betagui
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
ModuleName="betagui"
class ogreforests:
@@ -1076,7 +1081,7 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
ModuleName="ogreforests"
@@ -1097,7 +1102,7 @@
Config.PATH_LIB_particleuniverse
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain', 'ParticleUniverse' ]
+ libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ]
ModuleName="particleuniverse"
class nxogre:
@@ -1128,11 +1133,11 @@
Config.PATH_LIB_PhysX
]
CheckIncludes=[]
-# libs=[ Config.LIB_Boost, 'NxOgre','NxCharacter', 'NxCooking', 'NxExtensions', 'PhysXLoader','OgreMain' ]
+# libs=[ boost.lib, 'NxOgre','NxCharacter', 'NxCooking', 'NxExtensions', 'PhysXLoader','OgreMain' ]
if os.name =='nt':
- libs=[ Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'PhysXLoader','OgreMain' ] #, 'NxOgreStatic'] #'NxExtensions',
+ libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader','OgreMain' ] #, 'NxOgreStatic'] #'NxExtensions',
else:
- libs=[ Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain' ]
+ libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain' ]
ModuleName="NxOgre"
@@ -1161,7 +1166,7 @@
Config.PATH_LIB_Theora,
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'Plugin_TheoraVideoSystem','OgreMain' ]
+ libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ]
ModuleName="theora"
class plib:
@@ -1180,9 +1185,9 @@
ModuleName = "plib"
CheckIncludes=[]
if os.name == "nt":
- libs = [ Config.LIB_Boost, 'winmm', 'User32','wsock32', 'opengl32.lib','glu32.lib' ]
+ libs = [ boost.lib, 'winmm', 'User32','wsock32', 'opengl32.lib','glu32.lib' ]
else:
- libs = [ Config.LIB_Boost ] # Note sure what linux libraries are needed
+ libs = [ boost.lib ] # Note sure what linux libraries are needed
class physx:
active = True
@@ -1207,9 +1212,9 @@
]
CheckIncludes=[]
if os.name == 'nt':
- libs=[ Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'PhysXLoader' ]
+ libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader' ]
else:
- libs=[ Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ]
+ libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ]
ModuleName="PhysX"
class nxogre_09:
@@ -1236,9 +1241,9 @@
]
CheckIncludes=[]
if os.name =='nt':
- libs=[ Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'NxExtensions', 'PhysXLoader','OgreMain' ]
+ libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'NxExtensions', 'PhysXLoader','OgreMain' ]
else:
- libs=[ Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain' ]
+ libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain' ]
ModuleName="NxOgre_09"
class ogreal:
@@ -1266,7 +1271,7 @@
,os.path.join(Config.PATH_OPENAL, 'libs','Win32')
]
CCFLAGS = ' -DOgreAL_Export="" -DWIN32 -DNDEBUG -D_LIB -D_WIN32 -D_WINDOWS -DVORBIS_IEEE_FLOAT32 -D_USE_NON_INTEL_COMPILER '
- libs=[Config.LIB_Boost, 'OgreMain',
+ libs=[boost.lib, 'OgreMain',
'ogg_static',
'vorbis_static','vorbisfile_static','vorbisenc_static',
'OpenAL32', 'EFX-Util'] ## 'OgreAL' -- going to compile OgreAL ourselves
@@ -1302,7 +1307,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=[Config.LIB_Boost, 'OgreMain',
+ libs=[boost.lib, 'OgreMain',
'ogg',
'vorbis','vorbisfile','vorbisenc',
'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves
@@ -1330,12 +1335,12 @@
]
CheckIncludes=[]
if os.name == 'nt':
- libs=[ Config.LIB_Boost, 'OgreMain', 'libavformat', 'libavcodec', 'libavutil',
+ libs=[ boost.lib, 'OgreMain', 'libavformat', 'libavcodec', 'libavutil',
'libavdevice','libswscale','liba52','libmingwex','libfaac','libfaad',
'libz','libxvidcore','libx264','libpthreadGC2','libwsock32','libvorbis','libmp3lame','libogg',
'libvorbisenc','libvorbisfile','libtheora','libgsm','libvfw32','libgcc' ]
else:
- libs=[ Config.LIB_Boost, 'OgreMain', 'avformat', 'avcodec', 'avutil', 'z', 'GL', 'GLU', 'Xxf86vm', 'Xext', 'X11' ]
+ libs=[ boost.lib, 'OgreMain', 'avformat', 'avcodec', 'avutil', 'z', 'GL', 'GLU', 'Xxf86vm', 'Xext', 'X11' ]
ModuleName="ogrevideoffmpeg"
class ogredshow:
@@ -1359,7 +1364,7 @@
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain','Strmiids' , 'ole32']
+ libs=[ boost.lib, 'OgreMain','Strmiids' , 'ole32']
ModuleName="ogredshow"
class et: ## editable terrain
@@ -1368,7 +1373,7 @@
version= "2.2"
name='et'
parent = "ogre/addons"
- libs=[ Config.LIB_Boost, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
lib_dirs = [ Config.PATH_LIB_Boost,
Config.PATH_LIB_Ogre_OgreMain
]
@@ -1388,7 +1393,7 @@
base = "bullet-" + version
baseDir = os.path.join(os.getcwd(), base)
parent = "ogre/physics"
- libs=[Config.LIB_Boost, 'LibBulletCollision', 'LibBulletDynamics']
+ libs=[boost.lib, 'LibBulletCollision', 'LibBulletDynamics']
if os.name == 'nt':
libs.append('libbulletmath')
lib_dirs = [ Config.PATH_LIB_Boost
@@ -1426,7 +1431,7 @@
version = "1.0"
cflags = ""
parent = "ogre/physics"
- libs = [Config.LIB_Boost, 'OgreMain',
+ libs = [boost.lib, 'OgreMain',
'LibBulletCollision', 'LibBulletDynamics'
]
if os.name == 'nt':
@@ -1455,7 +1460,7 @@
name='ogrebulletd'
cflags = ""
parent = "ogre/physics"
- libs = [Config.LIB_Boost, 'OgreMain',
+ libs = [boost.lib, 'OgreMain',
'LibBulletCollision', 'LibBulletDynamics'
]
if os.name == 'nt':
@@ -1493,7 +1498,7 @@
lib_dirs = [Config.PATH_LIB_Boost
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost]
+ libs=[ boost.lib]
ModuleName="noise"
class watermesh:
@@ -1511,7 +1516,7 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
ModuleName="watermesh"
class ofusion:
@@ -1529,7 +1534,7 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
ModuleName="ofusion"
class cadunetree:
@@ -1547,7 +1552,7 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
ModuleName="cadunetree"
class opensteer:
@@ -1565,7 +1570,7 @@
Config.PATH_LIB_opensteer
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'opensteer' ]
+ libs=[ boost.lib, 'opensteer' ]
ModuleName="opensteer"
class hydrax:
@@ -1587,7 +1592,7 @@
except:
pass
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain', 'hydrax' ]
+ libs=[ boost.lib, 'OgreMain', 'hydrax' ]
ModuleName="hydrax"
############################################################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-16 01:03:27
|
Revision: 650
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=650&view=rev
Author: mithro
Date: 2008-07-15 18:03:37 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Stable metric works when called from any directory.
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-16 00:59:00 UTC (rev 649)
+++ trunk/python-ogre/environment.py 2008-07-16 01:03:37 UTC (rev 650)
@@ -126,7 +126,7 @@
print "\n\n You DO need to create a PythonOgreConfig_%s.py file with config details" % ( _SystemType)
sys.exit(-1)
-_STABLE = os.path.exists("STABLE") # set to true if using specific versions of CVS and SVN checkouts..
+_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")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
