From 4afa31ac54c81b33253579e16842fb03ac5c227e Mon Sep 17 00:00:00 2001
From: noisyshape <49459678+noisyshape@users.noreply.github.com>
Date: Fri, 12 Apr 2019 10:09:40 -0400
Subject: [PATCH 1/5] Correct path and instructions

---
 build_installer.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_installer.bat b/build_installer.bat
index 424e585a..050bff87 100644
--- a/build_installer.bat
+++ b/build_installer.bat
@@ -6,7 +6,7 @@ cd /d %~dp0
 
 if not exist build\bin\Release goto buildproject
 
-cd build\installer
+cd build\installer-wix
 if ERRORLEVEL 1 goto buildproject
 
 echo Building 64-bit Windows installer...
@@ -19,7 +19,7 @@ goto done
 
 :buildproject
 echo To build a 64-bit Windows installer:
-echo  - set Q_BUILD_TYPE=Release in build_env.bat
+echo  - set B_BUILD_TYPE=Release in build_env.bat
 echo  - also set other environmental overrides necessary for your build environment
 echo  - run clean_build.bat to build Barrier and verify that it succeeds
 echo  - re-run this script to create the installation package

From 6a70ef9efbdd0dc1ec201bcbdc206e1d0c9f70ef Mon Sep 17 00:00:00 2001
From: noisyshape <noisyshape@gmail.com>
Date: Fri, 12 Apr 2019 10:29:27 -0400
Subject: [PATCH 2/5] Create version number for wix

---
 CMakeLists.txt          | 1 +
 dist/wix/Include.wxi.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 538f8f9c..d5ec96f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -403,6 +403,7 @@ endif()
 # Windows installer
 #
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+        set (BARRIER_WIX_VERSION "${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}")
         message (STATUS "Configuring the wix installer")
         configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer-wix)
         message (STATUS "Configuring the inno installer")
diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in
index 652d203a..c227521f 100644
--- a/dist/wix/Include.wxi.in
+++ b/dist/wix/Include.wxi.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
     <?define Name="Barrier" ?>
-    <?define Version="@BARRIER_VERSION@" ?>
+    <?define Version="@BARRIER_WIX_VERSION@" ?>
     <?define QtVersion="@QT_VERSION@" ?>
     <?define Author="Debauchee Open Source Group" ?>
     <?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?>

From cdf37376f52c0a7f8e097d8ec948a6a7843d20fb Mon Sep 17 00:00:00 2001
From: noisyshape <noisyshape@gmail.com>
Date: Fri, 12 Apr 2019 10:33:11 -0400
Subject: [PATCH 3/5] Remove hardcoded paths

---
 dist/wix/Include.wxi.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in
index c227521f..cba9a06a 100644
--- a/dist/wix/Include.wxi.in
+++ b/dist/wix/Include.wxi.in
@@ -11,12 +11,12 @@
         <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
         <?define PlatformSimpleName="64-bit" ?>
         <?define UpgradeGuid="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
-        <?define QtPath="E:\Qt\$(var.QtVersion)\msvc2015_64" ?>
+        <?define QtPath="@CMAKE_PREFIX_PATH@" ?>
     <?else ?>
         <?define ProgramFilesFolder="ProgramFilesFolder" ?>
         <?define PlatformSimpleName="32-bit" ?>
         <?define UpgradeGuid="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?>
-        <?define QtPath="E:\Qt\$(var.QtVersion)\msvc2015" ?>
+        <?define QtPath="@CMAKE_PREFIX_PATH@" ?>
     <?endif ?>
     <?define QtBinPath="$(var.QtPath)\bin" ?>
     <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>

From 35e6693d6d22a226c106ac6461c351aa35569769 Mon Sep 17 00:00:00 2001
From: noisyshape <noisyshape@gmail.com>
Date: Fri, 12 Apr 2019 10:35:10 -0400
Subject: [PATCH 4/5] Fix XML

---
 dist/wix/Product.wxs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs
index 1abc21ee..d0b79806 100644
--- a/dist/wix/Product.wxs
+++ b/dist/wix/Product.wxs
@@ -31,7 +31,6 @@
 		<Property Id="ARPPRODUCTICON" Value="barrier.ico"/>
 		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
 		<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable"/>
-    </Condition>
 		<CustomAction ExeCommand="" FileKey="GuiProgram" Id="StartGui" Return="asyncNoWait"/>
 		<UI>
 			<Publish Control="Finish" Dialog="ExitDialog" Event="DoAction" Value="StartGui">NOT Installed</Publish>

From 18ac0fe4b5ff17d3009067b4389a6fa284b7323a Mon Sep 17 00:00:00 2001
From: noisyshape <noisyshape@gmail.com>
Date: Thu, 18 Apr 2019 18:39:29 -0400
Subject: [PATCH 5/5] Replace Wix with Inno Setup

The Wix configuration is left over from Synergy.
---
 build_installer.bat | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/build_installer.bat b/build_installer.bat
index 050bff87..9c204ccf 100644
--- a/build_installer.bat
+++ b/build_installer.bat
@@ -1,19 +1,18 @@
 @echo off
-set WIX_ROOT=C:\Program Files (x86)\WiX Toolset v3.11
+set INNO_ROOT=C:\Program Files (x86)\Inno Setup 5
 
 set savedir=%cd%
 cd /d %~dp0
 
 if not exist build\bin\Release goto buildproject
 
-cd build\installer-wix
-if ERRORLEVEL 1 goto buildproject
-
 echo Building 64-bit Windows installer...
-"%WIX_ROOT%\bin\candle.exe" -nologo -arch x64 -dConfiguration=Release -dPlatform=x64 -ext WixUtilExtension -ext WixFirewallExtension Product.wxs -o Barrier.wixobj
-if ERRORLEVEL 1 goto failed
-"%WIX_ROOT%\bin\light.exe" -nologo -ext WixUtilExtension -ext WixFirewallExtension -ext WixUIExtension Barrier.wixobj -o bin\Barrier.msi
+
+cd build\installer-inno
+if ERRORLEVEL 1 goto buildproject
+"%INNO_ROOT%\ISCC.exe" /Qp barrier.iss
 if ERRORLEVEL 1 goto failed
+
 echo Build completed successfully
 goto done
 
@@ -29,7 +28,7 @@ goto done
 echo Build failed
 
 :done
-set WIX_ROOT=
+set INNO_ROOT=
 
 cd /d %savedir%
 set savedir=