Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27896/tools/build/v2/tools
Modified Files:
Tag: RC_1_34_0
python.jam
Log Message:
Relieve need to explicitly configure Python
Index: python.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/python.jam,v
retrieving revision 1.12.2.50
retrieving revision 1.12.2.51
diff -u -d -r1.12.2.50 -r1.12.2.51
--- python.jam 2 Apr 2007 00:51:15 -0000 1.12.2.50
+++ python.jam 6 Apr 2007 18:17:43 -0000 1.12.2.51
@@ -98,8 +98,6 @@
rule init ( version ? : cmd-or-prefix ? : includes ? : libraries ?
: condition * : extension-suffix ? )
{
- .configured = true ;
-
project.push-current $(.project) ;
debug-message Configuring python... ;
@@ -120,7 +118,7 @@
# returns nothing if there's an error.
local rule shell-cmd ( cmd )
{
- # debug-message running command '$(cmd)' ;
+ debug-message running command '$(cmd)" 2>&1"' ;
x = [ SHELL $(cmd)" 2>&1" : exit-status ] ;
if $(x[2]) = 0
{
@@ -709,6 +707,10 @@
}
}
+ # Values to use in case we can't really find anything in the system.
+ local fallback-cmd = $(cmds-to-try[1]) ;
+ local fallback-version ;
+
# Anything left to find or check?
if ! ( $(interpreter-cmd) && $(includes) && $(libraries) )
{
@@ -727,9 +729,7 @@
case windows : platform = win32 ;
case cygwin : platform = cygwin ;
}
-
- local fallback-cmd = $(cmds-to-try[1]) ;
- local fallback-version ;
+
while $(cmds-to-try)
{
# pop top command
@@ -774,25 +774,29 @@
debug-message ...does not invoke a working interpreter ;
}
}
+ }
+
+ # Anything left to compute?
+ if $(includes) && $(libraries)
+ {
+ .configured = true ;
+ }
+ else
+ {
+ version ?= $(fallback-version) ;
+ version ?= 2.5 ;
+ exec-prefix ?= $(prefix) ;
+ compute-default-paths $(target-os) : $(version) : $(prefix:E=) ;
+ }
- # Anything left to compute?
- if ! ( $(includes) && $(libraries) && $(interpreter-cmd) )
+ if ! $(interpreter-cmd)
+ {
+ fallback-cmd ?= python ;
+ debug-message No working Python interpreter found. ;
+ if [ os.name ] != NT || ! [ invokes-cygwin-symlink $(fallback-cmd) ]
{
- version ?= $(fallback-version) ;
- version ?= 2.5 ;
-
- if ! $(interpreter-cmd)
- {
- fallback-cmd ?= python ;
- ECHO warning: No working Python interpreter found. ;
- if [ os.name ] != NT || ! [ invokes-cygwin-symlink
$(fallback-cmd) ]
- {
- interpreter-cmd = $(fallback-cmd) ;
- ECHO warning: falling back to \"$(interpreter-cmd)\" ;
- }
- }
- exec-prefix ?= $(prefix) ;
- compute-default-paths $(target-os) : $(version) : $(prefix:E=) ;
+ interpreter-cmd = $(fallback-cmd) ;
+ debug-message falling back to \"$(interpreter-cmd)\" ;
}
}
-------------------------------------------------------------------------
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
