diff options
author | Kevin Smith <git@kismith.co.uk> | 2011-10-23 11:29:44 (GMT) |
---|---|---|
committer | Kevin Smith <git@kismith.co.uk> | 2011-11-26 15:45:48 (GMT) |
commit | 81a7776d5ab523894a7c4745baee3988ad9f1ef9 (patch) | |
tree | 7e6e7a46abb69ac61884c4a5ca81fa76f51c3c2f /BuildTools/SCons/SConscript.boot | |
parent | 0a8486091b4cbcce1df883f4be1e65a4628c539b (diff) | |
download | swift-contrib-81a7776d5ab523894a7c4745baee3988ad9f1ef9.zip swift-contrib-81a7776d5ab523894a7c4745baee3988ad9f1ef9.tar.bz2 |
Initial support for WiX installer.
dist=1 on Windows now generates .msi instead, as long as wix_bindir
is set to the path of \bin\ for WiX.
nsis is no longer used
Diffstat (limited to 'BuildTools/SCons/SConscript.boot')
-rw-r--r-- | BuildTools/SCons/SConscript.boot | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index 24a8b67..2463d6c 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -32,6 +32,8 @@ if os.name == "mac" or (os.name == "posix" and os.uname()[0] == "Darwin"): if os.name == "nt" : vars.Add(PathVariable("vcredist", "MSVC redistributable dir", "", PathVariable.PathAccept)) if os.name == "nt" : + vars.Add(PathVariable("wix_bindir", "Path to WiX binaries", "", PathVariable.PathAccept)) +if os.name == "nt" : vars.Add(PackageVariable("bonjour", "Bonjour SDK location", "yes")) vars.Add(PackageVariable("openssl", "OpenSSL location", "yes")) vars.Add(PathVariable("boost_includedir", "Boost headers location", None, PathVariable.PathAccept)) |