From 1f2d140db40147d2504334940eacb04c680acce4 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Mon, 6 May 2002 06:44:24 +0000 Subject: [PATCH] Minor fixes. * jam_src/Jambase: Now really downcase $(ARGV[1]). * jam_src/compile.c: Fix formatting, now that 'lol_print' don't insert space at the end. * jam_src/jambase.c: Regenerated. [SVN r13676] --- historic/jam/src/Jambase | 2 +- historic/jam/src/compile.c | 4 ++-- historic/jam/src/jambase.c | 2 +- jam_src/Jambase | 2 +- jam_src/compile.c | 4 ++-- jam_src/jambase.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/historic/jam/src/Jambase b/historic/jam/src/Jambase index facd664c1..cb3adcca0 100644 --- a/historic/jam/src/Jambase +++ b/historic/jam/src/Jambase @@ -80,7 +80,7 @@ rule record-file-location ( file : location ) file-location.$(file:G=) = $(location) ; } -if [ MATCH .*(bjam).* : $(ARGV[1]:B:L) ] +if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ] || $(BOOST_ROOT) # A temporary measure so Jam works with Boost.Build v1 { # Another temporary measure so Jam works with Boost.Build v1 diff --git a/historic/jam/src/compile.c b/historic/jam/src/compile.c index 197a9e557..f23a79fd4 100644 --- a/historic/jam/src/compile.c +++ b/historic/jam/src/compile.c @@ -574,9 +574,9 @@ static void argument_error( char* message, RULE* rule, FRAME* frame, LIST* arg ) backtrace_line( frame->prev ); printf( "*** argument error\n* rule %s ( ", frame->rulename ); lol_print( rule->arguments->data ); - printf( ")\n* called with: ( " ); + printf( " )\n* called with: ( " ); lol_print( actual ); - printf( ")\n* %s %s\n", message, arg ? arg->string : "" ); + printf( " )\n* %s %s\n", message, arg ? arg->string : "" ); print_source_line( rule->procedure ); printf( "see definition of rule '%s' being called\n", rule->name ); backtrace( frame->prev ); diff --git a/historic/jam/src/jambase.c b/historic/jam/src/jambase.c index 66de9e10a..3b11a39f4 100644 --- a/historic/jam/src/jambase.c +++ b/historic/jam/src/jambase.c @@ -40,7 +40,7 @@ char *jambase[] = { "{\n", "file-location.$(file:G=) = $(location) ;\n", "}\n", -"if [ MATCH .*(bjam).* : $(ARGV[1]:B:L) ]\n", +"if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]\n", "|| $(BOOST_ROOT) # A temporary measure so Jam works with Boost.Build v1\n", "{\n", "BOOST_BUILD_PATH ?= $(BOOST_ROOT)/tools/build ;\n", diff --git a/jam_src/Jambase b/jam_src/Jambase index facd664c1..cb3adcca0 100644 --- a/jam_src/Jambase +++ b/jam_src/Jambase @@ -80,7 +80,7 @@ rule record-file-location ( file : location ) file-location.$(file:G=) = $(location) ; } -if [ MATCH .*(bjam).* : $(ARGV[1]:B:L) ] +if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ] || $(BOOST_ROOT) # A temporary measure so Jam works with Boost.Build v1 { # Another temporary measure so Jam works with Boost.Build v1 diff --git a/jam_src/compile.c b/jam_src/compile.c index 197a9e557..f23a79fd4 100644 --- a/jam_src/compile.c +++ b/jam_src/compile.c @@ -574,9 +574,9 @@ static void argument_error( char* message, RULE* rule, FRAME* frame, LIST* arg ) backtrace_line( frame->prev ); printf( "*** argument error\n* rule %s ( ", frame->rulename ); lol_print( rule->arguments->data ); - printf( ")\n* called with: ( " ); + printf( " )\n* called with: ( " ); lol_print( actual ); - printf( ")\n* %s %s\n", message, arg ? arg->string : "" ); + printf( " )\n* %s %s\n", message, arg ? arg->string : "" ); print_source_line( rule->procedure ); printf( "see definition of rule '%s' being called\n", rule->name ); backtrace( frame->prev ); diff --git a/jam_src/jambase.c b/jam_src/jambase.c index 66de9e10a..3b11a39f4 100644 --- a/jam_src/jambase.c +++ b/jam_src/jambase.c @@ -40,7 +40,7 @@ char *jambase[] = { "{\n", "file-location.$(file:G=) = $(location) ;\n", "}\n", -"if [ MATCH .*(bjam).* : $(ARGV[1]:B:L) ]\n", +"if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]\n", "|| $(BOOST_ROOT) # A temporary measure so Jam works with Boost.Build v1\n", "{\n", "BOOST_BUILD_PATH ?= $(BOOST_ROOT)/tools/build ;\n",