From ca16487d09f8cf98589330954ccdb96f263737fb Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Thu, 2 May 2002 16:36:30 +0000 Subject: [PATCH] Moved project loading to build-system.jam [SVN r13614] --- doc/boost-build.jam | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/doc/boost-build.jam b/doc/boost-build.jam index 3ea4f3e79..1a8b6ac6a 100644 --- a/doc/boost-build.jam +++ b/doc/boost-build.jam @@ -14,13 +14,11 @@ IMPORT modules : import : : import ; # import modules ; -import doc ; -import project ; - # Check to see if the user is asking for help as soon as possible. # This is first action, so that we can interrupt the regular build # process if they are asking for help. # +import doc ; if [ doc.help ] { # Do nothing, the doc system will generate the appropriate @@ -33,6 +31,12 @@ else { # No help requested, go ahead and load and build the users # project. - import build-system ; - project.load [ PWD ] ; + + # Allow users to override the build system file from the + # command-line (mostly for testing) + local build-system = [ MATCH --build-system=(.*) : $(ARGV) ] ; + build-system ?= build-system ; + + # Use last element in case of multiple command-line options + import $(build-system[-2]) ; }