boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-09 23:12:23 +00:00
Code Issues Projects Releases Wiki Activity

better error reporting

Browse Source 
[SVN r13694]
This commit is contained in:
Dave Abrahams
2002-05-06 18:59:11 +00:00
parent 2bf1779f95
commit cdba798a30
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/engine/Jambase
View File

@@ -100,10 +100,13 @@ if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]
#
# boost-build.jam is expected to invoke the "boost-build" rule to
# load the Boost.Build files.
local search-path = $(BOOST_BUILD_PATH) $(BOOST_ROOT) ;
local boost-build-files =
[ find-to-root [ PWD ] : boost-build.jam ]
# Another temporary measure so Jam works with Boost.Build v1
[ GLOB $(BOOST_BUILD_PATH) $(BOOST_ROOT) : boost-build.jam ] ;
[ GLOB $(search-path) : boost-build.jam ] ;
.boost-build-file = $(boost-build-files[1]) ;
@@ -123,7 +126,7 @@ if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]
}
ECHO "Attempted search from" [ PWD ] "up to the root" ;
ECHO "and in these directories from BOOST_BUILD_PATH: "$(BOOST_BUILD_PATH:J=", ")"." ;
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'." ;
}
@@ -142,7 +145,7 @@ if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]
ECHO "Unable to load Boost.Build" ;
ECHO -------------------------- ;
ECHO "\"$(.boost-build-file)\" was found by searching from" [ PWD ] "up to the root" ;
ECHO "and in these directories from BOOST_BUILD_PATH: "$(BOOST_BUILD_PATH:J=", ")"." ;
ECHO "and in these directories from BOOST_BUILD_PATH and BOOST_ROOT: "$(search-path:J=", ")"." ;
ECHO ;
ECHO "However, it failed to call the \"boost-build\" rule to indicate" ;
ECHO "the location of the build system." ;

7
src/engine/jambase.c
View File

@@ -51,9 +51,10 @@ char *jambase[] = {
"if [ 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",
"local boost-build-files =\n",
"[ find-to-root [ PWD ] : boost-build.jam ]\n",
"[ GLOB $(BOOST_BUILD_PATH) $(BOOST_ROOT) : boost-build.jam ] ;\n",
"[ GLOB $(search-path) : boost-build.jam ] ;\n",
".boost-build-file = $(boost-build-files[1]) ;\n",
"if ! $(.boost-build-file)\n",
"{\n",
@@ -67,7 +68,7 @@ char *jambase[] = {
"ECHO ;\n",
"}\n",
"ECHO \"Attempted search from\" [ PWD ] \"up to the root\" ;\n",
"ECHO \"and in these directories from BOOST_BUILD_PATH: \"$(BOOST_BUILD_PATH:J=\", \")\".\" ;\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",
"include $(.boost-build-file) ;\n",
@@ -76,7 +77,7 @@ char *jambase[] = {
"ECHO \"Unable to load Boost.Build\" ;\n",
"ECHO -------------------------- ;\n",
"ECHO \"\\\"$(.boost-build-file)\\\" was found by searching from\" [ PWD ] \"up to the root\" ;\n",
"ECHO \"and in these directories from BOOST_BUILD_PATH: \"$(BOOST_BUILD_PATH:J=\", \")\".\" ;\n",
"ECHO \"and in these directories from BOOST_BUILD_PATH and BOOST_ROOT: \"$(search-path:J=\", \")\".\" ;\n",
"ECHO ;\n",
"ECHO \"However, it failed to call the \\\"boost-build\\\" rule to indicate\" ;\n",
"ECHO \"the location of the build system.\" ;\n",