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

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

Revision: 584
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=584&view=rev
Author:   andy_miller
Date:     2008-04-14 22:26:49 -0700 (Mon, 14 Apr 2008)

Log Message:
-----------
Fix for latest version of boost 1-35...

Modified Paths:
--------------
    trunk/python-ogre/boost/libs/python/build/Jamfile.v2

Removed Paths:
-------------
    trunk/python-ogre/boost/tools/

Modified: trunk/python-ogre/boost/libs/python/build/Jamfile.v2
===================================================================
--- trunk/python-ogre/boost/libs/python/build/Jamfile.v2	2008-04-05 07:54:56 UTC (rev 583)
+++ trunk/python-ogre/boost/libs/python/build/Jamfile.v2	2008-04-15 05:26:49 UTC (rev 584)
@@ -22,12 +22,13 @@
     }
 }
 
-if [ python.configured ] {
-
 project boost/python
-    : source-location ../src
-    ;
+  : source-location ../src
+  ;
 
+rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
+rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
+
 lib boost_python
     : # sources
     numeric.cpp
@@ -58,8 +59,10 @@
     wrapper.cpp
     import.cpp
     exec.cpp
+    object/function_doc_signature.cpp
     indexing/indexing_slice.cpp
     indexing/python_iterator.cpp    
+
     :   # requirements
         <link>static:<define>BOOST_PYTHON_STATIC_LIB 
         <define>BOOST_PYTHON_SOURCE
@@ -76,19 +79,19 @@
         # python_for_extensions is a target defined by Boost.Build to
         # provide the Python include paths, and on Windows, the Python
         # import library, as usage requirements.
-        <library>/python//python_for_extensions
-      
+        [ cond [ python.configured ] : <library>/python//python_for_extensions ]
+        
+        # we prevent building when there is no python available
+        # as it's not possible anyway, and to cause dependents to
+        # fail to build
+        [ unless [ python.configured ] : <build>no ]
+
         <python-debugging>on:<define>BOOST_DEBUG_PYTHON
-      
     :   # default build
         <link>shared
     :   # usage requirements
         <link>static:<define>BOOST_PYTHON_STATIC_LIB
         <python-debugging>on:<define>BOOST_DEBUG_PYTHON
     ;
-}
-else
-{
-    ECHO "warning: Python location is not configured" ;
-    ECHO "warning: the Boost.Python library won't be built" ;
-}
+
+boost-install boost_python ;


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