[Python-ogre-commit] SF.net SVN: python-ogre: [585] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre: [585] trunk/python-ogre
|
From: <and...@us...> - 2008-04-18 01:57:35
|
Revision: 585
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=585&view=rev
Author: andy_miller
Date: 2008-04-17 18:57:41 -0700 (Thu, 17 Apr 2008)
Log Message:
-----------
General updates
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/environment.py
trunk/python-ogre/patch/ogre.patch
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-04-15 05:26:49 UTC (rev 584)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-04-18 01:57:41 UTC (rev 585)
@@ -13,11 +13,17 @@
## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
-PATH_Boost = os.path.join(BASE_DIR, 'boost')
+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, 'boost/bin.v2/libs/python2.5/build/msvc-8.0/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(BASE_DIR, 'boost/bin.v2/libs/python2.5/build/msvc-9.0express/release/threading-multi')
## and the name of the boost python library
-LIB_Boost = r'boost_python-vc80-mt-1_35'
+LIB_Boost = r'boost_python-vc90-mt-1_35'
+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
RPATH=""
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-04-15 05:26:49 UTC (rev 584)
+++ trunk/python-ogre/environment.py 2008-04-18 01:57:41 UTC (rev 585)
@@ -178,18 +178,27 @@
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:
+
+ buildCmds = [
+ [0,'echo Please use CMAKE to create a msvc build projects for gccxml',''],
+ [0,'echo ie. Run Cmake (from the windows menu)',''],
+ [0,'echo specific the gccxml for both directories and run configure',''],
+ [0,'echo ignore any errors - you will need to run configure twice and then OK',''],
+ [0,'echo Now run MSVC and load the gccxml project (in the gccxml directory) and build it','']
+ ]
+
class install:
pythonModule = False
active = True
@@ -236,16 +245,27 @@
class pygccxml:
pythonModule = False
active = True
- if isLinux() or isMac():
- base = 'pygccxml'
+ base = 'pygccxml'
+ if isLinux() or isMac() :
source = [
[svn, " co -r 1234 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
]
+ source = [
+ [svn, " co http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
+ ]
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:
pythonModule = False
@@ -342,17 +362,23 @@
[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():
+ source = [ [wget, "http://www.cmake.org/files/v2.4/cmake-2.4.8-win32-x86.exe", downloadPath ]]
+ buildCmds = [
+ [0, os.path.join(downloadPath, "cmake-2.4.8-win32-x86.exe"), '' ]
+ ]
+
+
class scons:
pythonModule = False
active = True
- base = 'scons-0.97.0d20071212'
+ base = 'scons-0.98.0'
source = [
[wget, "http://downloads.sourceforge.net/scons/"+base+".tar.gz",downloadPath],
]
# 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 +387,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
@@ -369,6 +395,7 @@
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'
myLibraryPaths = [ 'boost/bin.v2/libs/python2.5/build/msvc-8.0/release/threading-multi' ]
@@ -399,8 +426,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_34_1/configure", '' ],
- [0, sed_ + " s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ boost_1_34_1/boost/python/detail/preprocessor.hpp", ''],
+ [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,"./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 )],
@@ -409,20 +436,20 @@
if isWindows():
bjambase = 'boost-jam-3.1.16-1-ntx86'
source = [
- [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.16-1-ntx86.zip',downloadPath] ,
- [wget,'http://downloads.sourceforge.net/boost/boost_1_34_1.tar.gz',downloadPath]
+ [wget,'http://downloads.sourceforge.net/boost/'+bjambase+'.zip',downloadPath] ,
+ [wget,'http://downloads.sourceforge.net/boost/'+base+'.zip',downloadPath]
]
- buildCmds = unTarGz( base, downloadPath ) +\
- [
- [0,cp + ' -r '+os.path.join('python-ogre','boost') + '* ' + base , ''], # need to overwrite the boost with our files
- [0,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ boost_1_34_1/configure', '' ],
- [0,"sed -i s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ boost_1_34_1/boost/python/detail/preprocessor.hpp", ''],
- [0, unzip + " " + os.path.join ( downloadPath, bjambase) + ".zip", ''],
+ buildCmds = [
+ [0,unzip + os.path.join(downloadPath, bjambase+".zip"), ''],
+ [0,unzip + os.path.join(downloadPath, base + ".zip"), ''],
+ [0,'xcopy /s /i /y '+os.path.join('python-ogre','boost') + ' ' + base , ''], # need to overwrite the boost with our files
+ [0,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/configure', '' ],
+ [0,'sed -i s/"BOOST_PYTHON_MAX_ARITY 15"/"BOOST_PYTHON_MAX_ARITY 19"/ '+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)]
]
- BuildCmds = [] # commands to build the library with
-
+
####################################################
@@ -450,6 +477,18 @@
#
if isWindows():
+
+ 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],
+ ]
+ buildCmds = [
+ [0, unzip + os.path.join(downloadPath,"ogre-win32-v1-4-7.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()]
+ ]
+
# requirements to build a precompiled header on the fly
if _PreCompiled:
pchstop = 'python_ogre_precompiled.h'
@@ -567,9 +606,9 @@
]
if isWindows():
base = "ois"
- source = [ wget,"http://downloads.sourceforge.net/wgois/ois_1.2.0.zip", downloadPath]
+ source = [ [wget,"http://downloads.sourceforge.net/wgois/ois_1.2.0.zip", downloadPath] ]
buildCmds = [
- [0, unzip + downloadPath + "/" + "ois_1.2.0.zip" ,os.getcwd() ],
+ [0, unzip + downloadPath + "/" + "ois_1.2.0.zip" ,os.getcwd() ]
# [0, '"c:/Program Files/Microsoft Visual Studio 8/vc/vcpackages/vcbuild.exe" /useenv ois_VC8.sln ', os.path.join(os.getcwd(), base, 'Win32' )],
# [0, VCBUILD + " ois_vc8.sln " + "\"Release|Win32\"", os.path.join(os.getcwd(), base, 'Win32' )]
]
@@ -1496,7 +1535,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)
Modified: trunk/python-ogre/patch/ogre.patch
===================================================================
--- trunk/python-ogre/patch/ogre.patch 2008-04-15 05:26:49 UTC (rev 584)
+++ trunk/python-ogre/patch/ogre.patch 2008-04-18 01:57:41 UTC (rev 585)
@@ -1,90 +1,91 @@
---- ogrenew/configure.in 2007-05-15 22:43:31.000000000 +0800
-+++ ogrenew/configure.in 2007-05-15 22:43:18.000000000 +0800
-@@ -59,6 +58,7 @@
- ;;
- esac
- ])
-+CFLAGS_VISIBILITY=""
- AC_SUBST(CFLAGS_VISIBILITY)
- AC_LANG_POP
-
---- ogrenew/OgreMain/include/OgreDataStream.h 23 Aug 2006 08:18:33 -0000 1.12
-+++ ogrenew/OgreMain/include/OgreDataStream.h 24 Nov 2007 00:35:47 -0000
-@@ -33,6 +33,7 @@
- #include "OgreString.h"
- #include "OgreSharedPtr.h"
- #include <istream>
-+#include <stdexcept>
-
- namespace Ogre {
-
-@@ -79,7 +80,7 @@
- @param count Number of bytes to read
- @returns The number of bytes read
- */
-- virtual size_t read(void* buf, size_t count) = 0;
-+ virtual size_t read(void* buf, size_t count) { throw std::runtime_error ( std::string ("Virtual function DataStream::read called!") ); }
- /** Get a single line from the stream.
- @remarks
- The delimiter character is not included in the data
-@@ -146,7 +147,7 @@
- /** Returns the total size of the data to be read from the stream,
- or 0 if this is indeterminate for this stream.
- */
-- size_t size(void) const { return mSize; }
-+ virtual size_t size(void) const { return mSize; }
-
- /** Close the stream; this makes further operations invalid. */
- virtual void close(void) = 0;
-
---- ogrenew/OgreMain/include/OgreHardwareBuffer.h 23 Aug 2006 08:18:33 -0000 1.17
-+++ ogrenew/OgreMain/include/OgreHardwareBuffer.h 24 Nov 2007 00:37:00 -0000
-@@ -31,6 +31,8 @@
-
- // Precompiler options
- #include "OgrePrerequisites.h"
-+#include <stdexcept>
-+
-
- namespace Ogre {
-
-@@ -244,7 +246,7 @@
- @param pDest The area of memory in which to place the data, must be large enough to
- accommodate the data!
- */
-- virtual void readData(size_t offset, size_t length, void* pDest) = 0;
-+ virtual void readData(size_t offset, size_t length, void* pDest) { throw std::runtime_error ( std::string ("Virtual function HardwareBuffer::readData called!") ); }
- /** Writes data to the buffer from an area of system memory; note that you must
- ensure that your buffer is big enough.
- @param offset The byte offset from the start of the buffer to start writing
-
---- ogrenew/OgreMain/include/OgreRenderQueueListener.h 23 Aug 2006 08:18:35 -0000 1.10
-+++ ogrenew/OgreMain/include/OgreRenderQueueListener.h 24 Nov 2007 00:34:52 -0000
-@@ -31,6 +31,8 @@
-
- #include "OgrePrerequisites.h"
- #include "OgreRenderQueue.h"
-+#include <stdexcept>
-+
-
- namespace Ogre {
-
-@@ -65,7 +67,7 @@
- for this queue group.
- */
- virtual void renderQueueStarted(uint8 queueGroupId, const String& invocation,
-- bool& skipThisInvocation) = 0;
-+ bool& skipThisInvocation) { throw std::runtime_error ( std::string ("Virtual function RenderQueueListener::renderQueueStarted called!") ); }
-
- /** Event raised after a queue group is rendered.
- @remarks
-@@ -80,7 +82,7 @@
- events will also be fired for it again.
- */
- virtual void renderQueueEnded(uint8 queueGroupId, const String& invocation,
-- bool& repeatThisInvocation) = 0;
-+ bool& repeatThisInvocation) { throw std::runtime_error ( std::string ("Virtual function RenderQueueListener::renderQueueEnded called!") ); }
- };
-
- }
-
+
+--- ogrenew/configure.in 2007-05-15 22:43:31.000000000 +0800
++++ ogrenew/configure.in 2007-05-15 22:43:18.000000000 +0800
+@@ -59,6 +58,7 @@
+ ;;
+ esac
+ ])
++CFLAGS_VISIBILITY=""
+ AC_SUBST(CFLAGS_VISIBILITY)
+ AC_LANG_POP
+
+--- ogrenew/OgreMain/include/OgreDataStream.h 23 Aug 2006 08:18:33 -0000 1.12
++++ ogrenew/OgreMain/include/OgreDataStream.h 24 Nov 2007 00:35:47 -0000
+@@ -33,6 +33,7 @@
+ #include "OgreString.h"
+ #include "OgreSharedPtr.h"
+ #include <istream>
++#include <stdexcept>
+
+ namespace Ogre {
+
+@@ -79,7 +80,7 @@
+ @param count Number of bytes to read
+ @returns The number of bytes read
+ */
+- virtual size_t read(void* buf, size_t count) = 0;
++ virtual size_t read(void* buf, size_t count) { throw std::runtime_error ( std::string ("Virtual function DataStream::read called!") ); }
+ /** Get a single line from the stream.
+ @remarks
+ The delimiter character is not included in the data
+@@ -146,7 +147,7 @@
+ /** Returns the total size of the data to be read from the stream,
+ or 0 if this is indeterminate for this stream.
+ */
+- size_t size(void) const { return mSize; }
++ virtual size_t size(void) const { return mSize; }
+
+ /** Close the stream; this makes further operations invalid. */
+ virtual void close(void) = 0;
+
+--- ogrenew/OgreMain/include/OgreHardwareBuffer.h 23 Aug 2006 08:18:33 -0000 1.17
++++ ogrenew/OgreMain/include/OgreHardwareBuffer.h 24 Nov 2007 00:37:00 -0000
+@@ -31,6 +31,8 @@
+
+ // Precompiler options
+ #include "OgrePrerequisites.h"
++#include <stdexcept>
++
+
+ namespace Ogre {
+
+@@ -244,7 +246,7 @@
+ @param pDest The area of memory in which to place the data, must be large enough to
+ accommodate the data!
+ */
+- virtual void readData(size_t offset, size_t length, void* pDest) = 0;
++ virtual void readData(size_t offset, size_t length, void* pDest) { throw std::runtime_error ( std::string ("Virtual function HardwareBuffer::readData called!") ); }
+ /** Writes data to the buffer from an area of system memory; note that you must
+ ensure that your buffer is big enough.
+ @param offset The byte offset from the start of the buffer to start writing
+
+--- ogrenew/OgreMain/include/OgreRenderQueueListener.h 23 Aug 2006 08:18:35 -0000 1.10
++++ ogrenew/OgreMain/include/OgreRenderQueueListener.h 24 Nov 2007 00:34:52 -0000
+@@ -31,6 +31,8 @@
+
+ #include "OgrePrerequisites.h"
+ #include "OgreRenderQueue.h"
++#include <stdexcept>
++
+
+ namespace Ogre {
+
+@@ -65,7 +67,7 @@
+ for this queue group.
+ */
+ virtual void renderQueueStarted(uint8 queueGroupId, const String& invocation,
+- bool& skipThisInvocation) = 0;
++ bool& skipThisInvocation) { throw std::runtime_error ( std::string ("Virtual function RenderQueueListener::renderQueueStarted called!") ); }
+
+ /** Event raised after a queue group is rendered.
+ @remarks
+@@ -80,7 +82,7 @@
+ events will also be fired for it again.
+ */
+ virtual void renderQueueEnded(uint8 queueGroupId, const String& invocation,
+- bool& repeatThisInvocation) = 0;
++ bool& repeatThisInvocation) { throw std::runtime_error ( std::string ("Virtual function RenderQueueListener::renderQueueEnded called!") ); }
+ };
+
+ }
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
