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

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

Revision: 704
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=704&view=rev
Author:   mithro
Date:     2008-08-20 10:01:18 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
Make deb install both multithreaded and non-multithreaded versions.
Fixed deb building when building against boost 1.35.1 (and other versions).

Modified Paths:
--------------
    trunk/python-ogre/BuildModule.py
    trunk/python-ogre/boost/debian/control
    trunk/python-ogre/boost/debian/dsc
    trunk/python-ogre/boost/debian/rules
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py	2008-08-20 09:59:34 UTC (rev 703)
+++ trunk/python-ogre/BuildModule.py	2008-08-20 10:01:18 UTC (rev 704)
@@ -179,12 +179,12 @@
                 exit("Was not able to copy the debian directory over")
    
     # Rewrite any place holders
-    ret = spawnTask( "sed --in-place "+debiandir+"/changelog -e \"s|%%SHORTDATE%%|`date +%Y%m%d`|\" -e \"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|\"", srcdir)
-    if ret != 0:
-        exit("Was not able to update the debian change log.")
-    ret = spawnTask( "sed --in-place "+debiandir+"/control -e \"s|%%SHORTDATE%%|`date +%Y%m%d`|\" -e \"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|\"", srcdir)
-    if ret != 0:
-        exit("Was not able to update the debian control file.")
+    for file in os.listdir(debiandir):
+      if not os.path.isfile(os.path.join(debiandir, file)):
+        continue
+      ret = spawnTask( "sed --in-place "+os.path.join(debiandir,file)+" -e\"s|%%SHORTDATE%%|`date +%Y%m%d`|\" -e\"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|\" -e\"s|%%VERSION%%|"+module.source_version+"|\"", srcdir)
+      if ret != 0:
+          exit("Was not able to update the debian change log.")
  
     # Check that all the dependencies for this package are avaliable
     c = StringIO()
@@ -304,5 +304,3 @@
                     compileCode ( classList[ moduleName ] )
                 else:
                     print ( "Module specificed does not need compiling (%s is a supporting module)" % moduleName )
-            
-                

Modified: trunk/python-ogre/boost/debian/control
===================================================================
--- trunk/python-ogre/boost/debian/control	2008-08-20 09:59:34 UTC (rev 703)
+++ trunk/python-ogre/boost/debian/control	2008-08-20 10:01:18 UTC (rev 704)
@@ -1,20 +1,20 @@
-Source: boost-python1.34.1-index
+Source: boost-python%%VERSION%%-index
 Priority: extra
 Maintainer: Tim Ansell <tim@unknown>
-Build-Depends: debhelper (>= 5), libboost-python-dev (>= 1.34), libstdc++6-4.1-dev | libstdc++6-4.2-dev, python-dev
+Build-Depends: debhelper (>= 5), libboost-python-dev (>= %%VERSION%%), libstdc++6-4.1-dev | libstdc++6-4.2-dev, python-dev
 Standards-Version: 3.7.2
 Section: libs
 
-Package: libboost-python1.34.1-index-dev
+Package: libboost-python%%VERSION%%-index-dev
 Section: libdevel
 Architecture: any
-Depends: libboost-python1.34.1-index (= ${Source-Version})
+Depends: libboost-python%%VERSION%%-index (= ${Source-Version})
 Description: Extra index stuff for boost-python
  This package is the extra index stuff needed by python-ogre (and possibly
  others). It does not refer to a real upstream object, we expect this to go way
  once boost-python is updated.
 
-Package: libboost-python1.34.1-index
+Package: libboost-python%%VERSION%%-index
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

Modified: trunk/python-ogre/boost/debian/dsc
===================================================================
--- trunk/python-ogre/boost/debian/dsc	2008-08-20 09:59:34 UTC (rev 703)
+++ trunk/python-ogre/boost/debian/dsc	2008-08-20 10:01:18 UTC (rev 704)
@@ -1,6 +1,6 @@
 Format: 1.0
-Source: boost-python1.34.1-index
-Binary: libboost-python1.34.1-index-dev, libboost-python1.34.1-index
+Source: boost-python%%VERSION%%-index
+Binary: libboost-python%%VERSION%%-index-dev, libboost-python%%VERSION%%-index
 Architecture: any
 Version: 0.0.0-1
 Maintainer: Tim 'Mithro' Ansell <mi...@mi...>

Modified: trunk/python-ogre/boost/debian/rules
===================================================================
--- trunk/python-ogre/boost/debian/rules	2008-08-20 09:59:34 UTC (rev 703)
+++ trunk/python-ogre/boost/debian/rules	2008-08-20 10:01:18 UTC (rev 704)
@@ -11,6 +11,7 @@
 export DH_COMPAT=2
 export GCC_VERSION=`gcc --version | head -1 | sed -e's/.*) \([0-9]\)\.\([0-9]\).*/\1\2/'`
 export PYTHON_VERSION=`python -V 2>&1 | sed -e's/Python \(2\.[45]\).*/\1/'`
+export BOOST_VERSION=`echo %%VERSION%% | sed -e's/\./_/g'`
 
 # shared library versions, option 1
 #version=2.0.5
@@ -33,6 +34,7 @@
 	dh_testdir
 	
 	make all
+	make all MT=True
 	
 	touch $@
 
@@ -53,7 +55,8 @@
 	dh_installdirs
 	
 	# Add here commands to install the package into debian/tmp
-	PREFIX=$(CURDIR)/debian/tmp make install
+	make install PREFIX=$(CURDIR)/debian/tmp
+	make install PREFIX=$(CURDIR)/debian/tmp MT=True
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -67,8 +70,8 @@
 	dh_installdocs
 	dh_installexamples
 	
-	dh_movefiles -plibboost-python1.34.1-index-dev /usr/include/boost
-	dh_movefiles -plibboost-python1.34.1-index     /usr/lib	
+	dh_movefiles -plibboost-python%%VERSION%%-index-dev /usr/include/boost
+	dh_movefiles -plibboost-python%%VERSION%%-index     /usr/lib	
 	
 #	dh_install
 #	dh_installmenu

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-08-20 09:59:34 UTC (rev 703)
+++ trunk/python-ogre/environment.py	2008-08-20 10:01:18 UTC (rev 704)
@@ -304,10 +304,12 @@
     active = True
     base = 'pyplusplus'
     if _STABLE:
+        source_version = "1300"
         source = [
                     [svn, " co -r 1300 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
                  ]
     else:                 
+        source_version = "1362"
         source = [
                     [svn, " co -r 1362 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
                  ]             
@@ -518,12 +520,12 @@
 
 class boost_python_index:
     active = True
-    version = boost.base[6:]
+    source_version = boost.base[6:].replace("_",".")
     pythonModule = False
     ModuleName = ""
-    base = "libboost-python%s-index" % version.replace("_",".")
+    base = "libboost-python%s-index" % source_version #.replace(".", "_")
     if isLinux() or isMac():
-        FLAGS = "PREFIX=%s BOOST_VERSION=%s MT=True" % (PREFIX, version)
+        FLAGS = "PREFIX=%s BOOST_VERSION=%s MT=True" % (PREFIX, source_version)
         source = [
              ["rm","-rf %s" % (base,), os.getcwd()],
              ["cp",'-rvf %s/ %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()],
@@ -1766,4 +1768,3 @@
             cls.PydName = cls.PydName + '.so'
         elif os.name =='mac':
             print "WARNING - check the last line of environment.py!!"
-


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