summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres G. Aragoneses <knocte@gmail.com>2013-04-21 02:00:29 +0100
committerAndres G. Aragoneses <knocte@gmail.com>2013-04-21 02:00:29 +0100
commitd31fc171691fa8b48b786488e45e25597bc31a81 (patch)
tree5dcbcc24dde6940bb81f86a917c97109d441d629
parent8644f359477ba0801fa5f5e74b8c63680e42c240 (diff)
build: give a clearer error when not finding WIX env var (windows)
Even if the README tells you to install WiX, it could happen that you run the javascript file from a command line shell that you had already open before you installed WiX, in which case it would fail.
-rw-r--r--build/windows/build-installer.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/build/windows/build-installer.js b/build/windows/build-installer.js
index 9ae6716e1..df85aa3d0 100644
--- a/build/windows/build-installer.js
+++ b/build/windows/build-installer.js
@@ -10,7 +10,12 @@ var bin = '..\\..\\bin';
var sh = new ActiveXObject("WScript.Shell");
var fs = new ActiveXObject("Scripting.FileSystemObject");
var env = sh.Environment("Process");
-var heat = "\"" + env("WIX") + "bin\\heat.exe\"";
+var wix_path = env("WIX");
+if (wix_path == "") {
+ WScript.Echo ('WIX environment variable not set, did you install WiX 3.5?');
+ WScript.Quit (1);
+}
+var heat = "\"" + wix_path + "bin\\heat.exe\"";
// Look for msbuild.exe
if (fs.FileExists (env("windir") + "\\Microsoft.NET\\Framework\\v4.0.30319\\msbuild.exe") == 1) {