From 88ba01b4dcd99b8b09774b6c55e8ca8423ee7074 Mon Sep 17 00:00:00 2001
From: Tim Gerundt <tim@gerundt.de>
Date: Tue, 26 May 2009 14:10:35 +0000
Subject: [PATCH] PATCH: [ 2690509 ] Installer: First MSI setup - Move fragment
 files to a own folder

---
 Installer/WiX/{ => Fragments}/Core.wxs           |  2 +-
 Installer/WiX/{ => Fragments}/Docs.wxs           |  2 +-
 Installer/WiX/{ => Fragments}/Features.wxs       |  2 +-
 Installer/WiX/{ => Fragments}/Filters.wxs        |  2 +-
 Installer/WiX/{ => Fragments}/Languages.wxs      |  2 +-
 Installer/WiX/{ => Fragments}/Plugins.wxs        |  2 +-
 Installer/WiX/{ => Fragments}/WixUI_WinMerge.wxs |  0
 Installer/WiX/WinMerge.wixproj                   | 14 +++++++-------
 Installer/WiX/WinMerge.wxs                       |  4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)
 rename Installer/WiX/{ => Fragments}/Core.wxs (96%)
 rename Installer/WiX/{ => Fragments}/Docs.wxs (94%)
 rename Installer/WiX/{ => Fragments}/Features.wxs (96%)
 rename Installer/WiX/{ => Fragments}/Filters.wxs (96%)
 rename Installer/WiX/{ => Fragments}/Languages.wxs (96%)
 rename Installer/WiX/{ => Fragments}/Plugins.wxs (96%)
 rename Installer/WiX/{ => Fragments}/WixUI_WinMerge.wxs (100%)

diff --git a/Installer/WiX/Core.wxs b/Installer/WiX/Fragments/Core.wxs
similarity index 96%
rename from Installer/WiX/Core.wxs
rename to Installer/WiX/Fragments/Core.wxs
index 38b4ab7ad..e1e73271e 100644
--- a/Installer/WiX/Core.wxs
+++ b/Installer/WiX/Fragments/Core.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?include Config.wxi ?>
+  <?include ..\Config.wxi ?>
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="WinMergeU" Guid="*" Win64="$(var.Win64)">
diff --git a/Installer/WiX/Docs.wxs b/Installer/WiX/Fragments/Docs.wxs
similarity index 94%
rename from Installer/WiX/Docs.wxs
rename to Installer/WiX/Fragments/Docs.wxs
index 56f3f6272..4d1fa7dd2 100644
--- a/Installer/WiX/Docs.wxs
+++ b/Installer/WiX/Fragments/Docs.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?include Config.wxi ?>
+  <?include ..\Config.wxi ?>
   <Fragment>
     <DirectoryRef Id="DOCSDIR">
       <Component Id="ReadMe" Guid="*" Win64="$(var.Win64)">
diff --git a/Installer/WiX/Features.wxs b/Installer/WiX/Fragments/Features.wxs
similarity index 96%
rename from Installer/WiX/Features.wxs
rename to Installer/WiX/Fragments/Features.wxs
index c1320a85e..54e66453e 100644
--- a/Installer/WiX/Features.wxs
+++ b/Installer/WiX/Fragments/Features.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?include Config.wxi ?>
+  <?include ..\Config.wxi ?>
   <Fragment>
     <!--
       * Level <= 3 is "Typical"
diff --git a/Installer/WiX/Filters.wxs b/Installer/WiX/Fragments/Filters.wxs
similarity index 96%
rename from Installer/WiX/Filters.wxs
rename to Installer/WiX/Fragments/Filters.wxs
index 052bae6cc..979274306 100644
--- a/Installer/WiX/Filters.wxs
+++ b/Installer/WiX/Fragments/Filters.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?include Config.wxi ?>
+  <?include ..\Config.wxi ?>
   <Fragment>
     <DirectoryRef Id="FILTERSDIR">
       <Component Id="ADAMulti" Guid="*" Win64="$(var.Win64)">
