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

Subject: [Boost-commit] svn:boost r64165 - trunk/tools/build/v2/engine/src
From: ghost_at_[hidden]
Date: 2010-07-19 15:32:33

Author: vladimir_prus
Date: 2010-07-19 15:32:32 EDT (Mon, 19 Jul 2010)
New Revision: 64165
URL: http://svn.boost.org/trac/boost/changeset/64165

Log:
Perform bjam-relative search for Boost.Build proper.

This allows to make installed Boost.Build work without
setting any environment variables or config files.

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

Modified: trunk/tools/build/v2/engine/src/Jambase
==============================================================================
--- trunk/tools/build/v2/engine/src/Jambase	(original)
+++ trunk/tools/build/v2/engine/src/Jambase	2010-07-19 15:32:32 EDT (Mon, 19 Jul 2010)
@@ -128,9 +128,13 @@
     # Boost.Build files.
 
     local search-path = $(BOOST_BUILD_PATH) $(BOOST_ROOT) ;
+    local self = [ SELF_PATH ] ;
+    local boost-build-relative = ../../share/boost-build ;
+    local self-based-path = [ NORMALIZE_PATH $(boost-build-relative:R=$(self)) ] ;
 
     local boost-build-files =
         [ find-to-root [ PWD ] : boost-build.jam ]
+        [ GLOB $(self-based-path) : boost-build.jam ]
         # Another temporary measure so Jam works with Boost.Build v1.
         [ GLOB $(search-path) : boost-build.jam ] ;
 
@@ -152,6 +156,7 @@
         }
 
         ECHO "Attempted search from" [ PWD ] "up to the root" ;
+        ECHO "at" $(self-based-path) ;
         ECHO "and in these directories from BOOST_BUILD_PATH and BOOST_ROOT: "$(search-path:J=", ")"." ;
         EXIT "Please consult the documentation at 'http://www.boost.org'." ;
     }

Modified: trunk/tools/build/v2/engine/src/jambase.c
==============================================================================
--- trunk/tools/build/v2/engine/src/jambase.c	(original)
+++ trunk/tools/build/v2/engine/src/jambase.c	2010-07-19 15:32:32 EDT (Mon, 19 Jul 2010)
@@ -68,8 +68,12 @@
 "|| $(BOOST_ROOT)    # A temporary measure so Jam works with Boost.Build v1.\n",
 "{\n",
 "local search-path = $(BOOST_BUILD_PATH) $(BOOST_ROOT) ;\n",
+"local self = [ SELF_PATH ] ;\n",
+"local boost-build-relative = ../../share/boost-build ;\n",
+"local self-based-path = [ NORMALIZE_PATH $(boost-build-relative:R=$(self)) ] ;\n",
 "local boost-build-files =\n",
 "[ find-to-root [ PWD ] : boost-build.jam ]\n",
+"[ GLOB $(self-based-path) : boost-build.jam ]\n",
 "[ GLOB $(search-path) : boost-build.jam ] ;\n",
 ".boost-build-file = $(boost-build-files[1]) ;\n",
 "if ! $(.boost-build-file)\n",
@@ -84,6 +88,7 @@
 "ECHO ;\n",
 "}\n",
 "ECHO \"Attempted search from\" [ PWD ] \"up to the root\" ;\n",
+"ECHO \"at\" $(self-based-path) ;\n",
 "ECHO \"and in these directories from BOOST_BUILD_PATH and BOOST_ROOT: \"$(search-path:J=\", \")\".\" ;\n",
 "EXIT \"Please consult the documentation at 'http://www.boost.org'.\" ;\n",
 "}\n",