[Boost-commit] svn:boost r65047 - in branches/release: . boost tools/jam tools/jam/doc tools/jam/src

Subject: [Boost-commit] svn:boost r65047 - in branches/release: . boost tools/jam tools/jam/doc tools/jam/src
From: dnljms_at_[hidden]
Date: 2010-08-26 19:20:06

Author: danieljames
Date: 2010-08-26 19:20:02 EDT (Thu, 26 Aug 2010)
New Revision: 65047
URL: http://svn.boost.org/trac/boost/changeset/65047

Log:
Fix jam changes accidentally included in previous merge.

Properties modified: 
   branches/release/boost/version.hpp   (props changed)
   branches/release/index.html   (props changed)
   branches/release/tools/jam/   (props changed)
Text files modified: 
   branches/release/tools/jam/doc/bjam.qbk       |     4 ++--                                    
   branches/release/tools/jam/src/boost-jam.spec |     2 +-                                      
   branches/release/tools/jam/src/build.jam      |     2 +-                                      
   branches/release/tools/jam/src/builtins.c     |     3 ---                                     
   branches/release/tools/jam/src/builtins.h     |     1 -                                       
   branches/release/tools/jam/src/execunix.c     |     4 ++++                                    
   branches/release/tools/jam/src/jam.c          |     4 ----                                    
   branches/release/tools/jam/src/patchlevel.h   |     6 +++---                                  
   8 files changed, 11 insertions(+), 15 deletions(-)

Modified: branches/release/tools/jam/doc/bjam.qbk
==============================================================================
--- branches/release/tools/jam/doc/bjam.qbk	(original)
+++ branches/release/tools/jam/doc/bjam.qbk	2010-08-26 19:20:02 EDT (Thu, 26 Aug 2010)
@@ -1,6 +1,6 @@
 [article Boost.Jam
     [quickbook 1.3]
-    [version: 3.1.19]
+    [version: 3.1.18]
     [authors [Rivera, Rene], [Abrahams, David], [Prus, Vladimir]]
     [copyright 2003 2004 2005 2006 2007 Rene Rivera, David Abrahams, Vladimir Prus]
     [category tool-build]
@@ -21,7 +21,7 @@
 
 [/ Shortcuts ]
 
-[def :version: 3.1.19]
+[def :version: 3.1.18]
 
 [/ Images ]
 

Modified: branches/release/tools/jam/src/boost-jam.spec
==============================================================================
--- branches/release/tools/jam/src/boost-jam.spec	(original)
+++ branches/release/tools/jam/src/boost-jam.spec	2010-08-26 19:20:02 EDT (Thu, 26 Aug 2010)
@@ -1,5 +1,5 @@
 Name: boost-jam
-Version: 3.1.19
+Version: 3.1.18
 Summary: Build tool
 Release: 1
 Source: %{name}-%{version}.tgz

Modified: branches/release/tools/jam/src/build.jam
==============================================================================
--- branches/release/tools/jam/src/build.jam	(original)
+++ branches/release/tools/jam/src/build.jam	2010-08-26 19:20:02 EDT (Thu, 26 Aug 2010)
@@ -27,7 +27,7 @@
 ./ ?= "" ;
 
 # Info about what we are building.
-_VERSION_ = 3 1 19 ;
+_VERSION_ = 3 1 18 ;
 NAME = boost-jam ;
 VERSION = $(_VERSION_:J=$(.)) ;
 RELEASE = 1 ;

Modified: branches/release/tools/jam/src/builtins.c
==============================================================================
--- branches/release/tools/jam/src/builtins.c	(original)
+++ branches/release/tools/jam/src/builtins.c	2010-08-26 19:20:02 EDT (Thu, 26 Aug 2010)
@@ -1293,7 +1293,6 @@
 }
 
 extern int anyhow;
-int last_update_now_status;
 
 /* Takes a list of target names as first argument, and immediately
    updates them.
@@ -1356,8 +1355,6 @@
         close (original_stdout);
         close (original_stderr);
     }
-
-    last_update_now_status = status;
         
     if (status == 0)
         return list_new (L0, newstr ("ok"));

Modified: branches/release/tools/jam/src/builtins.h
==============================================================================
--- branches/release/tools/jam/src/builtins.h	(original)
+++ branches/release/tools/jam/src/builtins.h	2010-08-26 19:20:02 EDT (Thu, 26 Aug 2010)
@@ -62,6 +62,5 @@
 LIST *builtin_precious( PARSE *parse, FRAME *frame );
 
 void backtrace( FRAME *frame );
-extern int last_update_now_status;
 
 #endif

Modified: branches/release/tools/jam/src/execunix.c
==============================================================================
--- branches/release/tools/jam/src/execunix.c	(original)
+++ branches/release/tools/jam/src/execunix.c	2010-08-26 19:20:02 EDT (Thu, 26 Aug 2010)
@@ -190,9 +190,13 @@
     {
         if ( pipe( out ) < 0 )
             exit( EXITBAD );
+        fcntl( out[0], F_SETFL, O_NONBLOCK );
+        fcntl( out[1], F_SETFL, O_NONBLOCK );
 
         if ( pipe( err ) < 0 )
             exit( EXITBAD );
+        fcntl( err[0], F_SETFL, O_NONBLOCK );
+        fcntl( err[1], F_SETFL, O_NONBLOCK );
     }
 
     /* Start the command */

Modified: branches/release/tools/jam/src/jam.c
==============================================================================
--- branches/release/tools/jam/src/jam.c	(original)
+++ branches/release/tools/jam/src/jam.c	2010-08-26 19:20:02 EDT (Thu, 26 Aug 2010)
@@ -529,10 +529,6 @@
                 status |= make( targets_count, targets2, anyhow );
                 free( targets );
             }
-            else
-            {
-                status = last_update_now_status;
-            }
 
             PROFILE_EXIT( MAIN_MAKE );
         }

Modified: branches/release/tools/jam/src/patchlevel.h
==============================================================================
--- branches/release/tools/jam/src/patchlevel.h	(original)
+++ branches/release/tools/jam/src/patchlevel.h	2010-08-26 19:20:02 EDT (Thu, 26 Aug 2010)
@@ -9,9 +9,9 @@
 
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 1
-#define VERSION_PATCH 19
+#define VERSION_PATCH 18
 #define VERSION_MAJOR_SYM "03"
 #define VERSION_MINOR_SYM "1"
-#define VERSION_PATCH_SYM "19"
-#define VERSION "3.1.19"
+#define VERSION_PATCH_SYM "18"
+#define VERSION "3.1.18"
 #define JAMVERSYM "JAMVERSION=3.1"