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

[<mi...@us...>]

Revision: 649
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=649&view=rev
Author:   mithro
Date:     2008-07-15 17:59:00 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
Added ability to build a stable version without clobbering Andy.

Modified Paths:
--------------
    trunk/python-ogre/PythonOgreConfig_system.py
    trunk/python-ogre/environment.py
    trunk/python-ogre/scripts/build-deb.sh

Property Changed:
----------------
    trunk/python-ogre/


Property changes on: trunk/python-ogre
___________________________________________________________________
Name: svn:ignore
   - python-ogre.sln
python-ogre.suo
python-ogre.ncb
Release
*.pyc
log.out
build_dir_2.5
downloads
build
build-stamp

   + python-ogre.sln
python-ogre.suo
python-ogre.ncb
Release
*.pyc
log.out
build_dir_2.5
downloads
build
build-stamp
STABLE


Modified: trunk/python-ogre/PythonOgreConfig_system.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_system.py	2008-07-15 18:49:08 UTC (rev 648)
+++ trunk/python-ogre/PythonOgreConfig_system.py	2008-07-16 00:59:00 UTC (rev 649)
@@ -14,8 +14,6 @@
 PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost')
 ## Path to your boost_pythonxxxx lib file
 PATH_LIB_Boost = LOCAL_LIB
-## and the name of the boost python library
-LIB_Boost = 'libboost_python-gcc42-mt-1_34_1'
 
 # in Linux we need to code in the Relative path for the library
 RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') #+ '\'' 

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-07-15 18:49:08 UTC (rev 648)
+++ trunk/python-ogre/environment.py	2008-07-16 00:59:00 UTC (rev 649)
@@ -17,9 +17,7 @@
 
 _LOGGING_ON = False
 _PreCompiled = True
-_STABLE = False # set to true if using specific versions of CVS and SVN checkouts..
 
-
 ##
 ## set this to True if you compiled Ogre with Threads enabled
 ##
@@ -127,7 +125,9 @@
     ## 
     print "\n\n You DO need to create a PythonOgreConfig_%s.py file with config details" % ( _SystemType)
     sys.exit(-1)
-    
+
+_STABLE = os.path.exists("STABLE") # set to true if using specific versions of CVS and SVN checkouts..
+
 ######################
 downloadPath = os.path.abspath("downloads") 
 wget = "wget -c -nc "
@@ -451,12 +451,12 @@
     pythonModule = False
     ModuleName = ""
     # AJM Changed so stable is 1.35 as this seems fine....
-#     if _STABLE:
-#         base = 'boost_1_34_1'
-#         lib= 'boost_python-vc90-mt-1_34_1'
-#     else:        
-    base = 'boost_1_35_0'  
-    lib = 'boost_python-vc90-mt-1_35'
+    if _STABLE:
+        base = 'boost_1_34_1'
+        lib= 'boost_python-vc90-mt-1_34_1'
+    else:        
+        base = 'boost_1_35_0'  
+        lib = 'boost_python-vc90-mt-1_35'
         
     if isLinux() or isMac():
         bjambase = 'boost-jam-3.1.16'

Modified: trunk/python-ogre/scripts/build-deb.sh
===================================================================
--- trunk/python-ogre/scripts/build-deb.sh	2008-07-15 18:49:08 UTC (rev 648)
+++ trunk/python-ogre/scripts/build-deb.sh	2008-07-16 00:59:00 UTC (rev 649)
@@ -36,6 +36,11 @@
 	sudo apt-get install libceguiogre-dev
 fi
 
+# Make sure we are building the stable version
+cd python-ogre
+touch STABLE
+cd ..
+
 # Things we need to build ourself
 
 # The extra boost support module


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