[Boost-commit] svn:boost r66616 - in branches/release/tools/build/v2: build engine/src

Subject: [Boost-commit] svn:boost r66616 - in branches/release/tools/build/v2: build engine/src
From: ghost_at_[hidden]
Date: 2010-11-16 18:02:38

Author: vladimir_prus
Date: 2010-11-16 18:02:36 EST (Tue, 16 Nov 2010)
New Revision: 66616
URL: http://svn.boost.org/trac/boost/changeset/66616

Log:
Merge the fix for -q and configuration checks.

Text files modified: 
   branches/release/tools/build/v2/build/configure.jam   |     3 ++-                                     
   branches/release/tools/build/v2/engine/src/builtins.c |    16 +++++++++++++++-                        
   2 files changed, 17 insertions(+), 2 deletions(-)

Modified: branches/release/tools/build/v2/build/configure.jam
==============================================================================
--- branches/release/tools/build/v2/build/configure.jam	(original)
+++ branches/release/tools/build/v2/build/configure.jam	2010-11-16 18:02:36 EST (Tue, 16 Nov 2010)
@@ -141,7 +141,8 @@
         else 
         {           
             local x = [ PAD "    - $(what)" : $(.width) ] ;            
-            if [ UPDATE_NOW $(jam-targets) : $(.log-fd) : ignore-minus-n ] 
+            if [ UPDATE_NOW $(jam-targets) :
+                 $(.log-fd) : ignore-minus-n : ignore-minus-q ] 
             {
                 .$(what)-supported.$(ps) = yes ;
                 result = true ;

Modified: branches/release/tools/build/v2/engine/src/builtins.c
==============================================================================
--- branches/release/tools/build/v2/engine/src/builtins.c	(original)
+++ branches/release/tools/build/v2/engine/src/builtins.c	2010-11-16 18:02:36 EST (Tue, 16 Nov 2010)
@@ -202,7 +202,8 @@
       {
           char * args[] = { "targets", "*", 
                             ":", "log", "?",
-                            ":", "ignore-minus-n", "?", 0 };
+                            ":", "ignore-minus-n", "?", 
+                            ":", "ignore-minus-q", "?", 0 };
           bind_builtin( "UPDATE_NOW",
                         builtin_update_now, 0, args );
       }
@@ -1319,6 +1320,7 @@
     LIST * targets = lol_get( frame->args, 0 );
     LIST * log = lol_get( frame->args, 1 );
     LIST * force = lol_get (frame->args, 2);
+    LIST * continue_ = lol_get(frame->args, 3);
     int status = 0;
     int original_stdout;
     int original_stderr;
@@ -1327,6 +1329,7 @@
     const char** targets2;
     int i;
     int original_noexec;
+    int original_quitquick;
         
 
     if (log)
@@ -1345,6 +1348,12 @@
         globs.noexec = 0;
     }
 
+    if (continue_)
+    {
+        original_quitquick = globs.quitquick;
+        globs.quitquick = 0;
+    }
+
     targets_count = list_length( targets );
     targets2 = (const char * *)BJAM_MALLOC( targets_count * sizeof( char * ) );    
     for (i = 0 ; targets; targets = list_next( targets ) )
@@ -1357,6 +1366,11 @@
         globs.noexec = original_noexec;
     }
 
+    if (continue_)
+    {
+        globs.quitquick = original_quitquick;
+    }
+
     if (log)
     {
         /* Flush whatever stdio might have buffered, while descriptions