Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2043/tools/build/v2/tools
Modified Files:
Tag: RC_1_34_0
python.jam
Log Message:
Make sure sys.platform isn't required
Update darwin handler so it will fall back to the standard *nix method
if Python isn't installed as a framework.
Index: python.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/python.jam,v
retrieving revision 1.12.2.37
retrieving revision 1.12.2.38
diff -u -d -r1.12.2.37 -r1.12.2.38
--- python.jam 16 Mar 2007 23:05:14 -0000 1.12.2.37
+++ python.jam 16 Mar 2007 23:26:35 -0000 1.12.2.38
@@ -620,7 +620,7 @@
# Declare a target to represent Python's library, returning the target
# name.
-local rule declare-libpython-target ( version ? : sys.platform : requirements
* )
+local rule declare-libpython-target ( version ? : sys.platform ? :
requirements * )
{
# Compute the representation of Python version in the name of
# Python's library file.
@@ -802,17 +802,35 @@
}
}
- # Declare the "python" target. This should really be called
python_for_embedding
+ # See if we can find a framework directory on darwin
+ local framework-directory ;
if $(target-os) = darwin
{
# Search upward for the framework directory
- local fwk = $(libraries[-1]) ;
- while $(fwk:D=) && $(fwk:D=) != Python.framework
+ local framework-directory = $(libraries[-1]) ;
+ while $(framework-directory:D=) && $(framework-directory:D=) !=
Python.framework
{
- fwk = $(fwk:D) ;
+ framework-directory = $(framework-directory:D) ;
}
- debug-message framework directory is \"$(fwk)\" ;
+ if $(framework-directory) = Python.framework
+ {
+ debug-message framework directory is \"$(fwk)\" ;
+ }
+ else
+ {
+ debug-message no framework directory found; using library path ;
+ framework-directory = ;
+ }
+ }
+
+ #
+ # Declare the "python" target. This should really be called
+ # python_for_embedding
+ #
+
+ if $(framework-directory)
+ {
alias python
:
: $(target-requirements)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
