diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-01-18 08:32:23 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-01-18 08:32:23 +0000 |
commit | 2697933a8c6e703e4910070c9c8ed0a3f4c33402 (patch) | |
tree | fea93a607fb8a880c09531b5a114483d48679022 /dmake/rulparse.c | |
parent | 0958549f1c3314484eb11c631f748941ab7bcba8 (diff) |
INTEGRATION: CWS dmake47 (1.9.2); FILE MERGED
2006/11/12 05:06:38 vq 1.9.2.2: #i71422# Add a new feature: Using @@ as a recipe prefix redirects the
output (stdout and stderr) of a recipe to /dev/null (or NUL on W32)
completely suppressing the output of that recipe to the terminal.
As for the @ prefix this can be disabled using the -v[r] switch.
2006/10/08 22:49:03 vq 1.9.2.1: #i70168# Improve $ handling in targets/prerequisites.
Diffstat (limited to 'dmake/rulparse.c')
-rw-r--r-- | dmake/rulparse.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/dmake/rulparse.c b/dmake/rulparse.c index 23d11e509286..565bda26e932 100644 --- a/dmake/rulparse.c +++ b/dmake/rulparse.c @@ -1,6 +1,6 @@ /* $RCSfile: rulparse.c,v $ --- $Revision: 1.9 $ --- last change: $Author: vg $ $Date: 2006-09-25 09:40:47 $ +-- $Revision: 1.10 $ +-- last change: $Author: vg $ $Date: 2007-01-18 09:32:23 $ -- -- SYNOPSIS -- Perform semantic analysis on input @@ -145,6 +145,9 @@ int *state; /* Do we need cells for attributes? If not move the definition * to the target part. */ cp = Def_cell( tok ); + /* A $ character indicates either a literal $ in the pathname (this + * was broken before) or a dynamic macro (this is a syntax error). + * FIXME: Here would be the place to add a sanity check. */ DB_PRINT( "par", ("tg_cell [%s]", tok) ); if( (at = _is_attribute(tok)) != 0 ) { @@ -529,7 +532,8 @@ int flag; PUBLIC int Set_group_attributes( list )/* ============================== - Scan list looking for the standard @ and - (as in recipe line defs) + Scan list looking for the standard @,-,% and + (as in recipe line + defs) (+ is set but ignored for group recipes) and set the flags accordingly so that they apply when we bind the rules to the appropriate targets. Return TRUE if group recipe start '[' was found, otherwise FALSE. */ |