From 4cb285b13850ebe05572dabbda0f62a646afe7cb Mon Sep 17 00:00:00 2001
From: malte_langkabel <malte.langkabel@gmail.com>
Date: Thu, 27 Oct 2016 12:56:27 +0200
Subject: [PATCH] build: windows installer fix

* added project specific icons to windows installer
* implemented automatic generation of the version number for the windows installer
---
 deployment/windows/wixSetup/build.bat      | 11 ++++++++++-
 deployment/windows/wixSetup/coati.wxs      |  3 +++
 deployment/windows/wixSetup/installDir.wxs |  9 +++++++++
 script/deploy_windows.sh                   |  3 ---
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/deployment/windows/wixSetup/build.bat b/deployment/windows/wixSetup/build.bat
index 6b99d0ae..f529477f 100644
--- a/deployment/windows/wixSetup/build.bat
+++ b/deployment/windows/wixSetup/build.bat
@@ -1,3 +1,11 @@
+VERSION_STRING=$(git describe --long)
+VERSION_STRING="${VERSION_STRING//-/_}"
+VERSION_STRING="${VERSION_STRING//./_}"
+VERSION_STRING="${VERSION_STRING%_*}"
+VERSION_STRING="${VERSION_STRING//_/.}"
+
+echo "installer version is $VERSION_STRING"
+
 rm -rf build
 mkdir build
 
@@ -7,7 +15,8 @@ mkdir build
 rm -rf bin
 mkdir bin
 
-candle.exe -dprojectVersion="0.9.0" coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
+
+candle.exe -dprojectVersion="$VERSION_STRING" coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
 light.exe -ext WixUIExtension build/coati.wixobj build/customActions.wixobj build/dialogShortcuts.wixobj build/installDir.wixobj build/appDataDir.wixobj -out build/coati.msi > build/linkLog.txt
 
 cp -u -r build/coati.msi bin
diff --git a/deployment/windows/wixSetup/coati.wxs b/deployment/windows/wixSetup/coati.wxs
index 71415aea..f82aeaac 100644
--- a/deployment/windows/wixSetup/coati.wxs
+++ b/deployment/windows/wixSetup/coati.wxs
@@ -186,7 +186,10 @@
 				<ComponentRef Id='Typedef_2Png'/>
 				<ComponentRef Id='Typedef_3Png'/>
 
+				<ComponentRef Id='C_icon_Png'/>
 				<ComponentRef Id='CoatiIco'/>
+				<ComponentRef Id='Cpp_icon_Png'/>
+				<ComponentRef Id='Java_icon_Png'/>
 				<ComponentRef Id='Logo_1024_1024_Png'/>
 				<ComponentRef Id='ProjectIco'/>
 				<ComponentRef Id='Project_256_256_Png'/>
diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index a90727ce..d480e994 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -254,9 +254,18 @@
 					</Directory>
 
 					<Directory Id='DataIcon' Name='icon'>
+						<Component Id='C_icon_Png' Guid='5455ADA0-2477-4F46-9BEE-62DCB71D639F'>
+							<File Id='C_icon' Name='c_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/c_icon.png' KeyPath='yes' />
+						</Component>
 						<Component Id='CoatiIco' Guid='9D65B057-EA87-4251-8898-9FAD23AD3371'>
 							<File Id='Coati' Name='coati.ico' DiskId='1' Source='./../../../bin/app/data/gui/icon/coati.ico' KeyPath='yes' />
 						</Component>
+						<Component Id='Cpp_icon_Png' Guid='B9EB2C3F-6256-4F54-9F8C-7DC338424839'>
+							<File Id='Cpp_icon' Name='cpp_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/cpp_icon.png' KeyPath='yes' />
+						</Component>
+						<Component Id='Java_icon_Png' Guid='66920390-A101-45B7-8C61-EA9EDF0876D3'>
+							<File Id='Java_icon' Name='java_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/java_icon.png' KeyPath='yes' />
+						</Component>
 						<Component Id='Logo_1024_1024_Png' Guid='4A25272C-380F-4414-BFBA-06C92D19B116'>
 							<File Id='Logo_1024_1024' Name='logo_1024_1024.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/logo_1024_1024.png' KeyPath='yes' />
 						</Component>
diff --git a/script/deploy_windows.sh b/script/deploy_windows.sh
index 6ae58eac..571e9481 100644
--- a/script/deploy_windows.sh
+++ b/script/deploy_windows.sh
@@ -32,9 +32,6 @@ if [ $UPDATE_DATABASES = false ]; then
 	read -p "Press [Enter] key to continue"
 fi
 
-echo -e "$INFO Did you set the correct version number for the installers?"
-read -p "Press [Enter] key to continue"
-
 echo -e "$INFO Did you set the correct version number for the Visual Studio plugin?"
 read -p "Press [Enter] key to continue"