From f6b45faf807c36288e73262c938753403311729b Mon Sep 17 00:00:00 2001
From: mlangkabel <malte.langkabel@gmail.com>
Date: Wed, 23 Aug 2017 14:12:59 +0200
Subject: [PATCH] build: updated readme and fixed windows deploy scripts

---
 README.md                                  | 12 ++++++++----
 deployment/windows/wixSetup/build_win32.sh |  2 +-
 deployment/windows/wixSetup/build_win64.sh |  2 +-
 script/deploy_windows.sh                   |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index e96fba93..adcd575e 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,13 @@
 * JDK 1.8
 * QT 5.9.1
 * CxxTest 4.3
-* Valgrind 3.9.0 (linux)
 * Clang & LLVM 4.0.1 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
 * Boost 1.64
 * Botan 2.1.0
 * Image Magick 7.0.6
-* ccache (unix)
+* ccache (Unix)
+* Wix 3.11 (Windows)
+* Winrar (Windows)
 
 also something about java, but who knows...
 
@@ -33,10 +34,13 @@ For Windows:
 * VLD_DIR - .../Visual Leak Detector
 * JAVA_HOME - .../Java/jdk1.x.x_xxx
 * path
-	- apped path to git.exe
-	- apped path to jdk/bin
+	- append path to git.exe
+	- append path to jdk/bin
 	- append path to VisualStudio/Common7/Tools
 	- append path to VisualStudio/Common7/IDE
+	- append path to .../Microsoft SDKs/Windows/v7.1A/Bin (for uuidgen in deploy script)
+	- append path to .../WiX Toolset v3.11/bin
+	- append path to .../WinRAR
 
 ##### ccache
 
diff --git a/deployment/windows/wixSetup/build_win32.sh b/deployment/windows/wixSetup/build_win32.sh
index 8983f1cc..8d9a71b5 100644
--- a/deployment/windows/wixSetup/build_win32.sh
+++ b/deployment/windows/wixSetup/build_win32.sh
@@ -1 +1 @@
-build.sh -win32
\ No newline at end of file
+sh build.sh -win32
\ No newline at end of file
diff --git a/deployment/windows/wixSetup/build_win64.sh b/deployment/windows/wixSetup/build_win64.sh
index 76919e07..7d8bc1ad 100644
--- a/deployment/windows/wixSetup/build_win64.sh
+++ b/deployment/windows/wixSetup/build_win64.sh
@@ -1 +1 @@
-build.sh -win64
\ No newline at end of file
+sh build.sh -win64
\ No newline at end of file
diff --git a/script/deploy_windows.sh b/script/deploy_windows.sh
index a0b1e839..9000e8f9 100644
--- a/script/deploy_windows.sh
+++ b/script/deploy_windows.sh
@@ -96,8 +96,8 @@ fi
 
 # BUILDING THE INSTALLER
 cd deployment/windows/wixSetup
-build_win32.sh
-build_win64.sh
+sh build_win32.sh
+sh build_win64.sh
 cd ../../..