From cdba798a30fc240111dce5a4b9bc91304c032d3f Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Mon, 6 May 2002 18:59:11 +0000 Subject: [PATCH] better error reporting [SVN r13694] --- src/engine/Jambase | 9 ++++++--- src/engine/jambase.c | 7 ++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/engine/Jambase b/src/engine/Jambase index 7e5944f3b..ad3c161a7 100644 --- a/src/engine/Jambase +++ b/src/engine/Jambase @@ -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." ; diff --git a/src/engine/jambase.c b/src/engine/jambase.c index f71321036..d39721653 100644 --- a/src/engine/jambase.c +++ b/src/engine/jambase.c @@ -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",