summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-04-24 17:47:32 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-04-24 17:47:32 (GMT)
commit2fb37ba9d088e0027560a7d4b2b0617043569d55 (patch)
tree160b42d97d37ea42321d1ee4b2a2dd9538a5e404 /BuildTools
parent36a00c5338df2df1be827c014dff63bfbf16cb34 (diff)
downloadswift-contrib-2fb37ba9d088e0027560a7d4b2b0617043569d55.zip
swift-contrib-2fb37ba9d088e0027560a7d4b2b0617043569d55.tar.bz2
WiX updates.
Show icon in Add/Remove programs dialog. Support upgrading. Render COPYING file correctly. Resolves: #1096, #1094, #1093
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/SConscript.boot2
1 files changed, 1 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index f7956b5..a3a5c6d 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -30,7 +30,7 @@ if os.name == "mac" or (os.name == "posix" and os.uname()[0] == "Darwin"):
vars.Add(BoolVariable("universal", "Create universal binaries", "no"))
vars.Add(BoolVariable("mac105", "Link against the 10.5 frameworks", "no"))
if os.name == "nt" :
- vars.Add(PathVariable("vcredist", "MSVC redistributable dir", "", PathVariable.PathAccept))
+ vars.Add(PathVariable("vcredist", "MSVC redistributable dir", None, PathVariable.PathAccept))
if os.name == "nt" :
vars.Add(PathVariable("wix_bindir", "Path to WiX binaries", "", PathVariable.PathAccept))
if os.name == "nt" :