[Python-ogre-commit] SF.net SVN: python-ogre: [402] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2007-09-30 01:40:45
|
Revision: 402 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=402&view=rev Author: andy_miller Date: 2007-09-29 18:40:48 -0700 (Sat, 29 Sep 2007) Log Message: ----------- more Linux fixes -- ogreal now compiles/builds Modified Paths: -------------- trunk/python-ogre/SConstruct trunk/python-ogre/code_generators/common_utils/extract_documentation.py trunk/python-ogre/code_generators/ode/customization_data.py trunk/python-ogre/code_generators/ogreal/generate_code.py trunk/python-ogre/environment.py trunk/python-ogre/scripts/00-PreReqs.sh trunk/python-ogre/scripts/01-RetrieveSource.sh trunk/python-ogre/scripts/02-ExtractAndPatch.sh trunk/python-ogre/scripts/04-BuildAdditionalLibs.sh trunk/python-ogre/scripts/06-GenerateCode.sh trunk/python-ogre/scripts/07-BuildModules.sh trunk/python-ogre/scripts/master.sh Modified: trunk/python-ogre/SConstruct =================================================================== --- trunk/python-ogre/SConstruct 2007-09-30 00:45:10 UTC (rev 401) +++ trunk/python-ogre/SConstruct 2007-09-30 01:40:48 UTC (rev 402) @@ -155,10 +155,13 @@ ## ugly hack - scons returns a list of targets from SharedLibrary - we have to choose the one we want index = 0 # this is the index into a list of targets - '0' should be the platform default - - ## and lets have it install the output into the 'package_dir_name/ModuleName' dir and rename to the PydName - _env.AddPostAction(package,\ - 'mt.exe -nologo -manifest %(name)s.manifest -outputresource:%(name)s;2' % { 'name':package[index] } ) + if os.name=="nt": + ## and lets have it install the output into the 'package_dir_name/ModuleName' dir and rename to the PydName + _env.AddPostAction(package,\ + 'mt.exe -nologo -manifest %(name)s.manifest -outputresource:%(name)s;2' % { 'name':package[index] } ) + else: + _env.AddPostAction(package,\ + 'strip -g -S -d --strip-debug -s %(name)s' % { 'name':package[index] } ) _env.InstallAs(os.path.join(environment.package_dir_name, cls.parent, cls.ModuleName, cls.PydName), Modified: trunk/python-ogre/code_generators/common_utils/extract_documentation.py =================================================================== --- trunk/python-ogre/code_generators/common_utils/extract_documentation.py 2007-09-30 00:45:10 UTC (rev 401) +++ trunk/python-ogre/code_generators/common_utils/extract_documentation.py 2007-09-30 01:40:48 UTC (rev 402) @@ -245,4 +245,4 @@ print doc_extractor("")(x_decl("myfunc(int x, int y)","c:/development/ocvs/ogrenew/ogremain/include/OgreSceneManager.h",218)) print doc_extractor("")(x_decl("","c:/development/ocvs/ogrenew/ogremain/include/OgreSceneManager.h",223)) - print doc_extractor("")(x_decl("","c:/development/CEGUI-0.5.0/include/CEGUIEvent.h",139)) \ No newline at end of file + print doc_extractor("")(x_decl("","c:/development/CEGUI-0.5.0/include/CEGUIEvent.h",139)) Modified: trunk/python-ogre/code_generators/ode/customization_data.py =================================================================== --- trunk/python-ogre/code_generators/ode/customization_data.py 2007-09-30 00:45:10 UTC (rev 401) +++ trunk/python-ogre/code_generators/ode/customization_data.py 2007-09-30 01:40:48 UTC (rev 402) @@ -2,7 +2,7 @@ return [ 'ode/ode.h', 'ode/odecpp.h', 'ode/odecpp_collision.h', - 'Opcode.h', + ##'Opcode.h', 'return_pointee_value.hpp' ] Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogreal/generate_code.py 2007-09-30 00:45:10 UTC (rev 401) +++ trunk/python-ogre/code_generators/ogreal/generate_code.py 2007-09-30 01:40:48 UTC (rev 402) @@ -223,7 +223,7 @@ # ########################################################################################## extractor = exdoc.doc_extractor("") - mb.build_code_creator (module_name='_ogreal_' , doc_extractor= extractor) + mb.build_code_creator (module_name='_ogreal_' ) #, doc_extractor= extractor) for inc in environment.ogreal.include_dirs: mb.code_creator.user_defined_directories.append(inc ) Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2007-09-30 00:45:10 UTC (rev 401) +++ trunk/python-ogre/environment.py 2007-09-30 01:40:48 UTC (rev 402) @@ -545,12 +545,19 @@ ] if os.name =='nt': - CCFLAGS = ' -DOgreAL_Export="" -DWIN32 -DNDEBUG -D_LIB -D_WIN32 -D_WINDOWS -DVORBIS_IEEE_FLOAT32 -D_USE_NON_INTEL_COMPILER ' - libs=[Config.LIB_Boost, 'OgreMain', - 'ogg_static', - 'alut', - 'vorbis_static','vorbisfile_static','vorbisenc_static', - 'OpenAL32', 'EFX-Util'] ## 'OgreAL' -- going to compile OgreAL ourselves + CCFLAGS = ' -DOgreAL_Export="" -DWIN32 -DNDEBUG -D_LIB -D_WIN32 -D_WINDOWS -DVORBIS_IEEE_FLOAT32 -D_USE_NON_INTEL_COMPILER ' + if os.name=="nt": + libs=[Config.LIB_Boost, 'OgreMain', + 'ogg_static', + 'alut', + 'vorbis_static','vorbisfile_static','vorbisenc_static', + 'OpenAL32', 'EFX-Util'] ## 'OgreAL' -- going to compile OgreAL ourselves + else: + libs=[Config.LIB_Boost, 'OgreMain', + 'ogg', + 'alut', + 'vorbis','vorbisfile','vorbisenc', + 'openal' ] ## 'OgreAL' -- going to compile OgreAL ourselves ModuleName = 'OgreAL' CheckIncludes = ['OgreAL.h'] active=True Modified: trunk/python-ogre/scripts/00-PreReqs.sh =================================================================== --- trunk/python-ogre/scripts/00-PreReqs.sh 2007-09-30 00:45:10 UTC (rev 401) +++ trunk/python-ogre/scripts/00-PreReqs.sh 2007-09-30 01:40:48 UTC (rev 402) @@ -3,4 +3,4 @@ sudo apt-get install g++ libfreetype6-dev libpcre3-dev autoconf automake1.9 libgl1-mesa-dev libx11-dev \ libglut3-dev libtool libxaw7-dev libxxf86vm-dev \ libxrandr-dev cvs subversion libxt-dev libexpat1-dev python python-dev \ -python-celementtree libglew-dev libzzip-dev scons +python-celementtree libglew-dev libzzip-dev Modified: trunk/python-ogre/scripts/01-RetrieveSource.sh =================================================================== --- trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-09-30 00:45:10 UTC (rev 401) +++ trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-09-30 01:40:48 UTC (rev 402) @@ -24,19 +24,15 @@ $WGET http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz $WGET http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz $WGET http://www.openal.org/openal_webstf/downloads/freealut-1.1.0.tar.gz +$WGET http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz +$WGET http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz ##$WGET http://devfiles.ageia.com/Physx_2.7.2_SDK_CoreLinux_deb.tar.gz popd cd $INSTALL_DIR -echo " -- getting OgreAL" -# svn co https://ogreal.svn.sourceforge.net/svnroot/ogreal/trunk/OgreAL-Eihort OgreAL -echo " -- getting NxOgre" -svn co http://latest.nxogre.org/nxogre3/ NxOgre echo " -- getting pygccxml" svn co https://pygccxml.svn.sourceforge.net/svnroot/pygccxml pygccxml echo " -- getting python-ogre" svn co https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre python-ogre -echo " -- getting quickgui" -# svn co --username anyone --password nopassword svn://www.stellarcommand.com/QuickGUI/trunk/src/ quickgui echo " -- getting gccxml" cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML co gccxml echo " -- getting ogreode" @@ -45,7 +41,10 @@ cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogrenewt echo " -- getting videoplugins" cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/videoplugin - +echo " -- getting ogrebullet" +cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogrebullet +echo " -- getting NxOgre" +svn co http://latest.nxogre.org/nxogre3/ NxOgre echo "" echo "======= Sources Retrieved =======" echo "" Modified: trunk/python-ogre/scripts/02-ExtractAndPatch.sh =================================================================== --- trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-09-30 00:45:10 UTC (rev 401) +++ trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-09-30 01:40:48 UTC (rev 402) @@ -21,6 +21,11 @@ unzip -q -o $DOWNLOADS/ode-src-0.8.zip echo " -- Unpacking bullet" tar zxf $DOWNLOADS/bullet-2.62a.tgz +echo " -- Unpacking OgreAL Support" +tar zxf $DOWNLOADS/libogg-1.1.3.tar.gz +tar zxf $DOWNLOADS/libvorbis-1.2.0.tar.gz +tar zxf $DOWNLOADS/freealut-1.1.0.tar.gz +tar zxf $DOWNLOADS/openal-0.0.8.tar.gz echo " -- Unpacking CG" pushd $ROOT Modified: trunk/python-ogre/scripts/04-BuildAdditionalLibs.sh =================================================================== --- trunk/python-ogre/scripts/04-BuildAdditionalLibs.sh 2007-09-30 00:45:10 UTC (rev 401) +++ trunk/python-ogre/scripts/04-BuildAdditionalLibs.sh 2007-09-30 01:40:48 UTC (rev 402) @@ -28,3 +28,40 @@ # # OgreAl # +echo " -- Building OgreAL - libogg" +pushd libogg-1.1.3 +./configure --prefix=$PREFIX +make +make install +popd + +echo " -- Building OgreAL - libvorbis" +pushd libvorbis-1.2.0 +./configure --prefix=$PREFIX +make +make install +popd + +echo " -- Building OgreAL - openal" +pushd openal-0.0.8 +./autogen.sh +./configure --prefix=$PREFIX +make +make install +popd + +echo " -- Building OgreAL - freealut" +pushd freealut-1.1.0 +./autogen.sh +./configure --prefix=$PREFIX +## ugly hack as the make files in freealut don't really handle a non standard prefix +cp $PREFIX/include/AL/* ./include/AL +make +make install +popd + +# +# Bullet +# +##pushd bullet-2.62a + Modified: trunk/python-ogre/scripts/06-GenerateCode.sh =================================================================== --- trunk/python-ogre/scripts/06-GenerateCode.sh 2007-09-30 00:45:10 UTC (rev 401) +++ trunk/python-ogre/scripts/06-GenerateCode.sh 2007-09-30 01:40:48 UTC (rev 402) @@ -48,11 +48,6 @@ cd ogreode python generate_code.py > build.out cd .. -echo ' -- creating OpCode code' -echo ' -- creating OpCode code'>> $INSTALL_DIR/log.out -cd opcode -python generate_code.py > build.out -cd .. echo ' -- creating PLIB code' echo ' -- creating PLIB code'>> $INSTALL_DIR/log.out cd plib @@ -68,10 +63,10 @@ cd ogrenewt python generate_code.py > build.out cd .. -#echo ' -- creating ode code' -#cd ode -#python generate_code.py > build.out - +echo ' -- creating ode code' +cd ode +python generate_code.py > build.out +cd .. fi cd $INSTALL_DIR echo Modified: trunk/python-ogre/scripts/07-BuildModules.sh =================================================================== --- trunk/python-ogre/scripts/07-BuildModules.sh 2007-09-30 00:45:10 UTC (rev 401) +++ trunk/python-ogre/scripts/07-BuildModules.sh 2007-09-30 01:40:48 UTC (rev 402) @@ -12,10 +12,10 @@ then scons PROJECTS=$1 else - scons PROJECTS=ogre,ois,quickgui,cegui,plib,ogreode,ogrenewt + scons PROJECTS=ogre,ois,quickgui,cegui,plib,ogreode,ogrenewt,ogreal fi -#ogre,ois,quickgui,cegui,plib,ogreode -#,ogrerefapp +#opcode -- not really suited to a linux build -- lots of work needed ? +# python setup.py install --prefix=$PREFIX cd .. Modified: trunk/python-ogre/scripts/master.sh =================================================================== --- trunk/python-ogre/scripts/master.sh 2007-09-30 00:45:10 UTC (rev 401) +++ trunk/python-ogre/scripts/master.sh 2007-09-30 01:40:48 UTC (rev 402) @@ -1,12 +1,12 @@ #!/bin/bash # Part of the Python-Ogre installation # Run them all :) -#source ./00-PreReqs.sh -#source ./01-RetrieveSource.sh -#source ./02-ExtractAndPatch.sh -#source ./03-BuildBaseLibs.sh -#source ./05-BuildTools.sh -#source ./04-BuildAdditionalLibs.sh +source ./00-PreReqs.sh +source ./01-RetrieveSource.sh +source ./02-ExtractAndPatch.sh +source ./05-BuildTools.sh +source ./03-BuildBaseLibs.sh +source ./04-BuildAdditionalLibs.sh source ./06-GenerateCode.sh source ./07-BuildModules.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |