summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-11-05 05:56:44 (GMT)
committerSteven Knight <knight@baldmt.com>2005-11-05 05:56:44 (GMT)
commit3bd4a30ca14e0cea712e01efa4df761e6c7bc608 (patch)
treea8b8614a55f2cc2fa7d6ade86388ddfe957fb296 /src
parenta4f7654742e5880b5a568a7314b32381be2a0a94 (diff)
downloadSCons-3bd4a30ca14e0cea712e01efa4df761e6c7bc608.zip
SCons-3bd4a30ca14e0cea712e01efa4df761e6c7bc608.tar.gz
SCons-3bd4a30ca14e0cea712e01efa4df761e6c7bc608.tar.bz2
Add support for a $INSTALLSTR string. (Christoph Schulz)
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt2
-rw-r--r--src/engine/SCons/Defaults.py1
-rw-r--r--src/engine/SCons/Environment.py2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 677b09b..38a0476 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -665,6 +665,8 @@ RELEASE 0.97 - XXX
- Add support for $CONFIGUREDIR and $CONFIGURELOG variables to control
the directory and logs for configuration tests.
+ - Add support for a $INSTALLSTR variable.
+
From Craig Scott:
- Have the Fortran module emitter look for Fortan modules to be created
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index 4fe8987..b7453d6 100644
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -347,6 +347,7 @@ ConstructionEnvironment = {
'SCANNERS' : [],
'CONFIGUREDIR' : '#/.sconf_temp',
'CONFIGURELOG' : '#/config.log',
+ 'INSTALLSTR' : 'Install file: "$SOURCE" as "$TARGET"',
'CPPSUFFIXES' : SCons.Tool.CSuffixes,
'DSUFFIXES' : SCons.Tool.DSuffixes,
'IDLSUFFIXES' : SCons.Tool.IDLSuffixes,
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py
index b4e8aac..ce8e374 100644
--- a/src/engine/SCons/Environment.py
+++ b/src/engine/SCons/Environment.py
@@ -83,7 +83,7 @@ def installFunc(target, source, env):
return install(target[0].path, source[0].path, env)
def installString(target, source, env):
- return 'Install file: "%s" as "%s"' % (source[0], target[0])
+ return env.subst(env['INSTALLSTR'], 0, target, source)
installAction = SCons.Action.Action(installFunc, installString)