From ede5a70beb7c667f09687658cb5508ade332ad32 Mon Sep 17 00:00:00 2001
From: "chris.watts90@outlook.com" <chris.watts90@outlook.com>
Date: Tue, 18 Apr 2017 11:16:12 +0100
Subject: [PATCH] Added SQLiteRepositoryInstaller Chain entry to install SQLite
 provider if chosen.

Added INSTALLFOLDER configuration to set a single install directory for both data service and plugins.
#25
---
 .../FlexiTimeSystemInstaller/Bundle.wxs          | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs
index f1aebcb..0d330d0 100644
--- a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs
+++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs
@@ -14,6 +14,12 @@
     <Variable Name="InstallDataCenter" Value="1" Type="numeric"/>
     <Variable Name="DataServiceIpAddress" Value="127.0.0.1" Type="string"/>
     <Variable Name="DataServicePort" Value="8800" Type="string"/>
+    <Variable Name="INSTALLFOLDER"
+          bal:Overridable="yes"
+          Type="string"
+          Value="[ProgramFilesFolder]Flexitime Data Center"/>
+    <Variable Name="InstallSQLiteDatabase" Value="1" Type="numeric"/>
+    
 		<Chain>
       <MsiPackage SourceFile="$(var.CardReaderServiceInstaller.TargetDir)CardReaderServiceInstaller.msi"
                   Compressed="yes"
@@ -29,6 +35,16 @@
                   DisplayName="Flexitime Data Center"
                   InstallCondition="InstallDataCenter = 1">
         <MsiProperty Name="ServicePort" Value="[DataServicePort]"/>
+        <MsiProperty Name="INSTALLFOLDER"
+                     Value="[INSTALLFOLDER]" />
+      </MsiPackage>
+      <MsiPackage SourceFile="$(var.SQLiteRepositoryInstaller.TargetDir)SQLiteRepository.msi"
+                  Compressed="yes"
+                  Visible="no"
+                  DisplayName="Flexitime SQLite Database Provider"
+                  InstallCondition="InstallSQLiteDatabase = 1">
+        <MsiProperty Name="INSTALLFOLDER"
+                     Value="[INSTALLFOLDER]" />
       </MsiPackage>
 		</Chain>
 	</Bundle>