From c6a6e6d028e5308130431733eb9c696243e21ad6 Mon Sep 17 00:00:00 2001 From: Manuel Dobusch Date: Thu, 11 Aug 2016 15:14:15 +0200 Subject: [PATCH] build: wix installer integration Updated wix installer to better facilitate the integration into the deploy process. --- deployment/windows/wixSetup/build.bat | 10 ++++++++-- deployment/windows/wixSetup/coati.wxs | 10 ++++++---- deployment/windows/wixSetup/readme.txt | 12 ++++++++++-- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/deployment/windows/wixSetup/build.bat b/deployment/windows/wixSetup/build.bat index 38f6c951..faa8dfa9 100644 --- a/deployment/windows/wixSetup/build.bat +++ b/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 \ No newline at end of file +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 diff --git a/deployment/windows/wixSetup/coati.wxs b/deployment/windows/wixSetup/coati.wxs index ff9c276d..929ee970 100644 --- a/deployment/windows/wixSetup/coati.wxs +++ b/deployment/windows/wixSetup/coati.wxs @@ -4,7 +4,7 @@ + Language='1033' Codepage='1252' Version='$(var.projectVersion)'> + Minimum='$(var.projectVersion)' IncludeMinimum='yes' + Maximum='$(var.projectVersion)' IncludeMaximum='yes' /> + Minimum='$(var.projectVersion)' IncludeMinimum='no' /> @@ -278,5 +278,7 @@ + + \ No newline at end of file diff --git a/deployment/windows/wixSetup/readme.txt b/deployment/windows/wixSetup/readme.txt index 6c9800d1..a445a3df 100644 --- a/deployment/windows/wixSetup/readme.txt +++ b/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 tag (root element of the installation)