mirror of
https://github.com/boostorg/build.git
synced 2026-02-18 14:02:11 +00:00
Merge prep for 1.45
[SVN r65046]
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
[article Boost.Jam
|
||||
[quickbook 1.3]
|
||||
[version: 3.1.18]
|
||||
[version: 3.1.19]
|
||||
[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.18]
|
||||
[def :version: 3.1.19]
|
||||
|
||||
[/ Images ]
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: boost-jam
|
||||
Version: 3.1.18
|
||||
Version: 3.1.19
|
||||
Summary: Build tool
|
||||
Release: 1
|
||||
Source: %{name}-%{version}.tgz
|
||||
|
||||
@@ -27,7 +27,7 @@ else { . = "." ; }
|
||||
./ ?= "" ;
|
||||
|
||||
# Info about what we are building.
|
||||
_VERSION_ = 3 1 18 ;
|
||||
_VERSION_ = 3 1 19 ;
|
||||
NAME = boost-jam ;
|
||||
VERSION = $(_VERSION_:J=$(.)) ;
|
||||
RELEASE = 1 ;
|
||||
|
||||
@@ -1293,6 +1293,7 @@ LIST * builtin_update( PARSE * parse, FRAME * frame )
|
||||
}
|
||||
|
||||
extern int anyhow;
|
||||
int last_update_now_status;
|
||||
|
||||
/* Takes a list of target names as first argument, and immediately
|
||||
updates them.
|
||||
@@ -1355,6 +1356,8 @@ LIST * builtin_update_now( PARSE * parse, FRAME * frame )
|
||||
close (original_stdout);
|
||||
close (original_stderr);
|
||||
}
|
||||
|
||||
last_update_now_status = status;
|
||||
|
||||
if (status == 0)
|
||||
return list_new (L0, newstr ("ok"));
|
||||
|
||||
@@ -62,5 +62,6 @@ LIST *builtin_pad( PARSE *parse, FRAME *frame );
|
||||
LIST *builtin_precious( PARSE *parse, FRAME *frame );
|
||||
|
||||
void backtrace( FRAME *frame );
|
||||
extern int last_update_now_status;
|
||||
|
||||
#endif
|
||||
|
||||
@@ -190,13 +190,9 @@ void exec_cmd
|
||||
{
|
||||
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 */
|
||||
|
||||
@@ -529,6 +529,10 @@ int main( int argc, char * * argv, char * * arg_environ )
|
||||
status |= make( targets_count, targets2, anyhow );
|
||||
free( targets );
|
||||
}
|
||||
else
|
||||
{
|
||||
status = last_update_now_status;
|
||||
}
|
||||
|
||||
PROFILE_EXIT( MAIN_MAKE );
|
||||
}
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
|
||||
#define VERSION_MAJOR 3
|
||||
#define VERSION_MINOR 1
|
||||
#define VERSION_PATCH 18
|
||||
#define VERSION_PATCH 19
|
||||
#define VERSION_MAJOR_SYM "03"
|
||||
#define VERSION_MINOR_SYM "1"
|
||||
#define VERSION_PATCH_SYM "18"
|
||||
#define VERSION "3.1.18"
|
||||
#define VERSION_PATCH_SYM "19"
|
||||
#define VERSION "3.1.19"
|
||||
#define JAMVERSYM "JAMVERSION=3.1"
|
||||
|
||||
Reference in New Issue
Block a user