Merge branch 'windows_installer'

1 files changed, 17 insertions, 11 deletions

diff --git a/build.sh b/build.sh
index 5f967f035a..7b0e791731 100755
--- a/build.sh
+++ b/build.sh
@@ -44,23 +44,28 @@ 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
-    ./target/release/problem-report
-)
-for binary in ${binaries[*]}; do
-    echo "Stripping debugging symbols from $binary"
-    strip $binary
-done
+# Only strip binaries on platforms other than Windows.
+if [[ "$(uname -s)" != "MINGW"* ]]; then
+    binaries=(
+        ./target/release/mullvad-daemon
+        ./target/release/mullvad
+        ./target/release/problem-report
+    )
+    for binary in ${binaries[*]}; do
+        echo "Stripping debugging symbols from $binary"
+        strip $binary
+    done
+fi
 
 echo "Updating relay list..."
 ./target/release/list-relays > dist-assets/relays.json
@@ -72,6 +77,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' '`