boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00
Code Issues Projects Releases Wiki Activity

Replace unused FAIL_EXPECTED with RMOLD

Browse Source 
[SVN r13406]
This commit is contained in:
Dave Abrahams
2002-04-09 04:01:58 +00:00
parent 5bf8f649c1
commit 91c1a2cbd5
4 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
historic/jam/src/builtins.c
View File

@@ -129,6 +129,7 @@ load_builtins()
bind_builtin( "HDRMACRO" ,
builtin_hdrmacro, 0, 0 ) );
# if 0
/* FAIL_EXPECTED is an experimental built-in that is used to indicate */
/* that the result of a target build action should be inverted (ok <=> fail) */
/* this can be useful when performing test runs from Jamfiles.. */
@@ -137,6 +138,9 @@ load_builtins()
/* contact david.turner@freetype.org for more details.. */
bind_builtin( "FAIL_EXPECTED" ,
builtin_flags, T_FLAG_FAIL_EXPECTED, 0 );
# endif
bind_builtin( "RMOLD" , builtin_flags, T_FLAG_RMOLD, 0 );
{
char * args[] = { "string", "pattern", "replacements", "+", 0 };

10
historic/jam/src/make1.c
View File

@@ -206,7 +206,13 @@ make1b( TARGET *t )
if( t->status == EXEC_CMD_FAIL && t->actions )
{
++counts->skipped;
printf( "...skipped %s for lack of %s...\n", t->name, failed );
if ( ( t->flags & ( T_FLAG_RMOLD | T_FLAG_NOTFILE ) ) == T_FLAG_RMOLD )
{
if( !unlink( t->boundname ) )
printf( "...removing outdated %s\n", t->boundname );
}
else
printf( "...skipped %s for lack of %s...\n", t->name, failed );
}
if( t->status == EXEC_CMD_OK )
@@ -359,6 +365,7 @@ make1d(
/* status and signal our completion so make1c() can run the next */
/* command. On interrupts, we bail heavily. */
# if 0 /* apparently not needed */
if ( t->flags & T_FLAG_FAIL_EXPECTED )
{
/* invert execution result when FAIL_EXPECTED was applied */
@@ -370,6 +377,7 @@ make1d(
;
}
}
# endif
if( status == EXEC_CMD_FAIL && ( cmd->rule->actions->flags & RULE_IGNORE ) )
status = EXEC_CMD_OK;

4
jam_src/builtins.c
View File

@@ -129,6 +129,7 @@ load_builtins()
bind_builtin( "HDRMACRO" ,
builtin_hdrmacro, 0, 0 ) );
# if 0
/* FAIL_EXPECTED is an experimental built-in that is used to indicate */
/* that the result of a target build action should be inverted (ok <=> fail) */
/* this can be useful when performing test runs from Jamfiles.. */
@@ -137,6 +138,9 @@ load_builtins()
/* contact david.turner@freetype.org for more details.. */
bind_builtin( "FAIL_EXPECTED" ,
builtin_flags, T_FLAG_FAIL_EXPECTED, 0 );
# endif
bind_builtin( "RMOLD" , builtin_flags, T_FLAG_RMOLD, 0 );
{
char * args[] = { "string", "pattern", "replacements", "+", 0 };

10
jam_src/make1.c
View File

@@ -206,7 +206,13 @@ make1b( TARGET *t )
if( t->status == EXEC_CMD_FAIL && t->actions )
{
++counts->skipped;
printf( "...skipped %s for lack of %s...\n", t->name, failed );
if ( ( t->flags & ( T_FLAG_RMOLD | T_FLAG_NOTFILE ) ) == T_FLAG_RMOLD )
{
if( !unlink( t->boundname ) )
printf( "...removing outdated %s\n", t->boundname );
}
else
printf( "...skipped %s for lack of %s...\n", t->name, failed );
}
if( t->status == EXEC_CMD_OK )
@@ -359,6 +365,7 @@ make1d(
/* status and signal our completion so make1c() can run the next */
/* command. On interrupts, we bail heavily. */
# if 0 /* apparently not needed */
if ( t->flags & T_FLAG_FAIL_EXPECTED )
{
/* invert execution result when FAIL_EXPECTED was applied */
@@ -370,6 +377,7 @@ make1d(
;
}
}
# endif
if( status == EXEC_CMD_FAIL && ( cmd->rule->actions->flags & RULE_IGNORE ) )
status = EXEC_CMD_OK;