[Python-ogre-commit] SF.net SVN: python-ogre:[742] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2008-09-14 00:20:36
|
Revision: 742 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=742&view=rev Author: andy_miller Date: 2008-09-14 00:20:45 +0000 (Sun, 14 Sep 2008) Log Message: ----------- Minor updates for the 1.6.0RC1 release Modified Paths: -------------- trunk/python-ogre/PythonOgreInstallCreator.iss trunk/python-ogre/ReportVersion.py trunk/python-ogre/code_generators/common_utils/ogre_properties.py trunk/python-ogre/installWarning.rtf trunk/python-ogre/setup.py Modified: trunk/python-ogre/PythonOgreInstallCreator.iss =================================================================== --- trunk/python-ogre/PythonOgreInstallCreator.iss 2008-09-10 10:36:22 UTC (rev 741) +++ trunk/python-ogre/PythonOgreInstallCreator.iss 2008-09-14 00:20:45 UTC (rev 742) @@ -30,13 +30,39 @@ WizardImageFile=compiler:WizModernImage-IS.bmp WizardSmallImageFile=compiler:WizModernSmallImage-IS.bmp VersionInfoVersion=1.6.0 + [Files] ; base files, demos and tools Source: *; DestDir: {app} Source: plugins\*; DestDir: {app}\plugins Source: tools\*; DestDir: {app}\tools -Source: demos\*; DestDir: {app}\demos; Flags: recursesubdirs -Source: docs\*; DestDir: {app}\docs; Flags: recursesubdirs +Source: docs\*; DestDir: {app}\docs +Source: ThirdParty\dxwebsetup.exe; DestDir: {app}\ThirdParty +Source: ThirdParty\vcredist_x86.exe; DestDir: {app}\ThirdParty + +Source: demos\*; DestDir: {app}\demos; +Source: demos\bullet\*; DestDir: {app}\demos\bullet; Flags: recursesubdirs +Source: demos\caelum\*; DestDir: {app}\demos\caelum; Flags: recursesubdirs +Source: demos\cegui\*; DestDir: {app}\demos\cegui; Flags: recursesubdirs +Source: demos\et\*; DestDir: {app}\demos\et; Flags: recursesubdirs +Source: demos\hydrax\*; DestDir: {app}\demos\hydrax; Flags: recursesubdirs +Source: demos\media\*; DestDir: {app}\demos\media; Flags: recursesubdirs +Source: demos\media_extra\*; DestDir: {app}\demos\media_extra; Flags: recursesubdirs +Source: demos\noise\*; DestDir: {app}\demos\noise; Flags: recursesubdirs +Source: demos\nxogre\*; DestDir: {app}\demos\nxogre; Flags: recursesubdirs +Source: demos\ode\*; DestDir: {app}\demos\ode; Flags: recursesubdirs +Source: demos\ogre\*; DestDir: {app}\demos\ogre; Flags: recursesubdirs +Source: demos\ogreal\*; DestDir: {app}\demos\ogreal; Flags: recursesubdirs +Source: demos\ogrebullet\*; DestDir: {app}\demos\ogrebullet; Flags: recursesubdirs +Source: demos\ogreforests\*; DestDir: {app}\demos\ogreforests; Flags: recursesubdirs +Source: demos\OgreNewt\*; DestDir: {app}\demos\OgreNewt; Flags: recursesubdirs +Source: demos\ogreode\*; DestDir: {app}\demos\ogreode; Flags: recursesubdirs +Source: demos\ogrepcz\*; DestDir: {app}\demos\ogrepcz; Flags: recursesubdirs +Source: demos\particleuniverse\*; DestDir: {app}\demos\particleuniverse; Flags: recursesubdirs +Source: demos\plib\*; DestDir: {app}\demos\plib; Flags: recursesubdirs +Source: demos\qgui\*; DestDir: {app}\demos\qgui; Flags: recursesubdirs +Source: demos\theora\*; DestDir: {app}\demos\theora; Flags: recursesubdirs + ; the python modules - in the event we find python Source: packages_2.5\*; DestDir: {code:GetPythonSiteDir}; Flags: recursesubdirs; Check: SelectedPython('2.5') ; the python modules again - if we don't find python we install both versions in the app directory @@ -45,8 +71,6 @@ ; I'm going to install here anyway to make updates easier... Source: packages_2.5\*; DestDir: {app}\packages_2.5; Flags: recursesubdirs -Source: ThirdParty\dxwebsetup.exe; DestDir: {app}\ThirdParty -Source: ThirdParty\vcredist_x86.exe; DestDir: {app}\ThirdParty ; ; we need to remove the .pyc files when we uninstall ; @@ -198,18 +222,18 @@ Name: {group}\Ogre Demos\Terrain; Filename: {code:GetPythonExe}; Parameters: Demo_Terrain.py; WorkingDir: {app}\Demos\Ogre Name: {group}\Ogre Demos\Textures; Filename: {code:GetPythonExe}; Parameters: Demo_TextureFX.py; WorkingDir: {app}\Demos\Ogre Name: {group}\Ogre Demos\Transparency; Filename: {code:GetPythonExe}; Parameters: Demo_Transparency.py; WorkingDir: {app}\Demos\Ogre -Name: {group}\Ogre Demos\WX Gui; Filename: {code:GetPythonExe}; Parameters: Demo_WX.py; WorkingDir: {app}\Demos\Ogre +;Name: {group}\Ogre Demos\WX Gui; Filename: {code:GetPythonExe}; Parameters: Demo_WX.py; WorkingDir: {app}\Demos\Ogre Name: {group}\GUI\CEGUI - Basic; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_Gui.py; WorkingDir: {app}\Demos\cegui Name: {group}\GUI\CEGUI Drag and Drop; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_DragnDrop.py; WorkingDir: {app}\Demos\cegui Name: {group}\GUI\CEGUI - Nice; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_NewGui.py; WorkingDir: {app}\Demos\cegui Name: {group}\GUI\QuickGUI-01; Filename: {code:GetPythonExe}; Parameters: Demo_QuickGUI01.py; WorkingDir: {app}\Demos\qgui -Name: {group}\GUI\Navi; Filename: {code:GetPythonExe}; Parameters: Demo_Navi.py; WorkingDir: {app}\Demos\navi +;Name: {group}\GUI\Navi; Filename: {code:GetPythonExe}; Parameters: Demo_Navi.py; WorkingDir: {app}\Demos\navi Name: {group}\ODE Demos\Multiple Scenes; Filename: {code:GetPythonExe}; Parameters: Demo_Scenes.py; WorkingDir: {app}\Demos\OgreOde -Name: {group}\ODE Demos\Gran Turism; Filename: {code:GetPythonExe}; Parameters: GranTurismOgre.py; WorkingDir: {app}\Demos\OgreOde +Name: {group}\ODE Demos\Gran Turism; Filename: {code:GetPythonExe}; Parameters: Demo_GranTurism.py; WorkingDir: {app}\Demos\OgreOde -Name: {group}\OgreAL Demos\Basic Sound; Filename: {code:GetPythonExe}; Parameters: Demo_RenderToTexture.py; WorkingDir: {app}\Demos\OgreAL +Name: {group}\OgreAL Demos\Basic Sound; Filename: {code:GetPythonExe}; Parameters: Demo_AL_01.py; WorkingDir: {app}\Demos\OgreAL Name: {group}\OgreNewt Demos\Basics; Filename: {code:GetPythonExe}; Parameters: Demo01_TheBasics.py; WorkingDir: {app}\Demos\OgreNewt Name: {group}\OgreNewt Demos\Joints; Filename: {code:GetPythonExe}; Parameters: Demo02_Joints.py; WorkingDir: {app}\Demos\OgreNewt @@ -218,7 +242,7 @@ Name: {group}\OgreNewt Demos\Simple Vehicle; Filename: {code:GetPythonExe}; Parameters: Demo05_SimpleVehicle.py; WorkingDir: {app}\Demos\OgreNewt Name: {group}\OgreNewt Demos\Simple Buoyancy; Filename: {code:GetPythonExe}; Parameters: Demo06_SimpleBuoyancy.py; WorkingDir: {app}\Demos\OgreNewt Name: {group}\OgreNewt Demos\Custom Joints; Filename: {code:GetPythonExe}; Parameters: Demo07_CustomJoints.py; WorkingDir: {app}\Demos\OgreNewt -Name: {group}\OgreNewt Demos\Ragdoll; Filename: {code:GetPythonExe}; Parameters: Demo08_ragdoll.py; WorkingDir: {app}\Demos\OgreNewt +;Name: {group}\OgreNewt Demos\Ragdoll; Filename: {code:GetPythonExe}; Parameters: Demo08_ragdoll.py; WorkingDir: {app}\Demos\OgreNewt ;Name: {group}\Video Demos\ffmpeg Video; Filename: {code:GetPythonExe}; Parameters: Demo_Video.py; WorkingDir: {app}\Demos\ffmpeg ;Name: {group}\Video Demos\DirectShow Video; Filename: {code:GetPythonExe}; Parameters: Demo_Video.py; WorkingDir: {app}\Demos\dshow @@ -239,13 +263,14 @@ Name: {group}\Special Effects\Caelum Sky; Filename: {code:GetPythonExe}; Parameters: Demo_Caelum01.py; WorkingDir: {app}\Demos\caelum Name: {group}\Special Effects\Noise Generation; Filename: {code:GetPythonExe}; Parameters: Demo_Noise_01.py; WorkingDir: {app}\Demos\noise Name: {group}\Special Effects\Particle Universe; Filename: {code:GetPythonExe}; Parameters: Demo_Particle.py; WorkingDir: {app}\Demos\particleuniverse +Name: {group}\Special Effects\Hydrax (Ocean Effects); Filename: {code:GetPythonExe}; Parameters: Demo_Hydrax01.py; WorkingDir: {app}\Demos\hydrax Name: {group}\Uninstall Python-Ogre; Filename: {uninstallexe} Name: {group}\Python-Ogre API Documenatation; Filename: {app}\docs\Python-Ogre.chm ;Name: {group}\Python-Ogre API (Html); Filename: {app}\docs\html\index.html [Run] -Filename: {app}\ThirdParty\vcredist_x86.exe +Filename: {app}\ThirdParty\vcredist_x86.exe; Parameters: "/q" Filename: {app}\ThirdParty\dxwebsetup.exe; Description: DirectX Installer; StatusMsg: You probably NEED to update your Directx Drivers; Flags: postinstall [Code] @@ -308,14 +333,14 @@ I: Integer; begin Result := False; - ;msgbox ('Checking Supported Versions ' + Param + ' ' + IntToStr(GetArrayLength(SupportedVersions) ), mbInformation, MB_OK); + //msgbox ('Checking Supported Versions ' + Param + ' ' + IntToStr(GetArrayLength(SupportedVersions) ), mbInformation, MB_OK); for I:=0 to GetArrayLength(SupportedVersions)-1 do begin if Param = SupportedVersions[i] then begin Result := True; - ;msgbox ( 'Is a supported version ' + Param + ' (' + SupportedVersions[i] + ') ' + Param , mbInformation, MB_OK); + //msgbox ( 'Is a supported version ' + Param + ' (' + SupportedVersions[i] + ') ' + Param , mbInformation, MB_OK); end else begin - ;msgbox ( 'Not a supported version ' + Param + ' (' +SupportedVersions[i] + ') ', mbInformation, MB_OK); + //msgbox ( 'Not a supported version ' + Param + ' (' +SupportedVersions[i] + ') ', mbInformation, MB_OK); end; end; end; @@ -339,7 +364,7 @@ templ := ['','']; count := 0; RegGetSubkeyNames(HKEY_LOCAL_MACHINE, 'SOFTWARE\Python\PythonCore', Result1); - ;msgbox ( 'LOCAL MACHINE ' + InttoStr(GetArrayLength(Result1)) , mbInformation, MB_OK); + //msgbox ( 'LOCAL MACHINE ' + InttoStr(GetArrayLength(Result1)) , mbInformation, MB_OK); // if we have versions here process them for i:=0 to GetArrayLength(Result1)-1 do if IsSupportedVersion ( Result1[i] ) then begin // make sure we support it.. @@ -356,7 +381,7 @@ if count < 2 then begin // we've only found zero, or one version so far.. // OK so we should now have all the valid versions listed in LOCAL_MACHINE RegGetSubkeyNames(HKEY_CURRENT_USER, 'SOFTWARE\Python\PythonCore', Result2); - ;msgbox ( 'CURRENT_USER ' + InttoStr(GetArrayLength(Result2)) , mbInformation, MB_OK); + //msgbox ( 'CURRENT_USER ' + InttoStr(GetArrayLength(Result2)) , mbInformation, MB_OK); for i:=0 to GetArrayLength(Result2)-1 do if not FoundPythonIn ( Result2[i], tempv ) then // check we don't already know about this version if IsSupportedVersion (Result2[i]) then begin Modified: trunk/python-ogre/ReportVersion.py =================================================================== --- trunk/python-ogre/ReportVersion.py 2008-09-10 10:36:22 UTC (rev 741) +++ trunk/python-ogre/ReportVersion.py 2008-09-14 00:20:45 UTC (rev 742) @@ -3,7 +3,7 @@ # import os, sys, time, shutil import logging -import BuildModule as bm +#import BuildModule as bm #add environment to the path sys.path.append( '.' ) @@ -30,8 +30,8 @@ 'ogre.renderer.ogrepcz', 'ogre.addons.hydrax' ) # 'ogre.gui.hikari' ) - bm.setupLogging("version.info") # options.logfilename) - logger = logging.getLogger('PythonOgre.ReportVersionInfo') +# bm.setupLogging("version.info") # options.logfilename) +# logger = logging.getLogger('PythonOgre.ReportVersionInfo') for name in moduleList: # logger.info ("Attemping to import " + name ) try: @@ -49,4 +49,5 @@ print " Raw Detail : %s" % (getattr(mod, 'PythonOgreDetail__') ) # logger.info ( "Import Successful: " + basename ) except ImportError: - logger.error ( "Import failed:" + basename ) \ No newline at end of file + print "Import failed:", basename + # logger.error ( "Import failed:" + basename ) Modified: trunk/python-ogre/code_generators/common_utils/ogre_properties.py =================================================================== --- trunk/python-ogre/code_generators/common_utils/ogre_properties.py 2008-09-10 10:36:22 UTC (rev 741) +++ trunk/python-ogre/code_generators/common_utils/ogre_properties.py 2008-09-14 00:20:45 UTC (rev 742) @@ -25,6 +25,25 @@ def __init__( self ): decl_wrappers.name_based_recognizer_t.__init__( self ) + def __get_accessors( self, mem_funs ): + getters = [] + setters = [] + for mem_fun in mem_funs: + print "Checking", mem_fun + if not self.is_accessor( mem_fun ): + print "NOT ACCESSOR" + continue + elif self.is_getter( mem_fun ): + print "IS GETTER" + getters.append( mem_fun ) + elif self.is_setter( mem_fun ): + print "IS SETTER" + setters.append( mem_fun ) + else: + print "CONTINUE" + continue + return ( getters, setters ) + def check_type_compatibility( self, fget, fset ): extendedtypes=['Vector','ColourValue', 'Quaternion', 'Matrix'] if decl_wrappers.name_based_recognizer_t.check_type_compatibility( self, fget, fset ): @@ -64,11 +83,11 @@ def create_read_only_property( self, fget ): found = self.find_out_ro_prefixes( fget.name ) -# print "Prop Check", fget.name, ' ', + print "Prop Check", fget.name, ' ', if found in ( None, '' ): -# print "NO" + print "NO" return None -# print "YES" + print "YES" ## Now we need to look for overlapping function declarations pure_names = [] pure_names.append( fget.name[len( found ):].lower()) Modified: trunk/python-ogre/installWarning.rtf =================================================================== --- trunk/python-ogre/installWarning.rtf 2008-09-10 10:36:22 UTC (rev 741) +++ trunk/python-ogre/installWarning.rtf 2008-09-14 00:20:45 UTC (rev 742) @@ -31,7 +31,7 @@ \par }\pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1659429 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang3081\langfe2052\loch\af0\hich\af0\dbch\af13\cgrid\langnp3081\langfenp2052 { \rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737\charrsid1599737 \hich\af37\dbch\af13\loch\f37 Python-Ogre is about to be installed on your system. \hich\af37\dbch\af13\loch\f37 \par -\par \hich\af37\dbch\af13\loch\f37 P\hich\af37\dbch\af13\loch\f37 lease ensure that you have }{\rtlch\fcs1 \af1 \ltrch\fcs0 \b\f37\insrsid1599737 \hich\af37\dbch\af13\loch\f37 Python 2.5.1}{\rtlch\fcs1 \af1 \ltrch\fcs0 \b\f37\insrsid1599737\charrsid1599737 +\par \hich\af37\dbch\af13\loch\f37 P\hich\af37\dbch\af13\loch\f37 lease ensure that you have }{\rtlch\fcs1 \af1 \ltrch\fcs0 \b\f37\insrsid1599737 \hich\af37\dbch\af13\loch\f37 Python 2.5.2}{\rtlch\fcs1 \af1 \ltrch\fcs0 \b\f37\insrsid1599737\charrsid1599737 \hich\af37\dbch\af13\loch\f37 already installed}{\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737\charrsid1599737 \hich\af37\dbch\af13\loch\f37 \loch\af37\dbch\af13\hich\f37 \endash \hich\af37\dbch\af13\loch\f37 if \hich\af37\dbch\af13\loch\f37 not cancel the installation now and visit }{\field\flddirty{\*\fldinst {\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737\charrsid1599737 \hich\af37\dbch\af13\loch\f37 \hich\af37\dbch\af13\loch\f37 HYPERLINK \hich\af37\dbch\af13\loch\f37 " \hich\af37\dbch\af13\loch\f37 http://\hich\af37\dbch\af13\loch\f37 www.python.org\hich\af37\dbch\af13\loch\f37 "\hich\af37\dbch\af13\loch\f37 }{\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737\charrsid1599737 {\*\datafield @@ -39,12 +39,12 @@ 2e006f00720067002f000000795881f43b1d7f48af2c825dc485276300000000a5ab0000}}}{\fldrslt {\rtlch\fcs1 \af1 \ltrch\fcs0 \cs16\f37\ul\cf2\insrsid1599737\charrsid1599737 \hich\af37\dbch\af13\loch\f37 http://\hich\af37\dbch\af13\loch\f37 www.python.org}}}\sectd \linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid746239\sftnbj {\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737\charrsid1599737 \hich\af37\dbch\af13\loch\f37 \hich\af37\dbch\af13\loch\f37 and download the latest Python binary}{\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737 \hich\af37\dbch\af13\loch\f37 (or directly\hich\af37\dbch\af13\loch\f37 from\hich\af37\dbch\af13\loch\f37 }{\field{\*\fldinst {\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737 \hich\af37\dbch\af13\loch\f37 -\hich\af37\dbch\af13\loch\f37 HYPERLINK \hich\af37\dbch\af13\loch\f37 "}{\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737\charrsid1599737 \hich\af37\dbch\af13\loch\f37 http://www.python.org/ftp/python/2.5.1/python-2.5.1.msi}{\rtlch\fcs1 \af1 \ltrch\fcs0 +\hich\af37\dbch\af13\loch\f37 HYPERLINK \hich\af37\dbch\af13\loch\f37 "}{\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737\charrsid1599737 \hich\af37\dbch\af13\loch\f37 http://python.org/ftp/python/2.5.2/python-2.5.2.msi}{\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737 \hich\af37\dbch\af13\loch\f37 "\hich\af37\dbch\af13\loch\f37 }{\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737\charrsid13506258 {\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b02000000170000003800000068007400740070003a002f002f007700770077002e0070007900740068006f006e002e006f00720067002f006600740070002f0070007900740068006f006e002f0032002e0035002e0031002f0070007900740068006f006e002d0032002e003500 2e0031002e006d00730069000000e0c9ea79f9bace118c8200aa004ba90b8800000068007400740070003a002f002f007700770077002e0070007900740068006f006e002e006f00720067002f006600740070002f0070007900740068006f006e002f0032002e0035002e0031002f0070007900740068006f006e002d0032 002e0035002e0031002e006d00730069000000795881f43b1d7f48af2c825dc485276300000000a5ab0000}}}{\fldrslt {\rtlch\fcs1 \af1 \ltrch\fcs0 \cs16\f37\ul\cf2\insrsid1599737\charrsid13506258 \hich\af37\dbch\af13\loch\f37 -http://www.python.org/ftp/python/2.5.1/python-2.5.1.msi}}}\sectd \linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid746239\sftnbj {\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737 \hich\af37\dbch\af13\loch\f37 ) +http://python.org/ftp/python/2.5.2/python-2.5.2.msi}}}\sectd \linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid746239\sftnbj {\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737 \hich\af37\dbch\af13\loch\f37 ) \par }{\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737\charrsid1599737 \par \hich\af37\dbch\af13\loch\f37 M\hich\af37\dbch\af13\loch\f37 any of the demos will be installed as start menu items}{\rtlch\fcs1 \af1 \ltrch\fcs0 \f37\insrsid1599737 \hich\af37\dbch\af13\loch\f37 . \hich\af37\dbch\af13\loch\f37 It is likely you will most often run them from the command prompt like: Modified: trunk/python-ogre/setup.py =================================================================== --- trunk/python-ogre/setup.py 2008-09-10 10:36:22 UTC (rev 741) +++ trunk/python-ogre/setup.py 2008-09-14 00:20:45 UTC (rev 742) @@ -33,7 +33,7 @@ METADATA = { "name": "Python-Ogre", - "version": "1.1.a", + "version": "1.6.0RC1", "license": "LGPL", "url": "http://python-ogre.python-hosting.com/", "author": "Lakin Wecker, Roman Yakovenko, Andy", @@ -67,7 +67,6 @@ 'ogre.physics.bullet','ogre.physics.PhysX','ogre.physics.NxOgre', 'ogre.physics.OgreBulletC', 'ogre.physics.OgreBulletD', 'ogre.addons','ogre.addons.theora', - # 'ogre.addons.ogrevideoffmpeg', 'ogre.addons.ogredshow', 'ogre.addons.plib', # 'ogre.gui.navi', 'ogre.addons.ogreforests', 'ogre.addons.et', 'ogre.addons.caelum', 'ogre.addons.noise', 'ogre.addons.watermesh', # 'ogre.addons.ofusion', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |