build: wix installer integration

Updated wix installer to better facilitate the integration into the deploy process.

deployment/windows/wixSetup/build.bat

@@ -1,5 +1,11 @@
 devenv.exe /build "Release|x86" Setup/build/Setup.sln
 devenv.exe /build "Release|x86" CustomActions/CustomActions.sln
 
-candle.exe coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs > compileLog.txt
-light.exe -ext WixUIExtension coati.wixobj customActions.wixobj dialogShortcuts.wixobj installDir.wixobj appDataDir.wixobj -out coati.msi > linkLog.txt
+rm -rf bin
+mkdir bin
+
+candle.exe -dprojectVersion="0.7.0" coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs > compileLog.txt
+light.exe -ext WixUIExtension coati.wixobj customActions.wixobj dialogShortcuts.wixobj installDir.wixobj appDataDir.wixobj -out coati.msi > linkLog.txt
+
+cp -u -r coati.msi bin
+cp -u -r Setup.exe bin

deployment/windows/wixSetup/coati.wxs

@@ -4,7 +4,7 @@
     <Product Name='Coati' Manufacturer='Coati Software OG'
         Id='596E7336-D5B9-449A-95E9-6040F354E283' 
         UpgradeCode='6DAB9E05-6E5B-4D26-A2A0-8F1757F2A4EF'
-        Language='1033' Codepage='1252' Version='0.7.0'>
+        Language='1033' Codepage='1252' Version='$(var.projectVersion)'>
 		
 		<Package Id='*' Keywords='Installer' Description="Coati Installer"
 			Comments='Coati is a registered trademark of Coati Software OG' Manufacturer='Coati Software OG'
@@ -19,10 +19,10 @@
 		<!-- Shortcuts -->
 		<Upgrade Id='A4C8F644-9A8C-4825-8C48-F6A98F111722'>
 			<UpgradeVersion OnlyDetect='yes' Property='SELFFOUND'
-				Minimum='0.7.0' IncludeMinimum='yes'
-				Maximum='0.7.0' IncludeMaximum='yes' />
+				Minimum='$(var.projectVersion)' IncludeMinimum='yes'
+				Maximum='$(var.projectVersion)' IncludeMaximum='yes' />
 			<UpgradeVersion OnlyDetect='yes' Property='NEWERFOUND'
-				Minimum='0.7.0' IncludeMinimum='no' />
+				Minimum='$(var.projectVersion)' IncludeMinimum='no' />
 		</Upgrade>
 
 		<Directory Id='TARGETDIR' Name='SourceDir'>
@@ -278,5 +278,7 @@
 		
 		<WixVariable Id="WixUIBannerBmp" Value="Images/banner.bmp" />
 		<WixVariable Id="WixUIDialogBmp" Value="Images/w_installer.bmp" />
+		
+		<!-- <WixVariable Id="var.Coati.projectVersion" Value="0.7.0" /> -->
 	</Product>
 </Wix>

deployment/windows/wixSetup/readme.txt

@@ -3,6 +3,8 @@ Build the installer
 -------------------
 
 -Prerequisites
+	-configure for build
+		-make sure the Visual Studio IDE directory is in you OS path variable ('../Microsoft Visual Studio14/Common7/IDE/')
 	-Install the WiX toolset...
 		- http://wixtoolset.org/releases/
 		-I used stable version 3.10.3 for development
@@ -19,7 +21,7 @@ Build the installer
 ---------------------
 Update Version Number
 ---------------------
--See below (Create new Version)
+-See below ('chapter' Create new Version)
 		
 		
 ---------------------------------------------------
@@ -46,7 +48,7 @@ Generel
 			-Id: guess what...
 			-Name: the name that the file will have on the user machine, may be different from the file name on the source machine
 			-Source: the path and name to the file on the source machine, relative to the current .wxs file
-			-KeyPath: depends on where you want to install the file, see below
+			-KeyPath: depends on where you want to install the file, see below in 'Add new file to...'
 		-usually there is one component for each single file. Multiple files can be added to a component, this might make sense if the files are considered 100% unseperable. The recommended way however is one file per component
 			
 			
@@ -75,6 +77,12 @@ Not quite done yet! (coati.wxs)
 Create new version
 ------------------
 
+Version Number
+	-is now a preprocessor variable
+	-is defined in build.bat
+		-candle.exe -dprojectVersion="0.7.0" ...
+		-replace 0.7.0 with the desired version number
+
 Minor upgrage (coati.wxs)
 	-for when only a few files are to be updated
 	-update the Version attribute of the <Product> tag (root element of the installation)