From 9fbec1184e852c8df8231cfe23d8ce00750a3971 Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Tue, 7 Feb 2017 16:41:58 +0000
Subject: [PATCH] Cleanup WiX and make it configuration ready

---
 src/setup/win32/Include.wxi    | 29 -----------------------------
 src/setup/win32/Include.wxi.in | 25 +++++++++++++++++++++++++
 src/setup/win32/Product.wxs    | 14 +++++++-------
 3 files changed, 32 insertions(+), 36 deletions(-)
 delete mode 100644 src/setup/win32/Include.wxi
 create mode 100644 src/setup/win32/Include.wxi.in

diff --git a/src/setup/win32/Include.wxi b/src/setup/win32/Include.wxi
deleted file mode 100644
index 22e42077..00000000
--- a/src/setup/win32/Include.wxi
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Include>
-    <?define Name="Synergy" ?>
-    <?define Author="Symless Ltd" ?>
-    <?define BinPath="../../../bin/$(var.Configuration)" ?>
-    <?define ResPath="../../../res" ?>
-    <?define ExtPath="../../../ext" ?>
-    <?ifndef Version ?>
-    <?define Version="1.0.0" ?>
-    <?endif ?>
-    <?define UpgradeGuid32="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?>
-    <?define UpgradeGuid64="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
-    <?if $(var.Platform) = "x64" ?>
-    <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
-    <?define PlatformSimpleName="64-bit" ?>
-    <?define UpgradeGuid="$(var.UpgradeGuid64)" ?>
-    <?define var.OpenSSLPath="openssl/win64" ?>
-    <?define var.QtPath="C:\Qt\5.6\msvc2015_64\bin" ?>
-    <?define QtPlatformPath="C:\Qt\5.6\msvc2015_64\plugins\platforms" ?>
-    <?else ?>
-    <?define ProgramFilesFolder="ProgramFilesFolder" ?>
-    <?define PlatformSimpleName="32-bit" ?>
-    <?define UpgradeGuid="$(var.UpgradeGuid32)" ?>
-    <?define var.OpenSSLPath="openssl/win32" ?>
-    <?define var.QtPath="C:\Qt\5.6\msvc2015\bin" ?>
-    <?define QtPlatformPath="C:\Qt\5.6\msvc2015\plugins\platforms" ?>
-    <?endif ?>
-    <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
-</Include>
\ No newline at end of file
diff --git a/src/setup/win32/Include.wxi.in b/src/setup/win32/Include.wxi.in
new file mode 100644
index 00000000..61e25ba8
--- /dev/null
+++ b/src/setup/win32/Include.wxi.in
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+    <?define Name="Synergy" ?>
+    <?define Version="1.9.0" ?> <!-- TODO: Configure this externally //--> 
+    <?define QtVersion="5.8" ?> <!-- TODO: Configure this externally //--> 
+    <?define Author="Symless Ltd" ?>
+    <?define BinPath="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}\$(var.Configuration)" ?>
+    <?define ResPath="${CMAKE_CURRENT_SOURCE_DIR}\res" ?>
+    <?define ExtPath="${CMAKE_CURRENT_SOURCE_DIR}\ext" ?>
+    <?if $(var.Platform) = "x64" ?>
+        <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
+        <?define PlatformSimpleName="64-bit" ?>
+        <?define UpgradeGuid="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
+        <?define QtPath="C:\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" ?>
+    <?endif ?>
+    <?define QtBinPath="$(var.QtPath)\bin" ?>
+    <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
+    <?define OpenSSLPath="$(var.ExtPath)\openssl\$(var.Platform)" ?>
+    <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
+</Include>
\ No newline at end of file
diff --git a/src/setup/win32/Product.wxs b/src/setup/win32/Product.wxs
index 458dde50..c70ae0aa 100644
--- a/src/setup/win32/Product.wxs
+++ b/src/setup/win32/Product.wxs
@@ -78,13 +78,13 @@
 					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="synergy.ico" Id="GuiShortcut" Name="$(var.Name)"/>
 					<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
 				</File>
-				<File Source="$(var.QtPath)\Qt5Core.dll"/>
-				<File Source="$(var.QtPath)\Qt5Gui.dll"/>
-				<File Source="$(var.QtPath)\Qt5Network.dll"/>
-				<File Source="$(var.QtPath)\Qt5Svg.dll"/>
-				<File Source="$(var.QtPath)\Qt5Widgets.dll"/>
-				<File Source="$(var.QtPath)\libGLESv2.dll"/>
-				<File Source="$(var.QtPath)\libEGL.dll"/>
+				<File Source="$(var.QtBinPath)\Qt5Core.dll"/>
+				<File Source="$(var.QtBinPath)\Qt5Gui.dll"/>
+				<File Source="$(var.QtBinPath)\Qt5Network.dll"/>
+				<File Source="$(var.QtBinPath)\Qt5Svg.dll"/>
+				<File Source="$(var.QtBinPath)\Qt5Widgets.dll"/>
+				<File Source="$(var.QtBinPath)\libGLESv2.dll"/>
+				<File Source="$(var.QtBinPath)\libEGL.dll"/>
 			</Component>
 		</ComponentGroup>
 		<ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">