[Python-ogre-commit] SF.net SVN: python-ogre: [592] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre: [592] trunk/python-ogre
|
From: <and...@us...> - 2008-05-23 01:30:07
|
Revision: 592
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=592&view=rev
Author: andy_miller
Date: 2008-05-22 18:30:05 -0700 (Thu, 22 May 2008)
Log Message:
-----------
STABLE flag added to help with variour builds. Fixes for Nvidia Physx version
Clean up directories
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/code_generators/cegui/generate_code.py
trunk/python-ogre/code_generators/physx/generate_code.py
trunk/python-ogre/code_generators/physx/hand_made_wrappers.py
trunk/python-ogre/code_generators/physx/python_physx.h
trunk/python-ogre/environment.py
Removed Paths:
-------------
trunk/python-ogre/packages_2.4/
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-05-22 04:50:44 UTC (rev 591)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-05-23 01:30:05 UTC (rev 592)
@@ -13,16 +13,17 @@
## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
-PATH_Boost = os.path.join(BASE_DIR, 'boost_1_34_1')
+# # # # # # PATH_Boost = os.path.join(BASE_DIR, 'boost_1_34_1')
# PATH_Boost = os.path.join(BASE_DIR, 'boost_1_35_0')
PATH_Boost = os.path.join(BASE_DIR, 'boost-trunk')
## Path to your boost_pythonxxxx lib file
-PATH_LIB_Boost = os.path.join(BASE_DIR, PATH_Boost,'bin.v2/libs/python/build/msvc-8.0/release/threading-multi')
-##PATH_LIB_Boost = os.path.join(BASE_DIR, 'boost/bin.v2/libs/python2.5/build/msvc-9.0express/release/threading-multi')
+# PATH_LIB_Boost = os.path.join(BASE_DIR, PATH_Boost,'bin.v2/libs/python/build/msvc-8.0/release/threading-multi')
+# # # # # # # PATH_LIB_Boost = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc/release/threading-multi')
+PATH_LIB_Boost = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0express/release/threading-multi')
## and the name of the boost python library
LIB_Boost = r'boost_python-vc90-mt-1_35'
-LIB_Boost = r'boost_python-vc80-mt-1_34_1'
+# # LIB_Boost = r'boost_python-vc80-mt-1_34_1'
# LIB_Boost = r'boost_python-vc-mt-1_35'
# in Linux we need to code in the Relative path for the library
@@ -35,9 +36,11 @@
## 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' ) ##'ois-1.0RC1')
PATH_Newton = os.path.join(BASE_DIR, 'newtonsdk','sdk')
PATH_FMOD = os.path.join(BASE_DIR, 'fmod')
@@ -69,7 +72,7 @@
PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')
PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.66')
-PATH_PhysX= "c:/program files/AGEIA Technologies/SDK/v2.7.3/SDKs"
+PATH_PhysX= "c:/program files/NVIDIA Corporation/NVIDIA Physx SDK/v2.8.1/SDKs"
PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
PATH_ffmpeg= os.path.join(PATH_THIRDPARTY,'extra')
PATH_navi = os.path.join(BASE_DIR, 'navi', 'navi')
@@ -78,8 +81,8 @@
# it's time for the SDK version
if SDK:
- PATH_CEGUI = os.path.join(BASE_DIR, 'Ogrenew')
- PATH_OIS = os.path.join(BASE_DIR, 'Ogrenew')
+ PATH_CEGUI = os.path.join(BASE_DIR, 'ogre')
+ PATH_OIS = os.path.join(BASE_DIR, 'ogre')
###
### these paths assume you've left all the directory structure as standard
@@ -175,7 +178,7 @@
,os.path.join(PATH_PhysX, 'Foundation','include')
,os.path.join(PATH_PhysX, 'PhysXLoader','include')
,os.path.join(PATH_PhysX, 'NxCharacter','include')
- ,os.path.join(PATH_PhysX, 'NxExtensions','include')
+# # ,os.path.join(PATH_PhysX, 'NxExtensions','include')
]
PATH_INCLUDE_opensteer = os.path.join(PATH_opensteer, 'include')
PATH_INCLUDE_opensteer_opensteer = os.path.join(PATH_opensteer, 'include', 'OpenSteer')
Modified: trunk/python-ogre/code_generators/cegui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/generate_code.py 2008-05-22 04:50:44 UTC (rev 591)
+++ trunk/python-ogre/code_generators/cegui/generate_code.py 2008-05-23 01:30:05 UTC (rev 592)
@@ -38,9 +38,9 @@
CEGUI_ns = global_ns.namespace( 'CEGUI' )
CEGUI_ns.include()
- ## not available at link time..
- CEGUI_ns.free_function("lbi_greater").exclude()
- CEGUI_ns.free_function("lbi_less").exclude()
+ ## not available at link time.. seems fixed in CEGUI 0.6.0
+# CEGUI_ns.free_function("lbi_greater").exclude()
+# CEGUI_ns.free_function("lbi_less").exclude()
## Dumb fix to remove all Properties classes - unfortunately the properties in these classes are indicated as public
## however within their 'parent' class they are defined as private..
@@ -97,17 +97,17 @@
# fm.member_function( name='createFont', function=is_my_case ).exclude()
#
## couple of functions that fail when compiling
-
- if environment.ogre.version == "1.4":
- CEGUI_ns.class_( "RawDataContainer" ).member_functions( 'getDataPtr' ).exclude()
- CEGUI_ns.class_( "ItemListBase" ).member_functions( 'getSortCallback' ).exclude()
- else:
- CEGUI_ns.class_("DataContainer<unsigned char>").exclude()
- CEGUI_ns.class_("Menubar").exclude()
- CEGUI_ns.class_("MenuBase").exclude()
- CEGUI_ns.class_("PopupMenu").exclude()
- CEGUI_ns.class_("Referenced").exclude()
- CEGUI_ns.class_("System").member_functions("getXMLParser").exclude()
+ ## Not sure why this is related to Ogre 1.4 and not the CEGUI version...
+# if environment.ogre.version == "1.4":
+# CEGUI_ns.class_( "RawDataContainer" ).member_functions( 'getDataPtr' ).exclude()
+# CEGUI_ns.class_( "ItemListBase" ).member_functions( 'getSortCallback' ).exclude()
+# else:
+# CEGUI_ns.class_("DataContainer<unsigned char>").exclude()
+# CEGUI_ns.class_("Menubar").exclude()
+# CEGUI_ns.class_("MenuBase").exclude()
+# CEGUI_ns.class_("PopupMenu").exclude()
+# CEGUI_ns.class_("Referenced").exclude()
+# CEGUI_ns.class_("System").member_functions("getXMLParser").exclude()
## now have functions in String that return uint arrays a need to be wrapped
sc = CEGUI_ns.class_( "String" )
Modified: trunk/python-ogre/code_generators/physx/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/physx/generate_code.py 2008-05-22 04:50:44 UTC (rev 591)
+++ trunk/python-ogre/code_generators/physx/generate_code.py 2008-05-23 01:30:05 UTC (rev 592)
@@ -65,10 +65,10 @@
# ,'::NxCloth::overlapAABBTriangles' # ugly argument that boost doesn't like.. To Fix in hand wrappers
# these have const refs to classes with protected desctuctors - a bad combination for boost
,'::NxCookingInterface::NxCreatePMap'
- ,'::NxForceField::releaseShape'
+# # ,'::NxForceField::releaseShape'
,'::NxUtilLib::NxGetBoxEdgesAxes'
# ,'::NxHeightFieldShape::overlapAABBTrianglesDeprecated'
- ,'::NxImplicitScreenMesh::getProjectionMatrix' # returns a const int pointer
+# # ,'::NxImplicitScreenMesh::getProjectionMatrix' # returns a const int pointer
,'::NxVec3::get'
# not in source
,'::NxBitField::rangeToDenseMask'
@@ -334,7 +334,7 @@
, environment.physx.cache_file )
if os.name == 'nt':
- defined_symbols = ['NXPHYSICS_EXPORTS', 'WIN32', 'PHYSX_EXPORTS']
+ defined_symbols = ['NXPHYSICS_EXPORTS', 'WIN32', 'PHYSX_EXPORTS'] #'WIN32',
else:
defined_symbols = ['LINUX']
defined_symbols.append( 'VERSION_' + environment.physx.version )
@@ -348,7 +348,7 @@
, include_paths=environment.physx.include_dirs
, define_symbols=defined_symbols
, indexing_suite_version=2
- , cflags=environment.ogre.cflags
+ , cflags=environment.physx.cflags
)
# NOTE THE CHANGE HERE
mb.constructors().allow_implicit_conversion = False
Modified: trunk/python-ogre/code_generators/physx/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/physx/hand_made_wrappers.py 2008-05-22 04:50:44 UTC (rev 591)
+++ trunk/python-ogre/code_generators/physx/hand_made_wrappers.py 2008-05-23 01:30:05 UTC (rev 592)
@@ -180,7 +180,7 @@
rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxForceField)
# rt = mb.class_( 'NxHeightFieldShape' )
# rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxHeightFieldShape)
- rt = mb.class_( 'NxImplicitScreenMesh' )
- rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxImplicitScreenMesh)
+# rt = mb.class_( 'NxImplicitScreenMesh' )
+# rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxImplicitScreenMesh)
\ No newline at end of file
Modified: trunk/python-ogre/code_generators/physx/python_physx.h
===================================================================
--- trunk/python-ogre/code_generators/physx/python_physx.h 2008-05-22 04:50:44 UTC (rev 591)
+++ trunk/python-ogre/code_generators/physx/python_physx.h 2008-05-23 01:30:05 UTC (rev 592)
@@ -3,7 +3,7 @@
#include "NxCooking.h"
#include "NxFoundation.h"
#include "NxCharacter.h"
-#include "NxExtensions.h"
+// #include "NxExtensions.h"
#include "PhysXLoader.h"
#include "NxStream.h" // not included by default
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-05-22 04:50:44 UTC (rev 591)
+++ trunk/python-ogre/environment.py 2008-05-23 01:30:05 UTC (rev 592)
@@ -17,7 +17,9 @@
_LOGGING_ON = False
_PreCompiled = True
+_STABLE = False # set to true if using specific versions of CVS and SVN checkouts..
+
##
## set this to True if you compiled Ogre with Threads enabled
##
@@ -45,7 +47,7 @@
PythonOgreMajorVersion = "1"
PythonOgreMinorVersion = "2"
-PythonOgrePatchVersion = "rc1"
+PythonOgrePatchVersion = "rc2"
##
@@ -179,7 +181,12 @@
pythonModule = False
active = True
base = 'gccxml'
- source = [
+ if _STABLE:
+ source = [
+ [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D 22052008 "+base, os.getcwd()]
+ ]
+ else:
+ source = [
[cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co "+base, os.getcwd()]
]
if isLinux() or isMac():
@@ -246,28 +253,28 @@
pythonModule = False
active = True
base = 'pygccxml'
- if isLinux() or isMac() :
+ if _STABLE:
source = [
- [svn, " co -r 1234 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
+ [svn, " co -r 1300 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
]
+ else:
source = [
[svn, " co http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
- ]
-
+ ]
+ 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, "pyplusplus_dev") ]
]
if isWindows():
- source = [
- [svn, " co http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
- ]
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, "pyplusplus_dev") ]
]
class cg:
+ ## we don't need this for Windows as it's part of the Ogre dependencies package
+
pythonModule = False
active = True
if isLinux():
@@ -395,13 +402,14 @@
version = "3.4"
pythonModule = False
ModuleName = ""
- base = 'boost_1_35_0' #this doesn't work yet AJM 17/04/08
- base = 'boost_1_34_1'
+ if _STABLE:
+ base = 'boost_1_34_1'
+ else:
+ # this doesn't work yet AJM 17/04/08 (in an automated fashion)
+ # as boost/python/detail/preprocessor.hpp and possibly boost/python/docstring_options.hpp
+ # need to have "#define BOOST_PYTHON_NO_PY_SIGNATURES" added to them
+ base = 'boost_1_35_0'
- myLibraryPaths = [ 'boost/bin.v2/libs/python2.5/build/msvc-8.0/release/threading-multi' ]
- myLibraries = [ 'boost_python-vc80-mt-1_35']
-
-
if isLinux() or isMac():
bjambase = 'boost-jam-3.1.16'
if isMac():
@@ -413,7 +421,7 @@
source = [
[wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.16.tgz', downloadPath],
- [wget,'http://downloads.sourceforge.net/boost/boost_1_34_1.tar.gz',downloadPath]
+ [wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
]
buildCmds = [
## first handle bjam
@@ -426,8 +434,8 @@
[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/' boost_1_35_0/configure", '' ],
- [0, sed_ + " s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ boost_1_35_0/boost/python/detail/preprocessor.hpp", ''],
+ [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,"./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 )],
@@ -461,7 +469,7 @@
class ogre:
active = True
pythonModule = True
- version = "1.4"
+ version = "1.5"
name='ogre'
ModuleName='OGRE'
cflags = ""
@@ -472,10 +480,6 @@
myLibraries = ['OgreMain']
libraries = myLibraries
-# for mod in dependsOn:
-# libraries += mod.libraries
-#
-
if isWindows():
source = [
@@ -680,9 +684,14 @@
libs = ['Newton', Config.LIB_Boost, 'OgreNewt_Main', 'OgreMain']
else:
libs = ['Newton', Config.LIB_Boost, 'OgreNewt', 'OgreMain']
- source = [
- [cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -P "+base, os.getcwd()]
+ if _STABLE:
+ source = [
+ [cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()]
]
+ else:
+ source = [
+ [cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -P "+base, os.getcwd()]
+ ]
baseDir = os.path.join(os.getcwd(), base )
buildCmds = [
[0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir],
@@ -711,9 +720,12 @@
class cegui:
active = True
pythonModule = True
- version = "0.5.0b"
parent = "ogre/gui"
name = 'cegui'
+ if _STABLE:
+ version = "0.5.0b"
+ else:
+ version = "0.6.0"
if isWindows():
if _PreCompiled:
pchstop = 'cegui.h'
@@ -724,10 +736,17 @@
libs=[Config.LIB_Boost, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
if isLinux():
- base = "CEGUI-0.5.0"
- source=[
- [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.5.0b.tar.gz", downloadPath]
- ]
+ if _STABLE:
+ base = "CEGUI-0.5.0"
+ source=[
+ [wget, "http://prdownloads.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]
+ ]
+
buildCmds = [
[0, tar + " zxf " + os.path.join(downloadPath,base)+"b.tar.gz --overwrite",os.getcwd() ],
[0, "patch -s -N -i ../python-ogre/patch/cegui.patch -p0", os.path.join(os.getcwd(),base)],
@@ -739,7 +758,11 @@
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )]
]
-
+ if isWindows():
+ source=[
+ [wget, "http://sourceforge.net/project/downloading.php?groupname=crayzedsgui&filename=CEGUI-0.6.0.zip", downloadPath]
+ ]
+
include_dirs = [Config.PATH_Boost
,Config.PATH_INCLUDE_CEGUI
,Config.PATH_CEGUI
@@ -849,9 +872,14 @@
, Config.PATH_INCLUDE_OgreOdeLoader
, Config.PATH_INCLUDE_Ogre
]
- source = [
- [cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -P "+base, os.getcwd()]
- ]
+ if _STABLE:
+ source = [
+ [cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()]
+ ]
+ else:
+ source = [
+ [cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -P "+base, os.getcwd()]
+ ]
baseDir = os.path.join(os.getcwd(), base )
buildCmds = [
[0, "patch -s -N -i ../../python-ogre/patch/ogreode.patch -p0", baseDir],
@@ -1013,7 +1041,7 @@
CheckIncludes=[]
# libs=[ Config.LIB_Boost, 'NxOgre','NxCharacter', 'NxCooking', 'NxExtensions', 'PhysXLoader','OgreMain' ]
if os.name =='nt':
- libs=[ Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'NxExtensions', 'PhysXLoader','OgreMain' , 'NxOgreStatic']
+ libs=[ Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'PhysXLoader','OgreMain' , 'NxOgreStatic'] #'NxExtensions',
else:
libs=[ Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain' ]
ModuleName="NxOgre"
@@ -1068,7 +1096,7 @@
class physx:
active = True
pythonModule = True
- version="2.7.3"
+ version="2.8.1"
name='physx'
parent="ogre/physics"
cflags=""
@@ -1079,6 +1107,7 @@
include_dirs.append( d )
if os.name == 'nt':
CCFLAGS = ' -D"WIN32" '
+ CCFLAGS = ' ' ## try to not define WIN 32 to remove inline assembly code that GCCxml doesn't like
else:
CCFLAGS = ' -D"LINUX" '
lib_dirs = [Config.PATH_LIB_Boost,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
