Update of /cvsroot/boost/boost/tools/jam/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1925
Modified Files:
Tag: Boost_Jam_994
jam.c jam.h make1.c
Log Message:
Remove -r option per discussion with Rene. Also changed __DART_RULE__
to __ACTION_RULE__ to more fairly characterize this capability.
Index: jam.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/jam/src/jam.c,v
retrieving revision 1.41.2.5
retrieving revision 1.41.2.6
diff -u -d -r1.41.2.5 -r1.41.2.6
--- jam.c 7 Jun 2007 19:49:31 -0000 1.41.2.5
+++ jam.c 8 Jun 2007 15:20:24 -0000 1.41.2.6
@@ -142,7 +142,6 @@
0, /* quitquick */
0, /* newestfirst */
0, /* pipes action stdout and stderr merged to
action output */
- 0, /* enable dart rule invocation on built
targets */
# ifdef OS_MAC
{ 0, 0 }, /* debug - suppress tracing output */
# else
@@ -229,7 +228,7 @@
argc--, argv++;
- if( getoptions( argc, argv, "-:rno:l:d:j:p:f:gs:t:ano:qv", optv ) < 0 )
+ if( getoptions( argc, argv, "-:l:d:j:p:f:gs:t:ano:qv", optv ) < 0 )
{
printf( "\nusage: %s [ options ] targets...\n\n", progname );
@@ -269,9 +268,6 @@
/* Pick up interesting options */
- if( ( s = getoptval( optv, 'r', 0 ) ) )
- globs.dart_active = 1;
-
if( ( s = getoptval( optv, 'n', 0 ) ) )
globs.noexec++, globs.debug[2] = 1;
Index: jam.h
===================================================================
RCS file: /cvsroot/boost/boost/tools/jam/src/jam.h,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -d -r1.21.2.3 -r1.21.2.4
--- jam.h 7 Jun 2007 19:49:31 -0000 1.21.2.3
+++ jam.h 8 Jun 2007 15:20:24 -0000 1.21.2.4
@@ -523,7 +523,6 @@
int quitquick;
int newestfirst; /* build newest sources first */
int pipe_action;
- int dart_active;
char debug[DEBUG_MAX];
FILE *cmdout; /* print cmds, not run them */
long timeout; /* number of seconds to limit actions to, default
0 for no limit. */
Index: make1.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/jam/src/make1.c,v
retrieving revision 1.32.2.7
retrieving revision 1.32.2.8
diff -u -d -r1.32.2.7 -r1.32.2.8
--- make1.c 7 Jun 2007 19:49:31 -0000 1.32.2.7
+++ make1.c 8 Jun 2007 15:20:24 -0000 1.32.2.8
@@ -724,23 +724,23 @@
lol_add(l, list_new(L0, newstr(buffer)));
}
-/* Look up the __DART_RULE__ variable on the given target, and if
+/* Look up the __ACTION_RULE__ variable on the given target, and if
* non-empty, invoke the rule it names, passing the given info,
* timing_info, executed command and command output
*/
-static void call_dart_rule(TARGET* target, int status, timing_info* time,
+static void call_action_rule(TARGET* target, int status, timing_info* time,
char *executed_command, char *command_output)
{
- LIST* dart_rule;
+ LIST* action_rule;
pushsettings(target->settings);
- dart_rule = var_get( "__DART_RULE__" );
+ action_rule = var_get( "__ACTION_RULE__" );
popsettings(target->settings);
- if (dart_rule)
+ if (action_rule)
{
- /* We'll prepend $(__DART_RULE__[2-]) to the first argument */
- LIST* initial_args = list_copy( L0, dart_rule->next );
+ /* We'll prepend $(__ACTION_RULE__[2-]) to the first argument */
+ LIST* initial_args = list_copy( L0, action_rule->next );
/* Prepare the argument list */
FRAME frame[1];
@@ -759,7 +759,7 @@
lol_add(frame->args, L0);
if( lol_get( frame->args, 2 ) )
- evaluate_rule( dart_rule->string, frame );
+ evaluate_rule( action_rule->string, frame );
/* Clean up */
frame_free( frame );
@@ -777,8 +777,7 @@
if (DEBUG_EXECCMD)
printf("%f sec system; %f sec user\n", time->system, time->user);
- if (globs.dart_active)
- call_dart_rule(built, status, time, executed_command, command_output);
+ call_action_rule(built, status, time, executed_command, command_output);
push_state(&state_stack, built, NULL, T_STATE_MAKE1D)->status = status;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
Boost-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/boost-cvs
