From 3ee0d4baf37398251231aefd649a63e696a594d3 Mon Sep 17 00:00:00 2001
From: Luc <lvandenb@sckcen.be>
Date: Mon, 26 Apr 2021 12:06:22 +0200
Subject: [PATCH] met wix 2 projects

---
 SetupProject1/Product.wxs                     | 37 +++++++++++++++----
 SetupProject1/SetupProject1.wax               |  5 ++-
 ...etupProject1.wixproj => eDosSetup.wixproj} | 11 +++++-
 eDosStation.sln                               |  2 +-
 4 files changed, 43 insertions(+), 12 deletions(-)
 rename SetupProject1/{SetupProject1.wixproj => eDosSetup.wixproj} (84%)

diff --git a/SetupProject1/Product.wxs b/SetupProject1/Product.wxs
index c2aa6cb..d67e076 100644
--- a/SetupProject1/Product.wxs
+++ b/SetupProject1/Product.wxs
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
+  <?define eDosSync_TargetDir=$(var.syncEdosLocal.TargetDir)?><?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?>
 	<Product Id="*" Name="eDosStation" Language="1033" Version="1.0.0.0" Manufacturer="LSW" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
-		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"   />
-    <Media Id="1" EmbedCab="yes" Cabinet="cab" />
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+    <Media Id="1" EmbedCab="yes" Cabinet="cab"  />
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     
     <Feature Id="ProductFeature" Title="eDosStation" Level="1">
-			<ComponentGroupRef Id="ProductComponents" />
+			<ComponentGroupRef Id="eDosStation" />
+      <ComponentGroupRef Id="eDosSync" />
 		</Feature>
 	</Product>
 
 	<Fragment>
 		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="ProgramFilesFolder" Name="soft">
-				<Directory Id="INSTALLFOLDER" Name="eDosStation">
-				</Directory>
+			<Directory Id="ProgramFilesFolder">
+        
+					<Directory Id="INSTALLFOLDER" Name="eDos">
+            <Directory Id="eDosStationFolder" Name="eDosStation" />
+            <Directory Id="eDosSyncFolder" Name="eDosSync" />
+					</Directory>
+        
 			</Directory>
 		</Directory>
 	</Fragment>
 
 	<Fragment>
-		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+		<ComponentGroup Id="eDosStation" Directory="eDosStationFolder">
 			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
 			<!-- <Component Id="ProductComponent"> -->
 				<!-- TODO: Insert files, registry keys, and other resources here. -->
@@ -58,7 +64,22 @@
 			</Component>
 			
 		</ComponentGroup>
-	</Fragment>
+    <ComponentGroup Id="eDosSync" Directory="eDosSyncFolder">
+      <Component Id="syncEdosLocal.exe.config" Guid="d1c4ba86-8a63-4b73-9179-a5eab405f8cb">
+        <File Id="syncEdosLocal.exe.config" Name="syncEdosLocal.exe.config" Source="$(var.syncEdosLocal_TargetDir)syncEdosLocal.exe.config" />
+      </Component>
+      <Component Id="syncEdosLocal.exe" Guid="9552f9bf-c9cb-42dd-8e30-c99853613f77">
+        <File Id="syncEdosLocal.exe" Name="syncEdosLocal.exe" Source="$(var.syncEdosLocal_TargetDir)syncEdosLocal.exe" />
+      </Component>
+      <Component Id="syncEdosLocal.pdb" Guid="5179a887-867c-4000-8fb2-c7999f23591f">
+        <File Id="syncEdosLocal.pdb" Name="syncEdosLocal.pdb" Source="$(var.syncEdosLocal_TargetDir)syncEdosLocal.pdb" />
+      </Component>
+      <Component Id="LSWLib.dll" Guid="27679139-5900-4901-b148-751e49c9bc74">
+        <File Id="LSWLib.dll" Name="LSWLib.dll" Source="$(var.syncEdosLocal_TargetDir)LSWLib.dll" />
+      </Component>
 
+    </ComponentGroup>
+	</Fragment>
+    
  
 </Wix>
diff --git a/SetupProject1/SetupProject1.wax b/SetupProject1/SetupProject1.wax
index c1a5902..bcbe63c 100644
--- a/SetupProject1/SetupProject1.wax
+++ b/SetupProject1/SetupProject1.wax
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-16"?>
 <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <DeployedProjects>
+    <string>syncEdosLocal\syncEdosLocal.csproj</string>
     <string>eDosStation\eDosStation.csproj</string>
   </DeployedProjects>
   <DirectoryMappings>
     <Item Key="" Value="INSTALLFOLDER" />
   </DirectoryMappings>
   <FileMappings />
-  <DeploySymbols>true</DeploySymbols>
-  <DeployLocalizations>true</DeployLocalizations>
+  <DeploySymbols>false</DeploySymbols>
+  <DeployLocalizations>false</DeployLocalizations>
   <DeployExternalLocalizations>false</DeployExternalLocalizations>
   <ExcludedProjectItems>-</ExcludedProjectItems>
 </Configuration>
\ No newline at end of file
diff --git a/SetupProject1/SetupProject1.wixproj b/SetupProject1/eDosSetup.wixproj
similarity index 84%
rename from SetupProject1/SetupProject1.wixproj
rename to SetupProject1/eDosSetup.wixproj
index 8bdb1d7..2d0105a 100644
--- a/SetupProject1/SetupProject1.wixproj
+++ b/SetupProject1/eDosSetup.wixproj
@@ -6,8 +6,9 @@
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>d24e8510-81c4-4f32-b48d-38ba67aefb0a</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>SetupProject1</OutputName>
+    <OutputName>eDos</OutputName>
     <OutputType>Package</OutputType>
+    <Name>eDosSetup</Name>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
@@ -30,6 +31,14 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\syncEdosLocal\syncEdosLocal.csproj">
+      <Name>syncEdosLocal</Name>
+      <Project>{b2264ff1-0f36-401b-91fe-db3087ce05f5}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="SetupProject1.wax" />
diff --git a/eDosStation.sln b/eDosStation.sln
index 1de9325..8e96550 100644
--- a/eDosStation.sln
+++ b/eDosStation.sln
@@ -19,7 +19,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegisterBAdge", "RegisterBA
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "syncEdosLocal", "syncEdosLocal\syncEdosLocal.csproj", "{B2264FF1-0F36-401B-91FE-DB3087CE05F5}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupProject1", "SetupProject1\SetupProject1.wixproj", "{D24E8510-81C4-4F32-B48D-38BA67AEFB0A}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "eDosSetup", "SetupProject1\eDosSetup.wixproj", "{D24E8510-81C4-4F32-B48D-38BA67AEFB0A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution