diff options
author | Erik Berkun-Drevnig <erik.b22@gmail.com> | 2019-02-25 03:02:50 -0500 |
---|---|---|
committer | Erik Berkun-Drevnig <erik.b22@gmail.com> | 2019-02-25 03:02:50 -0500 |
commit | 1b64d69c4a015a7238cb195f33807564cb2c55e2 (patch) | |
tree | c93c0ddfc34ff55b4930017d7c2ba00d05f89b62 | |
parent | b5c239b5b9448fa4848e661e067241260225acc6 (diff) | |
download | alacritty-1b64d69c4a015a7238cb195f33807564cb2c55e2.tar.gz alacritty-1b64d69c4a015a7238cb195f33807564cb2c55e2.zip |
Fix Wix path
-rwxr-xr-x | ci/script.sh | 3 | ||||
-rw-r--r-- | wix/build.sh | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ci/script.sh b/ci/script.sh index c94e28f8..4da72de9 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -28,6 +28,9 @@ if [ "$TRAVIS_OS_NAME" == "windows" ]; then cp "./target/debug/winpty-agent.exe" "./target/debug/deps" fi cargo test -p winpty || error=true + + choco install nuget.commandline + nuget install WiX ./wix/build.sh fi diff --git a/wix/build.sh b/wix/build.sh index 108b91ea..47c5e1b4 100644 --- a/wix/build.sh +++ b/wix/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -"$WIX/bin/candle.exe" -nologo -arch "x64" -ext WixUIExtension -ext WixUtilExtension -out "alacritty.wixobj" "alacritty.wxs" +"WiX.3.11.1/tools/candle.exe" -nologo -arch "x64" -ext WixUIExtension -ext WixUtilExtension -out "alacritty.wixobj" "alacritty.wxs" -"$WIX/bin/light.exe" -nologo -ext WixUIExtension -ext WixUtilExtension -out "alacritty.msi" -sice:ICE57 "alacritty.wixobj" +"WiX.3.11.1/tools/light.exe" -nologo -ext WixUIExtension -ext WixUtilExtension -out "alacritty.msi" -sice:ICE57 "alacritty.wixobj" |