[Python-ogre-commit] SF.net SVN: python-ogre: [617] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre: [617] trunk/python-ogre
|
From: <and...@us...> - 2008-06-27 03:29:25
|
Revision: 617
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=617&view=rev
Author: andy_miller
Date: 2008-06-26 20:29:32 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
Changes/fixes for the Linux build
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2008-06-25 14:29:48 UTC (rev 616)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2008-06-27 03:29:32 UTC (rev 617)
@@ -16,11 +16,11 @@
LOCAL_INCLUDE = os.path.join(ROOT_DIR, 'usr/include')
## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
-PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost-1_34_1')
+PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost-1_35')
## Path to your boost_pythonxxxx lib file
PATH_LIB_Boost = LOCAL_LIB
## and the name of the boost python library
-LIB_Boost = 'libboost_python-gcc41-1_34_1'
+LIB_Boost = 'libboost_python-gcc42-mt-1_35'
# in Linux we need to code in the Relative path for the library
RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') #+ '\''
@@ -37,14 +37,14 @@
# # ## Parent directories of the libraries
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
-PATH_Ogre = os.path.join(BASE_DIR,'ogrenew')
+PATH_Ogre = os.path.join(BASE_DIR,'ogre')
PATH_OgreAddons = os.path.join(BASE_DIR, 'ogreaddons')
-PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0')
+PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.0' )
PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
if SDK:
- PATH_CEGUI = os.path.join(BASE_DIR, 'ogrenew','Dependencies')
- PATH_OIS = os.path.join(BASE_DIR, 'ogrenew','Dependencies')
+ PATH_CEGUI = os.path.join(BASE_DIR, 'ogre','Dependencies')
+ PATH_OIS = os.path.join(BASE_DIR, 'ogre','Dependencies')
PATH_Newton = os.path.join(BASE_DIR, 'newtonSDK','sdk')
PATH_ODE = os.path.join(BASE_DIR, 'ode-0.9')
@@ -107,7 +107,7 @@
PATH_LIB_OgreAL = os.path.join( LOCAL_LIB ) #PATH_OGREAL, 'lib/Release' )
PATH_LIB_betagui = PATH_betagui
PATH_LIB_quickgui = PATH_quickgui
-# PATH_LIB_NxOgre= os.path.join(LOCAL_LIB )
+PATH_LIB_NxOgre= os.path.join(LOCAL_LIB )
PATH_LIB_PhysX = os.path.join(LOCAL_LIB, 'PhysX','v2.7.3')
PATH_LIB_Bullet = os.path.join( LOCAL_LIB )
PATH_LIB_Theora= os.path.join(PATH_Theora, 'bin', 'Release')
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2008-06-25 14:29:48 UTC (rev 616)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2008-06-27 03:29:32 UTC (rev 617)
@@ -227,34 +227,19 @@
if func.virtuality == declarations.VIRTUALITY_TYPES.PURE_VIRTUAL:
continue
func.exclude()
- print '{*} function "%s" is marked as internal' % declarations.full_name( func )
+ print '{*} function "%s" is marked as internal' % declarations.full_name( func )
+ # this change was for 1.7 but also needed for 1.4
+ noncopy=['Camera','Frustum', 'Log']
+ for c in noncopy:
+ main_ns.class_(c).noncopyable = True
+
+
# changes for Ogre 1.7
if environment.ogre.version =="1.7":
# main_ns.class_("ResourceBackgroundQueue").exclude() # Ogre::ResourceBackgroundQueue::_fireBackgroundLoadingComplete isn't implemented
main_ns.class_("ResourceGroupManager").mem_fun("_notifyWorldGeometryPrepareStageEnded").exclude()
main_ns.class_("ResourceGroupManager").mem_fun("_notifyWorldGeometryPrepareStageStarted").exclude()
-# # # fix vistrenderables issues:
-# # # # for mf in main_ns.member_functions():
-# # # # if mf.name == 'visitRenderables':
-# # # # mf.exclude() ## can't do this as too much exclusion
-# # BillboardChain::visitRenderables
-# # Entity
-# # InstancedGeometry::GeometryBucket
-# # InstancedGeometry::BatchInstance
-# # Light
-# # MovablePlane
-# # SimpleRenderable
-# # BillboardSet
-# # Frustum
-# # ManualObject
-# # ParticleSystem
-# # StaticGeometry::Region
-
-
- noncopy=['Camera','Frustum', 'Log']
- for c in noncopy:
- main_ns.class_(c).noncopyable = True
for cls in main_ns.classes():
if cls.decl_string.startswith ("::Ogre::AllocatedObject") or\
cls.decl_string.startswith("::Ogre::STLAllocator") or\
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-06-25 14:29:48 UTC (rev 616)
+++ trunk/python-ogre/environment.py 2008-06-27 03:29:32 UTC (rev 617)
@@ -270,7 +270,7 @@
]
else:
source = [
- [svn, " co http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
+ [svn, " co -r1356 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
]
if isLinux() or isMac() :
buildCmds = [
@@ -289,17 +289,17 @@
pythonModule = False
active = True
if isLinux():
- base = 'Cg-2.0_Dec2007_x86'
+ base = 'Cg-2.0_May2008_x86'
source = [
- [wget, " http://developer.download.nvidia.com/cg/Cg_2.0/2.0.0010/"+base+".tar.gz",downloadPath]
+ [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) + ".tar.gz --overwrite", ROOT], # unpack it directly into 'our' root
+ [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.0010/Cg-2.0_Dec2007.dmg", downloadPath ]
+ [wget, "http://developer.download.nvidia.com/cg/Cg_2.0/2.0.0015/Cg-2.0_May2008.dmg", downloadPath ]
]
buildCmds = [
@@ -366,7 +366,7 @@
pythonModule = False
active = True
if isLinux() or isMac():
- base = 'cmake-2.4.6-Linux-i386'
+ base = 'cmake-2.4.8-Linux-i386'
if isMac():
base = 'cmake-2.4.7-Darwin-universal'
@@ -390,7 +390,7 @@
class scons:
pythonModule = False
active = True
- base = 'scons-0.98.0'
+ base = 'scons-0.98.5'
source = [
[wget, "http://downloads.sourceforge.net/scons/"+base+".tar.gz",downloadPath],
]
@@ -447,6 +447,7 @@
[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', '' ],
[0,"./configure --with-libraries=python --prefix=%s --without-icu" % PREFIX, os.path.join(os.getcwd(), base )],
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )],
@@ -482,7 +483,10 @@
class ogre:
active = True
pythonModule = True
- version = "1.7"
+ if _STABLE:
+ version="1.4"
+ else:
+ version = "1.7"
name='ogre'
ModuleName='OGRE'
cflags = ""
@@ -525,23 +529,24 @@
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 '
LINKFLAGS = ''
externalFiles=['OgreMain.dll', 'OgreGuiRender.dll', Config.LIB_Boost+'.dll']
- elif isLinux():
+ elif isLinux():
+ version = "1.4" #### UGLY OVERRIDE AT MOMENT...
libs=[Config.LIB_Boost, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
- base = "ogre-linux_osx-v1-4-6"
+ base = "ogre-v1-4-9"
source = [
- [wget, "http://prdownloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
+ [wget, "http://downloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
]
buildCmds = [
- [0, "env >1", ''],
+ # [0, "env >1", ''],
[0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
[0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()],
- [0, "aclocal", os.path.join(os.getcwd(), 'ogrenew')],
- [0, "./bootstrap", os.path.join(os.getcwd(), 'ogrenew')],
+ [0, "aclocal", os.path.join(os.getcwd(), 'ogre')],
+ [0, "./bootstrap", os.path.join(os.getcwd(), 'ogre')],
#[1, "import os\nos.environ['ZZIPLIB_LIBS']='-lzzip'", ''],
- [0, "./configure --prefix=%s --with-gui=Xt --disable-devil" % PREFIX, os.path.join(os.getcwd(), 'ogrenew')],
+ [0, "./configure --prefix=%s --with-gui=Xt --disable-devil" % PREFIX, os.path.join(os.getcwd(), 'ogre')],
#export ZZIPLIB_LIBS="-lzzip"
- [0, "make", os.path.join(os.getcwd(), 'ogrenew')],
- [0, "make install", os.path.join(os.getcwd(), 'ogrenew')],
+ [0, "make", os.path.join(os.getcwd(), 'ogre')],
+ [0, "make install", os.path.join(os.getcwd(), 'ogre')],
]
libs=[Config.LIB_Boost, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
@@ -553,7 +558,7 @@
CCFLAGS = '' ## -DBOOST_PYTHON_MAX_ARITY=19'
LINKFLAGS = ''
elif isMac():
- base = "ogre-linux_osx-v1-4-6"
+ base = "ogre-linux_osx-v1-4-9"
basedep = "OgreDependenciesOSX_20070929"
source = [
[wget, "http://prdownloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
@@ -561,18 +566,18 @@
]
buildCmds = [
[0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
- [0, unzip + os.path.join(downloadPath,basedep)+".zip ",os.path.join(os.getcwd(), 'ogrenew') ],
+ [0, unzip + os.path.join(downloadPath,basedep)+".zip ",os.path.join(os.getcwd(), 'ogre') ],
[0, "mkdir ~/Library/Frameworks", ''], ## Note that this will fail if the directory exists !!!
- [0,cp + " -R "+os.path.join(os.getcwd(), 'ogrenew', '__MACOSX','Dependencies')+'/*.framework ' + Config.FRAMEWORK_DIR,''],
+ [0,cp + " -R "+os.path.join(os.getcwd(), 'ogre', '__MACOSX','Dependencies')+'/*.framework ' + Config.FRAMEWORK_DIR,''],
[0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()],
- [0, "mkdir Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ],
+ [0, "mkdir Ogre",os.path.join(os.getcwd() ,'ogre','OgreMain', 'include') ],
# need copies of these in an 'Ogre/..' directory due to includes in the OSX directory -- or get the framework right
- [0, "cp OgreRoot.h Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ],
- [0, "cp OgreRenderSystem.h Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ],
- [0, "cp OgrePrerequisites.h Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ],
- [0, "xcodebuild -project ogrenew/Mac/Ogre/Ogre.xcodeproj -configuration Release", ''],
- [0, "xcodebuild -project ogrenew/Mac/Samples/Samples.xcodeproj -configuration Release", ''],
- [0, "cp -R *.framework " + Config.FRAMEWORK_DIR, os.path.join(os.getcwd() ,'ogrenew',"Mac", "build", "Release") ]
+ [0, "cp OgreRoot.h Ogre",os.path.join(os.getcwd() ,'ogre','OgreMain', 'include') ],
+ [0, "cp OgreRenderSystem.h Ogre",os.path.join(os.getcwd() ,'ogre','OgreMain', 'include') ],
+ [0, "cp OgrePrerequisites.h Ogre",os.path.join(os.getcwd() ,'ogre','OgreMain', 'include') ],
+ [0, "xcodebuild -project ogre/Mac/Ogre/Ogre.xcodeproj -configuration Release", ''],
+ [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=[Config.LIB_Boost]
@@ -599,23 +604,23 @@
if isMac():
source=[]
if isLinux():
- base = "ois-1.2"
- source=[
- [wget, "http://prdownloads.sourceforge.net/wgois/ois-1.2.tar.gz", downloadPath]
+ base = "ois"
+ source=[
+ [wget, "http://downloads.sourceforge.net/wgois/ois_1.2.0.tar.gz", downloadPath]
]
- buildCmds = [
- [0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",os.getcwd() ],
- [0, "rm -rf autom4te.cache", os.path.join(os.getcwd(), base )],
- [0, "libtoolize --force && aclocal $ACLOCAL_FLAGS && autoheader &&\
- automake --include-deps --add-missing --foreign && autoconf",
- os.path.join(os.getcwd(), base )],
- [0,"./configure --prefix=%s --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 )]
- ]
+# buildCmds = [
+# [0, tar + " zxf " + os.path.join(downloadPath,'ois_1.2.0')+".tar.gz --overwrite",os.getcwd() ],
+# [0, "rm -rf autom4te.cache", os.path.join(os.getcwd(), base )],
+# [0, "libtoolize --force && aclocal $ACLOCAL_FLAGS && autoheader &&\
+# automake --include-deps --add-missing --foreign && autoconf",
+# os.path.join(os.getcwd(), base )],
+# [0,"./configure --prefix=%s --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 )]
+# ]
buildCmds = [
- [0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",os.getcwd() ],
+ [0, tar + " zxf " + os.path.join(downloadPath,'ois_1.2.0')+".tar.gz --overwrite",os.getcwd() ],
[0, "./bootstrap" ,os.path.join(os.getcwd(), base )],
[0,"./configure --prefix=%s --includedir=%s/include" %(PREFIX,PREFIX) ,os.path.join(os.getcwd(), base )],
[0,'make', os.path.join(os.getcwd(), base )],
@@ -757,16 +762,16 @@
if _STABLE:
base = "CEGUI-0.5.0"
source=[
- [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.5.0b.tar.gz", downloadPath]
+ [wget, "http://downloads.sourceforge.net/crayzedsgui/CEGUI-0.5.0b.tar.gz", downloadPath]
]
else:
base = "CEGUI-0.6.0"
source=[
- [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.0.tar.gz", downloadPath]
+ [wget, "http://downloads.sourceforge.net/crayzedsgui/CEGUI-0.6.0.tar.gz", downloadPath]
]
buildCmds = [
- [0, tar + " zxf " + os.path.join(downloadPath,base)+"b.tar.gz --overwrite",os.getcwd() ],
+ [0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",os.getcwd() ],
[0, "patch -s -N -i ../python-ogre/patch/cegui.patch -p0", os.path.join(os.getcwd(),base)],
[0, "echo 'EMPTY' >>./INSTALL", os.path.join(os.getcwd(),base)],
[0, "echo 'EMPTY' >>./NEWS", os.path.join(os.getcwd(),base)],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
