boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 13:22:11 +00:00
Code Issues Projects Releases Wiki Activity

Perform bjam-relative search for Boost.Build proper.

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


[SVN r64165]
This commit is contained in:
Vladimir Prus
2010-07-19 19:32:32 +00:00
parent 97aa32c375
commit bd52f96103
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
v2/engine/src/Jambase
View File

@@ -128,9 +128,13 @@ if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]
# 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 @@ if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]
}
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'." ;
}

5
v2/engine/src/jambase.c
View File

@@ -68,8 +68,12 @@ char *jambase[] = {
"|| $(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 @@ char *jambase[] = {
"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",