[Python-ogre-commit] SF.net SVN: python-ogre: [412] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre: [412] trunk/python-ogre
|
From: <and...@us...> - 2007-10-06 11:17:27
|
Revision: 412
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=412&view=rev
Author: andy_miller
Date: 2007-10-06 04:17:27 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
Linux Updates
Modified Paths:
--------------
trunk/python-ogre/SConstruct
trunk/python-ogre/code_generators/common_utils/extract_documentation.py
trunk/python-ogre/demos/caelum/Demo_Caelum01.py
trunk/python-ogre/demos/caelum/plugins.cfg
trunk/python-ogre/demos/et/plugins.cfg
trunk/python-ogre/demos/ogre/plugins.cfg
trunk/python-ogre/demos/qgui/plugins.cfg
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/03-BuildBaseLibs.sh
trunk/python-ogre/scripts/05-BuildTools.sh
trunk/python-ogre/scripts/06-GenerateCode.sh
trunk/python-ogre/scripts/07-BuildModules.sh
trunk/python-ogre/scripts/config.sh
trunk/python-ogre/scripts/master.sh
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/SConstruct 2007-10-06 11:17:27 UTC (rev 412)
@@ -47,7 +47,7 @@
Return ('_%(name)s')\n
""" % { 'name':cls._name, 'targettype':targettype } )
-def get_ccflags():
+def get_ccflags(cls):
if os.name=='nt':
CCFLAGS=''
#CCFLAGS += '-DBOOST_PYTHON_MAX_ARITY=19'
@@ -58,10 +58,14 @@
CCFLAGS += ' /Ox /Ob2 /Oi /Ot /Oy /GS- /GR '
elif os.name =='posix':
if os.sys.platform <> 'darwin':
- CCFLAGS = ' `pkg-config --cflags OGRE` '
+ CCFLAGS = ' `pkg-config --cflags OGRE` ' ## needs to change I think :)
CCFLAGS += ' -I'
- CCFLAGS += ' -O3 -I./ -fvisibility=hidden -finline-limit=20 '
- CCFLAGS += ' -DOGRE_GCC_VISIBILITY ' # -fvisibility-inlines-hidden
+ CCFLAGS += ' -O3 -I./ '
+ if cls.ModuleName == 'OGRE':
+ ##### -fvisibility=hidden -finline-limit=20 '
+ #CCFLAGS += ' -fvisibility=hidden -fvisibility-inlines-hidden -DOGRE_GCC_VISIBILITY '
+ CCFLAGS += ' '
+
else:
CCFLAGS = ' -I -pipe -Os -I./'
return CCFLAGS
@@ -134,7 +138,7 @@
## setup compile paths and flags (standard and additional)
_env.Append ( CPPPATH = cls.include_dirs + [environment.python_include_dirs, environment.Config.PATH_Boost] )
- ccflags= get_ccflags()
+ ccflags= get_ccflags(cls)
if hasattr( cls, 'CCFLAGS'):
ccflags += cls.CCFLAGS
_env.Append ( CCFLAGS=ccflags )
@@ -157,14 +161,14 @@
## 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
- if os.name=="nt"
+ 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:
+ else:
_env.AddPostAction(package,\
- '-strip --debug %(name)s' % { 'name':package[index] } )
-
+ '-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),
package[index] )
Modified: trunk/python-ogre/code_generators/common_utils/extract_documentation.py
===================================================================
--- trunk/python-ogre/code_generators/common_utils/extract_documentation.py 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/code_generators/common_utils/extract_documentation.py 2007-10-06 11:17:27 UTC (rev 412)
@@ -97,7 +97,7 @@
ret =""
if doc_lines:
doc_lines = remove_leading_blanks ( doc_lines )
- #print "Extracted Doc String for:", declaration, "[", len(doc_lines),"]"
+# print "Extracted Doc String for:", declaration, "[", len(doc_lines),"]"
## we need to cope with strings longer than 2048 for MSVC
ret = "\\\n".join(doc_lines)
if len ( ret ) > 1700: ## just to be safe and adjust for line end chars etc..
@@ -120,10 +120,10 @@
c = ' '
newret = newret + c
if len(basedoc) >1 or len(newret)>1:
-# # self.outfile.write("***============================*****\n" + declaration.decl_string + "\n")
-# # self.outfile.write( str(len(basedoc)) + " " + str(len(newret)) + "\n" )
-# # self.outfile.write( newret )
- return '"' + basedoc + newret.lstrip() + '"'
+# print("***============================*****\n" + declaration.decl_string + "\n")
+# print ( str(len(basedoc)) + " " + str(len(newret)) + "\n" )
+# print ( newret )
+ return '"' + basedoc + newret.lstrip() + '"'
else: return ""
def remove_leading_blanks ( docin ):
@@ -204,7 +204,8 @@
# _str = clean(_str, "@par", "") ## it will get a single blank line by default -- breaks @param...
_str = clean(_str, "\\par", "") ## it will get a single blank line by default
- _str = clean(_str, "\n", "\\n")
+ _str = clean(_str, "\r\n", "\\n")
+ _str = clean(_str, "\n", "\\n")
_str = clean(_str, "\\p", "") ## cegui comments
_str = clean(_str, "\\li", " * ") ## ode comments
_str = clean(_str, "\\exception", "@exception")
@@ -217,7 +218,10 @@
## now clean up the rest
_str = reduce(clean, [_str, '/', '*', '!', "\\brief", '\\fn',
- "@brief", "@fn", '"', "@{", "\\c", "\\a"]) ## somtimes there are '"' in the doc strings and other "\\"...
+ "@brief", "@fn", '"', "@{", "\\c", "\\a"]) ## somtimes there are '"' in the doc strings and other "\\"...
+
+
+
# return _str.lstrip()
# return " " + _str.lstrip()
return _str ## no removale of white space so Epytext can handle sections etc
@@ -245,4 +249,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/demos/caelum/Demo_Caelum01.py
===================================================================
--- trunk/python-ogre/demos/caelum/Demo_Caelum01.py 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/demos/caelum/Demo_Caelum01.py 2007-10-06 11:17:27 UTC (rev 412)
@@ -160,8 +160,7 @@
## */
##
## ====================================================================
- if self.spm:
- self.spm = 0
+ self.spm = None
if self.caelumSystem:
self.caelumSystem.shutdown(False)
self.caelumSystem = None
Modified: trunk/python-ogre/demos/caelum/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/caelum/plugins.cfg 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/demos/caelum/plugins.cfg 2007-10-06 11:17:27 UTC (rev 412)
@@ -2,18 +2,18 @@
## Use this for Windows
# Define plugin folder
-PluginFolder=../../plugins
-Plugin=RenderSystem_GL.dll
-Plugin=RenderSystem_Direct3D9.dll
-Plugin=Plugin_ParticleFX.dll
-Plugin=Plugin_BSPSceneManager.dll
-Plugin=Plugin_OctreeSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
+PluginFolder=/home/andy/development/root/usr/lib/OGRE
+#Plugin=RenderSystem_GL.dll
+#Plugin=RenderSystem_Direct3D9.dll
+#Plugin=Plugin_ParticleFX.dll
+#Plugin=Plugin_BSPSceneManager.dll
+#Plugin=Plugin_OctreeSceneManager.dll
+#Plugin=Plugin_CgProgramManager.dll
##
## NOTE use this for MacOS or Linux
-# Plugin=RenderSystem_GL
-# Plugin=Plugin_ParticleFX
-# Plugin=Plugin_BSPSceneManager
-# Plugin=Plugin_OctreeSceneManager
-# Plugin=Plugin_CgProgramManager
+ Plugin=RenderSystem_GL
+ Plugin=Plugin_ParticleFX
+ Plugin=Plugin_BSPSceneManager
+ Plugin=Plugin_OctreeSceneManager
+ Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/demos/et/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/et/plugins.cfg 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/demos/et/plugins.cfg 2007-10-06 11:17:27 UTC (rev 412)
@@ -2,18 +2,18 @@
## Use this for Windows
# Define plugin folder
-PluginFolder=../../plugins
-Plugin=RenderSystem_GL.dll
-Plugin=RenderSystem_Direct3D9.dll
-Plugin=Plugin_ParticleFX.dll
-Plugin=Plugin_BSPSceneManager.dll
-Plugin=Plugin_OctreeSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
+PluginFolder=/home/andy/development/root/usr/lib/OGRE
+#Plugin=RenderSystem_GL.dll
+#Plugin=RenderSystem_Direct3D9.dll
+#Plugin=Plugin_ParticleFX.dll
+#Plugin=Plugin_BSPSceneManager.dll
+#Plugin=Plugin_OctreeSceneManager.dll
+#Plugin=Plugin_CgProgramManager.dll
##
## NOTE use this for MacOS or Linux
-# Plugin=RenderSystem_GL
-# Plugin=Plugin_ParticleFX
-# Plugin=Plugin_BSPSceneManager
-# Plugin=Plugin_OctreeSceneManager
-# Plugin=Plugin_CgProgramManager
+ Plugin=RenderSystem_GL
+ Plugin=Plugin_ParticleFX
+ Plugin=Plugin_BSPSceneManager
+ Plugin=Plugin_OctreeSceneManager
+ Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/demos/ogre/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/ogre/plugins.cfg 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/demos/ogre/plugins.cfg 2007-10-06 11:17:27 UTC (rev 412)
@@ -2,18 +2,18 @@
## Use this for Windows
# Define plugin folder
-PluginFolder=../../plugins
-Plugin=RenderSystem_GL.dll
-Plugin=RenderSystem_Direct3D9.dll
-Plugin=Plugin_ParticleFX.dll
-Plugin=Plugin_BSPSceneManager.dll
-Plugin=Plugin_OctreeSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
+PluginFolder=/home/andy/development/root/usr/lib/OGRE
+#Plugin=RenderSystem_GL.dll
+#Plugin=RenderSystem_Direct3D9.dll
+#Plugin=Plugin_ParticleFX.dll
+#Plugin=Plugin_BSPSceneManager.dll
+#Plugin=Plugin_OctreeSceneManager.dll
+#Plugin=Plugin_CgProgramManager.dll
##
## NOTE use this for MacOS or Linux
-# Plugin=RenderSystem_GL
-# Plugin=Plugin_ParticleFX
-# Plugin=Plugin_BSPSceneManager
-# Plugin=Plugin_OctreeSceneManager
-# Plugin=Plugin_CgProgramManager
+ Plugin=RenderSystem_GL
+ Plugin=Plugin_ParticleFX
+ Plugin=Plugin_BSPSceneManager
+ Plugin=Plugin_OctreeSceneManager
+ Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/demos/qgui/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/qgui/plugins.cfg 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/demos/qgui/plugins.cfg 2007-10-06 11:17:27 UTC (rev 412)
@@ -1,19 +1,19 @@
# Defines plugins to load
-## User this for Windows
+## Use this for Windows
# Define plugin folder
-PluginFolder=../../plugins
-Plugin=RenderSystem_GL.dll
-Plugin=RenderSystem_Direct3D9.dll
-Plugin=Plugin_ParticleFX.dll
-Plugin=Plugin_BSPSceneManager.dll
-Plugin=Plugin_OctreeSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
+PluginFolder=/home/andy/development/root/usr/lib/OGRE
+#Plugin=RenderSystem_GL.dll
+#Plugin=RenderSystem_Direct3D9.dll
+#Plugin=Plugin_ParticleFX.dll
+#Plugin=Plugin_BSPSceneManager.dll
+#Plugin=Plugin_OctreeSceneManager.dll
+#Plugin=Plugin_CgProgramManager.dll
##
## NOTE use this for MacOS or Linux
-# Plugin=RenderSystem_GL
-# Plugin=Plugin_ParticleFX
-# Plugin=Plugin_BSPSceneManager
-# Plugin=Plugin_OctreeSceneManager
-# Plugin=Plugin_CgProgramManager
+ Plugin=RenderSystem_GL
+ Plugin=Plugin_ParticleFX
+ Plugin=Plugin_BSPSceneManager
+ Plugin=Plugin_OctreeSceneManager
+ Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/environment.py 2007-10-06 11:17:27 UTC (rev 412)
@@ -248,8 +248,11 @@
class ogrenewt:
active=True
version = "1.0"
- parent = "ogre/physics"
- libs = ['Newton', Config.LIB_Boost, 'OgreNewt_Main', 'OgreMain']
+ parent = "ogre/physics"
+ if os.name=="nt":
+ libs = ['Newton', Config.LIB_Boost, 'OgreNewt_Main', 'OgreMain']
+ else:
+ libs = ['Newton', Config.LIB_Boost, 'OgreNewt', 'OgreMain']
include_dirs = [Config.PATH_Boost
, Config.PATH_Newton # only one path for Newton
, Config.PATH_INCLUDE_Ogre
@@ -576,10 +579,24 @@
if os.name =='nt':
CCFLAGS = ' -DOgreAL_Export="" -DWIN32 -DNDEBUG -D_LIB -D_WIN32 -D_WINDOWS -DVORBIS_IEEE_FLOAT32 -D_USE_NON_INTEL_COMPILER '
+<<<<<<< .mine
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
+
+=======
+ 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',
@@ -587,6 +604,7 @@
'alut',
'vorbis','vorbisfile','vorbisenc',
'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves
+>>>>>>> .r411
ModuleName = 'OgreAL'
CheckIncludes = ['OgreAL.h']
active=True
@@ -649,7 +667,23 @@
ModuleName = 'et'
CheckIncludes = ['boost/python.hpp']
active=True
- cflags = ""
+ cflags = ""
+
+class caelum: ## editable terrain
+ version= "2.2"
+ parent = "ogre/addons"
+ libs=[ Config.LIB_Boost, 'OgreMain' ]
+ lib_dirs = [ Config.PATH_LIB_Boost,
+ Config.PATH_LIB_Ogre_OgreMain
+ ]
+ include_dirs = [ Config.PATH_Boost,
+ Config.PATH_INCLUDE_Ogre,
+ Config.PATH_caelum
+ ]
+ ModuleName = 'caelum'
+ CheckIncludes = ['boost/python.hpp']
+ active=True
+ cflags = ""
class bullet:
version= "2.62"
@@ -749,8 +783,9 @@
, 'ogrebulletc' : ogrebulletc
, 'ogrebulletd' : ogrebulletd
, 'ogreforests' : ogreforests
- , 'et' : et
+ , 'et' : et
, 'caelum' : caelum
+ , 'caelum' : caelum
}
#
Modified: trunk/python-ogre/scripts/00-PreReqs.sh
===================================================================
--- trunk/python-ogre/scripts/00-PreReqs.sh 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/scripts/00-PreReqs.sh 2007-10-06 11:17:27 UTC (rev 412)
@@ -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
+python-celementtree libglew-dev
Modified: trunk/python-ogre/scripts/01-RetrieveSource.sh
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-10-06 11:17:27 UTC (rev 412)
@@ -17,16 +17,16 @@
$WGET http://prdownloads.sourceforge.net/wgois/ois-1.0RC1.tar.gz
$WGET http://prdownloads.sourceforge.net/boost/boost-jam-3.1.13-1-linuxx86.tgz
$WGET http://prdownloads.sourceforge.net/scons/scons-0.96.96.tar.gz
-$WGET http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-4.tar.bz2
+$WGET http://downloads.sourceforge.net/scons/scons-0.97.0d20070918.tar.gz
+$WGET http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2
$WGET http://prdownloads.sourceforge.net/opende/ode-src-0.8.zip
-$WGET http://prdownloads.sourceforge.net/bullet/bullet-2.62a.tgz
$WGET http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2
$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
+$WGET http://downloads.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2
popd
cd $INSTALL_DIR
echo " -- getting pygccxml"
@@ -39,12 +39,6 @@
cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogreode
echo " -- getting ogrenewt"
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-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-10-06 11:17:27 UTC (rev 412)
@@ -6,7 +6,8 @@
echo " == extracting =="
echo " -- Unpacking OGRE"
-tar jxf $DOWNLOADS/ogre-linux_osx-v1-4-4.tar.bz2
+tar jxf $DOWNLOADS/ogre-linux_osx-v1-4-5.tar.bz2
+tar jxf $DOWNLOADS/zziplib-0.13.49.tar.bz2
echo " -- Unpacking Boost"
tar jxf $DOWNLOADS/boost_1_34_0.tar.bz2
echo " -- Unpacking CEGUI"
@@ -19,8 +20,6 @@
tar zxf $DOWNLOADS/newtonLinux-1.53.tar.gz
echo " -- Unpacking ODE"
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
@@ -52,11 +51,11 @@
echo " -- Patching OgreOde"
cd ogreaddons/ogreode
-patch -s -i ../../python-ogre/patch/ogreode.patch -p0
+patch -s -N -i ../../python-ogre/patch/ogreode.patch -p0
cd $INSTALL_DIR
echo " -- Patching OgreNewt"
cd ogreaddons/ogrenewt
-patch -s -i ../../python-ogre/patch/ogrenewt.patch -p0
+patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0
cp SConscript OgreNewt_Main
rm -r ./OgreNewt_Main/inc/boost
cd $INSTALL_DIR
@@ -76,11 +75,11 @@
cp -r python-ogre/boost/* boost_1_34_0
echo " -- Patching Ogre"
-patch -s -i ./python-ogre/patch/ogre.patch -p0
+patch -s -N -i ./python-ogre/patch/ogre.patch -p0
echo " -- Patching CEGUI"
pushd CEGUI-0.5.0
-patch -s -i ../python-ogre/patch/cegui.patch -p0
+patch -s -N -i ../python-ogre/patch/cegui.patch -p0
echo "EMPTY" >>./INSTALL
echo "EMPTY" >>./NEWS
popd
Modified: trunk/python-ogre/scripts/03-BuildBaseLibs.sh
===================================================================
--- trunk/python-ogre/scripts/03-BuildBaseLibs.sh 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/scripts/03-BuildBaseLibs.sh 2007-10-06 11:17:27 UTC (rev 412)
@@ -6,6 +6,16 @@
echo " == Building base libraries == "
#
+# zlib as the one included in Ubuntu is buggy
+#
+echo " -- building zzlib --"
+pushd zziplib-0.13.49
+aclocal
+./configure --prefix=$PREFIX --datadir=$PREFIX/share
+make
+make install
+popd
+#
# Install CEGUI (Crazy Eddie's GUI)
#
echo " -- Building CEGUI"
@@ -49,11 +59,21 @@
#
echo " -- Building Ogre"
pushd ogrenew
+aclocal
./bootstrap
./configure --prefix=$PREFIX
make
make install
+cd ReferenceApplication
+aclocal
+./bootstrap
+./configure --prefix=$PREFIX
+make
+make install
+cd ..
popd
echo
echo " ==== Finished building base libraries ===="
+
+
Modified: trunk/python-ogre/scripts/05-BuildTools.sh
===================================================================
--- trunk/python-ogre/scripts/05-BuildTools.sh 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/scripts/05-BuildTools.sh 2007-10-06 11:17:27 UTC (rev 412)
@@ -36,7 +36,7 @@
PREFIX=/usr/local
EPREFIX=/usr/local
EOF
-patch -p0 < boost.patch
+patch -N -p0 < boost.patch
sed -i s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ boost/python/detail/preprocessor.hpp
make
make install
@@ -50,6 +50,14 @@
python setup.py install --prefix=$PREFIX
cd ..
+echo " -- installing SCONs"
+rm -rf scons-0.97.0d20070918
+tar -xvzf $DOWNLOADS/scons-0.97.0d20070918.tar.gz --overwrite
+cd scons-0.97.0d20070918
+####python setup.py install --prefix=$PREFIX
+cd ..
+
+
# py++
echo " -- installing PY++"
cd pygccxml/pygccxml_dev
Modified: trunk/python-ogre/scripts/06-GenerateCode.sh
===================================================================
--- trunk/python-ogre/scripts/06-GenerateCode.sh 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/scripts/06-GenerateCode.sh 2007-10-06 11:17:27 UTC (rev 412)
@@ -3,70 +3,66 @@
# master config setup
source ./config.sh
-echo "=== generating code ==="
-echo "=== generating code ===" >> $INSTALL_DIR/log.out
cd python-ogre/code_generators
if [ $1 != "" ]
then
- cd $1
- python generate_code.py > build.out
- cd ..
+ echo "=== generating $1 ==="
+ echo "=== generating $1 ===" >> $INSTALL_DIR/log.out
+ $INSTALL_DIR/gen_code.sh $1
else
-echo ' -- creating OGRE code'
-echo ' -- creating OGRE code' >> $INSTALL_DIR/log.out
-cd ogre
-python generate_code.py > build.out
-cd ..
-echo ' -- creating OGRErefapp code'
-echo ' -- creating OGRErefapp code'>> $INSTALL_DIR/log.out
-cd ogrerefapp
-python generate_code.py > build.out
-cd ..
-echo ' -- creating quickgui code'
-echo ' -- creating quickgui code'>> $INSTALL_DIR/log.out
-cd quickgui
-python generate_code.py > build.out
-cd ..
-echo ' -- creating OIS code'
-echo ' -- creating OIS code'>> $INSTALL_DIR/log.out
-cd ois
-python generate_code.py > build.out
-cd ..
-echo ' -- creating CEGUI code'
-echo ' -- creating CEGUI code'>> $INSTALL_DIR/log.out
-cd cegui
-python generate_code.py > build.out
-cd ..
-echo ' -- creating OgreAL code'
-echo ' -- creating OgreAL code'>> $INSTALL_DIR/log.out
-cd ogreal
-python generate_code.py > build.out
-cd ..
-echo ' -- creating OGREode code'
-echo ' -- creating OGREode code'>> $INSTALL_DIR/log.out
-cd ogreode
-python generate_code.py > build.out
-cd ..
-echo ' -- creating PLIB code'
-echo ' -- creating PLIB code'>> $INSTALL_DIR/log.out
-cd plib
-python generate_code.py > build.out
-cd ..
-echo ' -- creating Theora code'
-echo ' -- creating Theora code'>> $INSTALL_DIR/log.out
-cd theora
-python generate_code.py > build.out
-cd ..
-echo ' -- creating OGREnewt code'
-echo ' -- creating OGREnewt code' >> $INSTALL_DIR/log.out
-cd ogrenewt
-python generate_code.py > build.out
-cd ..
-echo ' -- creating ode code'
-cd ode
-python generate_code.py > build.out
-cd ..
+# echo ' -- creating OGRE code'
+# echo ' -- creating OGRE code' >> $INSTALL_DIR/log.out
+# $INSTALL_DIR/gen_code.sh ogre
+
+# echo ' -- creating OGRErefapp code'
+# echo ' -- creating OGRErefapp code'>> $INSTALL_DIR/log.out
+# $INSTALL_DIR/gen_code.sh ogrerefapp
+
+ echo ' -- creating quickgui code'
+ echo ' -- creating quickgui code'>> $INSTALL_DIR/log.out
+ $INSTALL_DIR/gen_code.sh quickgui
+
+ echo ' -- creating OIS code'
+ echo ' -- creating OIS code'>> $INSTALL_DIR/log.out
+ $INSTALL_DIR/gen_code.sh ois
+
+# echo ' -- creating CEGUI code'
+# echo ' -- creating CEGUI code'>> $INSTALL_DIR/log.out
+# $INSTALL_DIR/gen_code.sh cegui
+
+ echo ' -- creating OgreAL code'
+ echo ' -- creating OgreAL code'>> $INSTALL_DIR/log.out
+ $INSTALL_DIR/gen_code.sh ogreal
+
+ echo ' -- creating OGREode code'
+ echo ' -- creating OGREode code'>> $INSTALL_DIR/log.out
+ $INSTALL_DIR/gen_code.sh ogreode
+
+ echo ' -- creating PLIB code'
+ echo ' -- creating PLIB code'>> $INSTALL_DIR/log.out
+ $INSTALL_DIR/gen_code.sh plib
+
+ #echo ' -- creating Theora code'
+ #echo ' -- creating Theora code'>> $INSTALL_DIR/log.out
+ #$INSTALL_DIR/gen_code.sh theora
+
+ echo ' -- creating OGREnewt code'
+ echo ' -- creating OGREnewt code' >> $INSTALL_DIR/log.out
+ $INSTALL_DIR/gen_code.sh ogrenewt
+
+ echo ' -- creating ode code'
+ echo ' -- creating ode code' >> $INSTALL_DIR/log.out
+ $INSTALL_DIR/gen_code.sh ode
+
+# echo ' -- creating et code'
+# echo ' -- creating et code' >> $INSTALL_DIR/log.out
+# $INSTALL_DIR/gen_code.sh et
+
+# echo ' -- creating caelum code'
+# echo ' -- creating caelum code' >> $INSTALL_DIR/log.out
+# $INSTALL_DIR/gen_code.sh caelum
+
fi
cd $INSTALL_DIR
echo
Modified: trunk/python-ogre/scripts/07-BuildModules.sh
===================================================================
--- trunk/python-ogre/scripts/07-BuildModules.sh 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/scripts/07-BuildModules.sh 2007-10-06 11:17:27 UTC (rev 412)
@@ -12,7 +12,7 @@
then
scons PROJECTS=$1
else
- scons PROJECTS=ogre,ois,quickgui,cegui,plib,ogreode,ogrenewt,ogreal
+ scons PROJECTS=ogre,ois,cegui,plib,ogreode,ogrenewt,ogreal,quickgui,et,caelum
fi
#opcode -- not really suited to a linux build -- lots of work needed ?
#
Modified: trunk/python-ogre/scripts/config.sh
===================================================================
--- trunk/python-ogre/scripts/config.sh 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/scripts/config.sh 2007-10-06 11:17:27 UTC (rev 412)
@@ -19,7 +19,7 @@
export LD_LIBRARY_PATH=$PREFIX/lib
export CFLAGS="-I$PREFIX/include -L$PREFIX/lib"
export CXXFLAGS=$CFLAGS
-export PATH=$PATH:$PREFIX/bin
+export PATH=$PREFIX/bin:$PATH
export PYTHONPATH=$PREFIX/lib/python$PYTHONVERSION/site-packages
mkdir -p $PREFIX
Modified: trunk/python-ogre/scripts/master.sh
===================================================================
--- trunk/python-ogre/scripts/master.sh 2007-10-06 10:45:04 UTC (rev 411)
+++ trunk/python-ogre/scripts/master.sh 2007-10-06 11:17:27 UTC (rev 412)
@@ -7,8 +7,8 @@
source ./05-BuildTools.sh
source ./03-BuildBaseLibs.sh
source ./04-BuildAdditionalLibs.sh
-source ./06-GenerateCode.sh
-source ./07-BuildModules.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.
|
