summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-11-28 09:23:02 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-28 09:23:02 (GMT)
commitbafe5e6d6386f40f254b5da752545b5f9f41d316 (patch)
tree50b83577bb920dbde22529515954c8f1ad29cdd3
parenta1c0b927525a7f70a8c60363100a9968d0f3ae04 (diff)
downloadswift-contrib-bafe5e6d6386f40f254b5da752545b5f9f41d316.zip
swift-contrib-bafe5e6d6386f40f254b5da752545b5f9f41d316.tar.bz2
Prettify install commands.
-rw-r--r--3rdParty/SCons/scons-local/SCons/Tool/install.py2
-rw-r--r--SConstruct1
2 files changed, 2 insertions, 1 deletions
diff --git a/3rdParty/SCons/scons-local/SCons/Tool/install.py b/3rdParty/SCons/scons-local/SCons/Tool/install.py
index 3680b53..9596db1 100644
--- a/3rdParty/SCons/scons-local/SCons/Tool/install.py
+++ b/3rdParty/SCons/scons-local/SCons/Tool/install.py
@@ -86,7 +86,7 @@ def installFunc(target, source, env):
def stringFunc(target, source, env):
installstr = env.get('INSTALLSTR')
if installstr:
- return env.subst_target_source(installstr, 0, target, source)
+ return env.subst_target_source(installstr, 1, target, source)
target = str(target[0])
source = str(source[0])
if os.path.isdir(source):
diff --git a/SConstruct b/SConstruct
index 121df77..799929d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -153,6 +153,7 @@ if int(ARGUMENTS.get("V", 0)) == 0:
env["BUNDLECOMSTR"] = colorize("BUNDLE", "$TARGET", "blue")
env["NIBCOMSTR"] = colorize("NIB", "$TARGET", "blue")
env["NSISCOMSTR"] = colorize("NSIS", "$TARGET", "blue")
+ env["INSTALLSTR"] = colorize("INSTALL", "$TARGET", "blue")
env["TESTCOMSTR"] = colorize("TEST", "$SOURCE", "yellow")
#Progress(colorize("DEP", "$TARGET", "red")