diff --git a/Installer/WiX/Languages.wxs b/Installer/WiX/Fragments/Languages.wxs
similarity index 96%
rename from Installer/WiX/Languages.wxs
rename to Installer/WiX/Fragments/Languages.wxs
index a7db58879..744057d11 100644
--- a/Installer/WiX/Languages.wxs
+++ b/Installer/WiX/Fragments/Languages.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?include Config.wxi ?>
+  <?include ..\Config.wxi ?>
   <Fragment>
     <DirectoryRef Id="LANGDIR">
       <Component Id="Brazilian" Guid="*" Win64="$(var.Win64)">
diff --git a/Installer/WiX/Plugins.wxs b/Installer/WiX/Fragments/Plugins.wxs
similarity index 96%
rename from Installer/WiX/Plugins.wxs
rename to Installer/WiX/Fragments/Plugins.wxs
index 1bcd47047..85b059752 100644
--- a/Installer/WiX/Plugins.wxs
+++ b/Installer/WiX/Fragments/Plugins.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?include Config.wxi ?>
+  <?include ..\Config.wxi ?>
   <Fragment>
     <?if not $(var.Platform) = "x64" ?>
       <DirectoryRef Id="PLUGINSDIR">
diff --git a/Installer/WiX/WixUI_WinMerge.wxs b/Installer/WiX/Fragments/WixUI_WinMerge.wxs
similarity index 100%
rename from Installer/WiX/WixUI_WinMerge.wxs
rename to Installer/WiX/Fragments/WixUI_WinMerge.wxs
diff --git a/Installer/WiX/WinMerge.wixproj b/Installer/WiX/WinMerge.wixproj
index a4d151f59..ce54cf440 100644
--- a/Installer/WiX/WinMerge.wixproj
+++ b/Installer/WiX/WinMerge.wixproj
@@ -17,13 +17,13 @@
   <ItemGroup>
     <WixExtension Include="$(WixToolPath)WixUIExtension.dll" />
     <Compile Include="WinMerge.wxs"/>
-    <Compile Include="Core.wxs"/>
-    <Compile Include="Docs.wxs"/>
-    <Compile Include="Filters.wxs"/>
-    <Compile Include="Languages.wxs"/>
-    <Compile Include="Plugins.wxs"/>
-    <Compile Include="Features.wxs"/>
-    <Compile Include="WixUI_WinMerge.wxs"/>
+    <Compile Include="Fragments\Core.wxs"/>
+    <Compile Include="Fragments\Docs.wxs"/>
+    <Compile Include="Fragments\Filters.wxs"/>
+    <Compile Include="Fragments\Languages.wxs"/>
+    <Compile Include="Fragments\Plugins.wxs"/>
+    <Compile Include="Fragments\Features.wxs"/>
+    <Compile Include="Fragments\WixUI_WinMerge.wxs"/>
   </ItemGroup>
   
   <Import Project="$(WixTargetsPath)"/>
diff --git a/Installer/WiX/WinMerge.wxs b/Installer/WiX/WinMerge.wxs
index 6852e3e71..5c4fba8be 100644
--- a/Installer/WiX/WinMerge.wxs
+++ b/Installer/WiX/WinMerge.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    candleArgs: "WinMerge.wxs" "Core.wxs" "Docs.wxs" "Filters.wxs" "Plugins.wxs" "Languages.wxs" "Features.wxs" "WixUI_WinMerge.wxs" <extensions>
-    lightArgs: "WinMerge.wixobj" "Core.wixobj" "Docs.wixobj" "Filters.wixobj" "Plugins.wixobj" "Languages.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions>
+    candleArgs: "WinMerge.wxs" "Fragments\Core.wxs" "Fragments\Docs.wxs" "Fragments\Filters.wxs" "Fragments\Plugins.wxs" "Fragments\Languages.wxs" "Fragments\Features.wxs" "Fragments\WixUI_WinMerge.wxs" <extensions>
+    lightArgs: "WinMerge.wixobj" "Fragments\Core.wixobj" "Fragments\Docs.wixobj" "Fragments\Filters.wixobj" "Fragments\Plugins.wixobj" "Fragments\Languages.wixobj" "Fragments\Features.wixobj" "Fragments\WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions>
 -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?include Config.wxi ?>
-- 
2.11.0