PATCH: [ 2690509 ] Installer: First MSI setup - Move fragment files to a own folder

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 38b4ab7..e1e7327 100644 (file)
--- a/Installer/WiX/Core.wxs
+++ b/Installer/WiX/Fragments/Core.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
-  <?include Config.wxi ?>\r
+  <?include ..\Config.wxi ?>\r
   <Fragment>\r
     <DirectoryRef Id="INSTALLDIR">\r
       <Component Id="WinMergeU" Guid="*" Win64="$(var.Win64)">\r

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 56f3f62..4d1fa7d 100644 (file)
--- a/Installer/WiX/Docs.wxs
+++ b/Installer/WiX/Fragments/Docs.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
-  <?include Config.wxi ?>\r
+  <?include ..\Config.wxi ?>\r
   <Fragment>\r
     <DirectoryRef Id="DOCSDIR">\r
       <Component Id="ReadMe" Guid="*" Win64="$(var.Win64)">\r

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 c1320a8..54e6645 100644 (file)
--- a/Installer/WiX/Features.wxs
+++ b/Installer/WiX/Fragments/Features.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
-  <?include Config.wxi ?>\r
+  <?include ..\Config.wxi ?>\r
   <Fragment>\r
     <!--\r
       * Level <= 3 is "Typical"\r

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 052bae6..9792743 100644 (file)
--- a/Installer/WiX/Filters.wxs
+++ b/Installer/WiX/Fragments/Filters.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
-  <?include Config.wxi ?>\r
+  <?include ..\Config.wxi ?>\r
   <Fragment>\r
     <DirectoryRef Id="FILTERSDIR">\r
       <Component Id="ADAMulti" Guid="*" Win64="$(var.Win64)">\r

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 a7db588..744057d 100644 (file)
--- a/Installer/WiX/Languages.wxs
+++ b/Installer/WiX/Fragments/Languages.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
-  <?include Config.wxi ?>\r
+  <?include ..\Config.wxi ?>\r
   <Fragment>\r
     <DirectoryRef Id="LANGDIR">\r
       <Component Id="Brazilian" Guid="*" Win64="$(var.Win64)">\r

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 1bcd470..85b0597 100644 (file)
--- a/Installer/WiX/Plugins.wxs
+++ b/Installer/WiX/Fragments/Plugins.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
-  <?include Config.wxi ?>\r
+  <?include ..\Config.wxi ?>\r
   <Fragment>\r
     <?if not $(var.Platform) = "x64" ?>\r
       <DirectoryRef Id="PLUGINSDIR">\r

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 a4d151f..ce54cf4 100644 (file)
--- a/Installer/WiX/WinMerge.wixproj
+++ b/Installer/WiX/WinMerge.wixproj
@@ -17,13 +17,13 @@
   <ItemGroup>\r
     <WixExtension Include="$(WixToolPath)WixUIExtension.dll" />\r
     <Compile Include="WinMerge.wxs"/>\r
-    <Compile Include="Core.wxs"/>\r
-    <Compile Include="Docs.wxs"/>\r
-    <Compile Include="Filters.wxs"/>\r
-    <Compile Include="Languages.wxs"/>\r
-    <Compile Include="Plugins.wxs"/>\r
-    <Compile Include="Features.wxs"/>\r
-    <Compile Include="WixUI_WinMerge.wxs"/>\r
+    <Compile Include="Fragments\Core.wxs"/>\r
+    <Compile Include="Fragments\Docs.wxs"/>\r
+    <Compile Include="Fragments\Filters.wxs"/>\r
+    <Compile Include="Fragments\Languages.wxs"/>\r
+    <Compile Include="Fragments\Plugins.wxs"/>\r
+    <Compile Include="Fragments\Features.wxs"/>\r
+    <Compile Include="Fragments\WixUI_WinMerge.wxs"/>\r
   </ItemGroup>\r
   \r
   <Import Project="$(WixTargetsPath)"/>\r

diff --git a/Installer/WiX/WinMerge.wxs b/Installer/WiX/WinMerge.wxs
index 6852e3e..5c4fba8 100644 (file)
--- a/Installer/WiX/WinMerge.wxs
+++ b/Installer/WiX/WinMerge.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!--\r
-    candleArgs: "WinMerge.wxs" "Core.wxs" "Docs.wxs" "Filters.wxs" "Plugins.wxs" "Languages.wxs" "Features.wxs" "WixUI_WinMerge.wxs" <extensions>\r
-    lightArgs: "WinMerge.wixobj" "Core.wixobj" "Docs.wixobj" "Filters.wixobj" "Plugins.wixobj" "Languages.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions>\r
+    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>\r
+    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>\r
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
   <?include Config.wxi ?>\r