[Python-ogre-commit] SF.net SVN: python-ogre: [522] trunk/python-ogre

[<and...@us...>]

Revision: 522
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=522&view=rev
Author:   andy_miller
Date:     2007-12-30 02:53:44 -0800 (Sun, 30 Dec 2007)

Log Message:
-----------
Further V2 changes
Fix with ogre code generation due to newer gccxml (unsigned => unsigned int)

Modified Paths:
--------------
    trunk/python-ogre/BuildModule.py
    trunk/python-ogre/PythonOgreConfig_posix.py
    trunk/python-ogre/code_generators/ogre/generate_code.py
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py	2007-12-30 08:48:40 UTC (rev 521)
+++ trunk/python-ogre/BuildModule.py	2007-12-30 10:53:44 UTC (rev 522)
@@ -14,12 +14,12 @@
 
 logger = None
 
-def setupLogging ():
+def setupLogging (logfilename):
     # set up logging to file
     logging.basicConfig(level=logging.DEBUG,
                         format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
                         datefmt='%m-%d %H:%M',
-                        filename='log.out',
+                        filename=logfilename,
                         filemode='w')
     # define a Handler which writes INFO messages or higher to the sys.stderr
     console = logging.StreamHandler()
@@ -77,7 +77,7 @@
         env["CFLAGS"]="-I"+os.path.join(PREFIX,"include")+ " -L"+os.path.join(PREFIX,"lib")  
         env["CXXFLAGS"]=env["CFLAGS"]
         env["LDFLAGS"]="-Wl,-rpath='$$ORIGIN/../../lib' -Wl,-rpath='$$ORIGIN' -Wl,-z,origin"
-        env["PYTHONPATH"]=PREFIX+"/lib/python25/site-packages"
+        env["PYTHONPATH"]=PREFIX+"/lib/python2.5/site-packages"
         env["ZZIPLIB_LIBS"]="-lzzip"
 
     env["PATH"]=PREFIX+"/bin:" + PATH
@@ -140,13 +140,12 @@
     parser.add_option("-b", "--build", action="store_true", default=False ,dest="build", help="Build the appropiate module")
     parser.add_option("-g", "--gen", action="store_true", default=False ,dest="gencode", help="Generate Source Code for the module")
     parser.add_option("-c", "--compile", action="store_true", default=False ,dest="compilecode", help="Compile Source Code for the module")
+    parser.add_option("-l", "--logfilename",  default="log.out" ,dest="logfilename", help="Override the default log file name")
    
     (options, args) = parser.parse_args()
     return (options,args)
     
 if __name__ == '__main__':
-    setupLogging()
-    logger = logging.getLogger('PythonOgre.BuildModule')
     classList = getClassList ()
     
     (options, args) = parseInput()
@@ -156,11 +155,16 @@
     if options.retrieve==False and options.build==False and options.gencode==False and options.compilecode==False:
         exit ( "You need to specific at least one option. Use -h for help")
             
+    setupLogging(options.logfilename)
+    logger = logging.getLogger('PythonOgre.BuildModule')
+
     if not os.path.exists( environment.downloadPath ):
         os.mkdir ( environment.downloadPath )    
 
     if not os.path.exists( environment.Config.ROOT_DIR ):
         os.mkdir ( environment.Config.ROOT_DIR )    
+    if not os.path.exists( os.path.join(environment.Config.ROOT_DIR, 'usr' ) ):
+        os.mkdir ( os.path.join(environment.Config.ROOT_DIR, 'usr' )  )    
 
     for moduleName  in args:        
         if not classList.has_key( moduleName ):

Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py	2007-12-30 08:48:40 UTC (rev 521)
+++ trunk/python-ogre/PythonOgreConfig_posix.py	2007-12-30 10:53:44 UTC (rev 522)
@@ -27,7 +27,8 @@
 # and the Py++ directory as sometimes we need access to the code repository there
 pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml')
 
-SDK = True
+SDK = True
+SDK = False
 
 # # ## Parent directories of the libraries
 PATH_THIRDPARTY =   os.path.join(module_dir, 'ThirdParty' )

Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py	2007-12-30 08:48:40 UTC (rev 521)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py	2007-12-30 10:53:44 UTC (rev 522)
@@ -679,7 +679,7 @@
     elif sys.platform.startswith ('linux'):
         pass
     mb.global_ns.class_('vector<int, std::allocator<int> >').alias='VectorInt'
-    mb.global_ns.class_('vector<std::pair<unsigned, unsigned>, std::allocator<std::pair<unsigned, unsigned> > >').alias='VectorUnsignedUnsigned'
+    mb.global_ns.class_('vector<std::pair<unsigned int, unsigned int>, std::allocator<std::pair<unsigned int, unsigned int> > >').alias='VectorUnsignedUnsigned'
     #as reported by mike with linux:bp::arg("flags")=(std::_Ios_Fmtflags)0
     mb.namespace( MAIN_NAMESPACE ).class_('StringConverter').member_functions('toString').exclude()    
 

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2007-12-30 08:48:40 UTC (rev 521)
+++ trunk/python-ogre/environment.py	2007-12-30 10:53:44 UTC (rev 522)
@@ -1063,12 +1063,21 @@
                     'openal']  ##  'OgreAL' -- going to compile OgreAL ourselves
     ModuleName = 'OgreAL'
     CheckIncludes = ['OgreAL.h']
-    Source = [
-        ["wget", "http://www.openal.org/openal_webstf/downloads/openal-0.0.8.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",''],
-        ]
-        
+    source = [
+        ["wget", "http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz",downloadPath],
+        ["wget", "http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz",downloadPath],
+        ["wget", "http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz",downloadPath],
+        ]
+    buildCmds = [
+        [0, "tar zxf " + os.path.join(downloadPath, "openal-0.0.8.tar.gz"), ''],
+        [0, "tar zxf " + os.path.join(downloadPath, "libogg-1.1.3.tar.gz"), ''],
+        [0, "tar zxf " + os.path.join(downloadPath, "libvorbis-1.2.0.tar.gz"), ''],
+        [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libogg-1.1.3")],
+        [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")],
+        [0, "./autogen.sh\n./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")]
+        ]
+
+      
 class ogrevideoffmpeg:
     active = True
     pythonModule = True


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.