[Boost-commit] svn:boost r70623 - trunk/tools/build/v2/engine

Subject: [Boost-commit] svn:boost r70623 - trunk/tools/build/v2/engine
From: ghost_at_[hidden]
Date: 2011-03-27 07:25:28

Author: vladimir_prus
Date: 2011-03-27 07:25:24 EDT (Sun, 27 Mar 2011)
New Revision: 70623
URL: http://svn.boost.org/trac/boost/changeset/70623

Log:
Make "b2" binary operate in Boost.Build mode, not classic mode.

Text files modified: 
   trunk/tools/build/v2/engine/Jambase   |     3 ++-                                     
   trunk/tools/build/v2/engine/jambase.c |     3 ++-                                     
   2 files changed, 4 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/engine/Jambase
==============================================================================
--- trunk/tools/build/v2/engine/Jambase	(original)
+++ trunk/tools/build/v2/engine/Jambase	2011-03-27 07:25:24 EDT (Sun, 27 Mar 2011)
@@ -118,7 +118,8 @@
 }
 
 
-if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]
+if [ MATCH .*(b2).* : $(ARGV[1]:BL) ] 
+  || [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]
   || $(BOOST_ROOT)    # A temporary measure so Jam works with Boost.Build v1.
 {
     # We attempt to load "boost-build.jam" by searching from the current

Modified: trunk/tools/build/v2/engine/jambase.c
==============================================================================
--- trunk/tools/build/v2/engine/jambase.c	(original)
+++ trunk/tools/build/v2/engine/jambase.c	2011-03-27 07:25:24 EDT (Sun, 27 Mar 2011)
@@ -64,7 +64,8 @@
 "}\n",
 "include $(.bootstrap-file) ;\n",
 "}\n",
-"if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]\n",
+"if [ MATCH .*(b2).* : $(ARGV[1]:BL) ] \n",
+"|| [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]\n",
 "|| $(BOOST_ROOT)    # A temporary measure so Jam works with Boost.Build v1.\n",
 "{\n",
 "local search-path = $(BOOST_BUILD_PATH) $(BOOST_ROOT) ;\n",