From d5544dc6d1b1d781db5e6cdd9157c93b5aaceace Mon Sep 17 00:00:00 2001
From: walker0643 <>
Date: Tue, 6 Feb 2018 20:08:37 -0500
Subject: [PATCH] fix installer build. at this point the process is not at all
 robust..it mainly just works for me.

---
 build_installer_windows.bat | 35 +++++++++++++++++++++++++++++++++++
 dist/wix/Include.wxi.in     | 10 +++++-----
 dist/wix/Product.wxs        | 23 +++--------------------
 3 files changed, 43 insertions(+), 25 deletions(-)
 create mode 100644 build_installer_windows.bat

diff --git a/build_installer_windows.bat b/build_installer_windows.bat
new file mode 100644
index 00000000..8bac74c9
--- /dev/null
+++ b/build_installer_windows.bat
@@ -0,0 +1,35 @@
+@echo off
+set WIX_ROOT=C:\Program Files (x86)\WiX Toolset v3.11
+
+set savedir=%cd%
+cd /d %~dp0
+
+if not exist build\bin\Release goto buildproject
+
+cd build\installer
+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
+if ERRORLEVEL 1 goto failed
+echo Build completed successfully
+goto done
+
+:buildproject
+echo To build a 64-bit Windows installer:
+echo  - set Q_BUILD_TYPE=Release in winbuild_env.bat
+echo  - also set other environmental overrides necessary for your build environment
+echo  - run clean_build_windows.bat to build Barrier and verify that it succeeds
+echo  - re-run this script to create the installation package
+goto done
+
+:failed
+echo Build failed
+
+:done
+set WIX_ROOT=
+
+cd /d %savedir%
+set savedir=
diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in
index de30cb9f..962f5d7a 100644
--- a/dist/wix/Include.wxi.in
+++ b/dist/wix/Include.wxi.in
@@ -2,7 +2,7 @@
 <Include>
     <?define Name="Barrier" ?>
     <?define Version="@BARRIER_VERSION@" ?>
-    <?define QtVersion="5.9.3" ?> <!-- TODO: Configure this externally //--> 
+    <?define QtVersion="5.6.3" ?> <!-- TODO: Configure this externally //--> 
     <?define Author="Debauchee Open Source Group" ?>
     <?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?>
     <?define ResPath="@CMAKE_CURRENT_SOURCE_DIR@/res" ?>
@@ -11,19 +11,19 @@
         <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
         <?define PlatformSimpleName="64-bit" ?>
         <?define UpgradeGuid="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
-        <?define QtPath="C:\Qt\$(var.QtVersion)\msvc2015_64" ?>
+        <?define QtPath="E:\Qt\$(var.QtVersion)\msvc2015_64" ?>
     <?else ?>
         <?define ProgramFilesFolder="ProgramFilesFolder" ?>
         <?define PlatformSimpleName="32-bit" ?>
         <?define UpgradeGuid="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?>
-        <?define QtPath="C:\Qt\$(var.QtVersion)\msvc2015" ?>
+        <?define QtPath="E:\Qt\$(var.QtVersion)\msvc2015" ?>
     <?endif ?>
     <?define QtBinPath="$(var.QtPath)\bin" ?>
     <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
     <?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
     <?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?>
     <?if $(var.Configuration) = "Debug" ?>
-        <?define DebugCRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_DebugCRT_$(var.Platform).msm" ?>
+        <?define DebugCRT="$(env.ProgramFiles)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.11.25325\Merge Modules\Microsoft_VC141_DebugCRT_$(var.Platform).msm" ?>
     <?endif ?>
-    <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
+    <?define CRT="$(env.ProgramFiles)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.11.25325\MergeModules\Microsoft_VC141_CRT_$(var.Platform).msm" ?>
 </Include>
diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs
index 4923f953..dd74f7d4 100644
--- a/dist/wix/Product.wxs
+++ b/dist/wix/Product.wxs
@@ -12,8 +12,6 @@
 		</Upgrade>
 		<Feature Id="ProductFeature" Title="$(var.Name)">
 			<ComponentGroupRef Id="ProductComponents"/>
-			<ComponentGroupRef Id="OpenSSLComponents"/>
-			<ComponentGroupRef Id="ProductQtPluginComponents"/>
 			<MergeRef Id="CRT"/>
             <?if $(var.Configuration) = "Debug" ?>
 			    <MergeRef Id="DebugCRT"/>
@@ -79,6 +77,8 @@
 				<File Source="$(var.BinPath)/synwinhk.dll"/>
 				<File Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
 				<File Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
+				<File Source="$(var.OpenSSLBinPath)/openssl.exe"/>
+				<File Source="$(var.ResPath)/openssl/barrier.conf"/>
 			</Component>
 			<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
 				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/barrier.exe">
@@ -106,22 +106,5 @@
 				<?endif ?>
 			</Component>
 		</ComponentGroup>
-		<ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">
-			<Component Guid="684EFA14-856B-440E-A5E6-E90E04E36B41" Id="QtPlatformPlugin">
-				<?if $(var.Configuration) = "Debug" ?>
-				<File Source="$(var.QtPlatformPath)\qwindowsd.dll"/>
-				<?else ?>
-				<File Source="$(var.QtPlatformPath)\qwindows.dll"/>
-				<?endif ?>
-			</Component>
-		</ComponentGroup>
-		<ComponentGroup Directory="OpenSSLDir" Id="OpenSSLComponents">
-			<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSSL">
-				<File Id="OpenSSLDll1" Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
-				<File Id="OpenSSLDll2" Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
-				<File Source="$(var.OpenSSLBinPath)/openssl.exe"/>
-				<File Source="$(var.ResPath)/openssl/barrier.conf"/>
-			</Component>
-		</ComponentGroup>
 	</Fragment>
-</Wix>
\ No newline at end of file
+</Wix>