summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOdd Stranne <odd@mullvad.net>2018-05-29 15:33:38 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-06-08 11:13:04 +0200
commit0f20e41883fbfeca1e7dddf5bcd3e7b72572b6a2 (patch)
tree2f654ca748b1e5d50f86ad346e557c9e8af3c8ab
parent8ff8fd87607824ea49ea781bc8dac27bd261f7ee (diff)
downloadmullvadvpn-0f20e41883fbfeca1e7dddf5bcd3e7b72572b6a2.tar.xz
mullvadvpn-0f20e41883fbfeca1e7dddf5bcd3e7b72572b6a2.zip
Build WINFW as well as Windows installer from build.sh
-rwxr-xr-xbuild.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index 5f967f035a..c6308cc766 100755
--- a/build.sh
+++ b/build.sh
@@ -44,14 +44,16 @@ if [[ "$(uname -s)" = "Darwin" ]]; then
fi
fi
-
# Remove binaries. To make sure it is rebuilt with the stable toolchain and the latest changes.
cargo +stable clean
+if [[ "$(uname -s)" == "MINGW"* ]]; then
+ ./build_winfw.sh
+fi
+
echo "Compiling mullvad-daemon in release mode with $RUSTC_VERSION..."
cargo +stable build --release
-
binaries=(
./target/release/mullvad-daemon
./target/release/mullvad
@@ -72,6 +74,7 @@ echo "Packing final release artifact..."
case "$(uname -s)" in
Linux*) yarn pack:linux;;
Darwin*) yarn pack:mac;;
+ MINGW*) yarn pack:win;;
esac
RELEASE_VERSION=`./target/release/mullvad-daemon --version | cut -f2 -d' '`