diff options
| author | Steven Knight <knight@baldmt.com> | 2004-11-15 18:42:13 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-11-15 18:42:13 (GMT) |
| commit | 27db7fcdedd3043ae5d2f7f869f07e8533e63ba3 (patch) | |
| tree | 3825ac54b8ce243322193a5f38a19df4cce42a99 /src | |
| parent | ef16e30c75234061b97203234d94f3776087631a (diff) | |
| download | SCons-27db7fcdedd3043ae5d2f7f869f07e8533e63ba3.zip SCons-27db7fcdedd3043ae5d2f7f869f07e8533e63ba3.tar.gz SCons-27db7fcdedd3043ae5d2f7f869f07e8533e63ba3.tar.bz2 | |
More display customizability: , . (Also add the missing , for completeness, and gets rid of the unused SCons.Defaults.DAction object.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 6 | ||||
| -rw-r--r-- | src/engine/SCons/Defaults.py | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/as.py | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index d89d29c..6bb6d09 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -131,9 +131,9 @@ RELEASE 0.97 - XXX source file names. - Support easier configurability of what's displayed by various default - actions by adding new construction variables: $ASCOMSTR, $CCCOMSTR, - $CXXCOMSTR, $LEXCOMSTR, $LINKCOMSTR, $SHCCCOMSTR, $SHCXXCOMSTR, - $SHLINKCOMSTR and $YACCCOMSTR. + actions by adding new construction variables: $ARCOMSTR, $ASCOMSTR, + $ASPPCOMSTR, $CCCOMSTR, $CXXCOMSTR, $LEXCOMSTR, $LINKCOMSTR, + $SHCCCOMSTR, $SHCXXCOMSTR, $SHLINKCOMSTR and $YACCCOMSTR. From Wayne Lee: diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index 6f90f5b..b3312f7 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -121,18 +121,17 @@ del suffix # Actions for common languages. CAction = SCons.Action.Action("$CCCOM", "$CCCOMSTR") -DAction = SCons.Action.Action("$DCOM") ShCAction = SCons.Action.Action("$SHCCCOM", "$SHCCCOMSTR") CXXAction = SCons.Action.Action("$CXXCOM", "$CXXCOMSTR") ShCXXAction = SCons.Action.Action("$SHCXXCOM", "$SHCXXCOMSTR") ASAction = SCons.Action.Action("$ASCOM", "$ASCOMSTR") -ASPPAction = SCons.Action.Action("$ASPPCOM") +ASPPAction = SCons.Action.Action("$ASPPCOM", "$ASPPCOMSTR") LinkAction = SCons.Action.Action("$LINKCOM", "$LINKCOMSTR") ShLinkAction = SCons.Action.Action("$SHLINKCOM", "$SHLINKCOMSTR") -ArAction = SCons.Action.Action("$ARCOM") +ArAction = SCons.Action.Action("$ARCOM", "$ARCOMSTR") LexAction = SCons.Action.Action("$LEXCOM", "$LEXCOMSTR") YaccAction = SCons.Action.Action("$YACCCOM", "$YACCCOMSTR") diff --git a/src/engine/SCons/Tool/as.py b/src/engine/SCons/Tool/as.py index 2bbc891..5a267a5 100644 --- a/src/engine/SCons/Tool/as.py +++ b/src/engine/SCons/Tool/as.py @@ -61,7 +61,8 @@ def generate(env): env['AS'] = env.Detect(assemblers) or 'as' env['ASFLAGS'] = SCons.Util.CLVar('') env['ASCOM'] = '$AS $ASFLAGS -o $TARGET $SOURCES' - env['ASPPCOM'] = '$CC $ASFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -c -o $TARGET $SOURCES' + env['ASPPFLAGS'] = '$ASFLAGS' + env['ASPPCOM'] = '$CC $ASPPFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -c -o $TARGET $SOURCES' def exists(env): return env.Detect(assemblers) |