PATCH: [ 2690509 ] Installer: First MSI setup - Move Win64 parameter to config file

diff --git a/Installer/WiX/Config.wxi b/Installer/WiX/Config.wxi
index 53e4a03..25fda35 100644 (file)
--- a/Installer/WiX/Config.wxi
+++ b/Installer/WiX/Config.wxi
@@ -9,6 +9,7 @@
   <?define PackageComments = "WinMerge" ?>\r
   \r
   <?if $(var.Platform) = "x64" ?>\r
+    <?define Win64 = "no" ?>\r
     <?define PackagePlatform = "x64" ?>\r
     <?define UpgradeGuid = "79F16C51-8485-426E-BF23-F4D3D0D431D7" ?>\r
     \r
@@ -16,6 +17,7 @@
     <?define ExpatBuildDir = "..\..\Build\expat" ?>\r
     <?define PcreBuildDir = "..\..\Build\pcre" ?>\r
   <?else ?>\r
+    <?define Win64 = "no" ?>\r
     <?define PackagePlatform = "x86" ?>\r
     <?define UpgradeGuid = "3C974FF6-9076-46EB-A65F-A53931EAF942" ?>\r
     \r

diff --git a/Installer/WiX/WinMerge.wxs b/Installer/WiX/WinMerge.wxs
index 5658108..efca323 100644 (file)
--- a/Installer/WiX/WinMerge.wxs
+++ b/Installer/WiX/WinMerge.wxs
@@ -53,42 +53,42 @@
     </Directory>\r
     \r
     <DirectoryRef Id="INSTALLDIR">\r
-      <Component Id="WinMergeU" Guid="*" Win64="no">\r
+      <Component Id="WinMergeU" Guid="*" Win64="$(var.Win64)">\r
         <File Id="WinMergeUEXE" \r
           Name="WinMergeU.exe" \r
           Source="$(var.MergeBuildDir)\WinMergeU.exe" \r
           Vital="yes" />\r
       </Component>\r
       \r
-      <Component Id="libexpat" Guid="*" Win64="no">\r
+      <Component Id="libexpat" Guid="*" Win64="$(var.Win64)">\r
         <File Id="libexpatDLL" \r
           Name="libexpat.dll" \r
           Source="$(var.ExpatBuildDir)\libexpat.dll" \r
           Vital="yes" />\r
       </Component>\r
       \r
-      <Component Id="pcre" Guid="*" Win64="no">\r
+      <Component Id="pcre" Guid="*" Win64="$(var.Win64)">\r
         <File Id="pcreDLL" \r
           Name="pcre.dll" \r
           Source="$(var.PcreBuildDir)\pcre.dll" \r
           Vital="yes" />\r
       </Component>\r
       \r
-      <Component Id="MergeLang" Guid="*" Win64="no">\r
+      <Component Id="MergeLang" Guid="*" Win64="$(var.Win64)">\r
         <File Id="MergeLangDLL" \r
           Name="MergeLang.dll" \r
           Source="$(var.MergeBuildDir)\MergeLang.dll" \r
           Vital="yes" />\r
       </Component>\r
       \r
-      <Component Id="Files" Guid="*" Win64="no">\r
+      <Component Id="Files" Guid="*" Win64="$(var.Win64)">\r
         <File Id="FilesTXT" \r
           Name="Files.txt" \r
           Source="..\..\Docs\Users\Files.txt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Contributors" Guid="*" Win64="no">\r
+      <Component Id="Contributors" Guid="*" Win64="$(var.Win64)">\r
         <File Id="ContributorsTXT" \r
           Name="Contributors.txt" \r
           Source="..\..\Docs\Users\Contributors.txt" \r
@@ -108,7 +108,7 @@
       </DirectoryRef>\r
     <?else ?>\r
       <DirectoryRef Id="INSTALLDIR">\r
-        <Component Id="ShellExtension" Guid="*" Win64="no">\r
+        <Component Id="ShellExtension" Guid="*" Win64="$(var.Win64)">\r
           <File Id="ShellExtensionUDLL" \r
             Name="ShellExtensionU.dll" \r
             SelfRegCost="1" \r
@@ -119,28 +119,28 @@
     <?endif ?>\r
     \r
     <DirectoryRef Id="DOCSDIR">\r
-      <Component Id="ReadMe" Guid="*" Win64="no">\r
+      <Component Id="ReadMe" Guid="*" Win64="$(var.Win64)">\r
         <File Id="ReadMeTXT" \r
           Name="ReadMe.txt" \r
           Source="..\..\Docs\Users\ReadMe.txt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="ReleaseNotes" Guid="*" Win64="no">\r
+      <Component Id="ReleaseNotes" Guid="*" Win64="$(var.Win64)">\r
         <File Id="ReleaseNotesHTML" \r
           Name="ReleaseNotes.html" \r
           Source="..\..\Docs\Users\ReleaseNotes.html" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="ChangeLog" Guid="*" Win64="no">\r
+      <Component Id="ChangeLog" Guid="*" Win64="$(var.Win64)">\r
         <File Id="ChangeLogTXT" \r
           Name="ChangeLog.txt" \r
           Source="..\..\Docs\Users\ChangeLog.txt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="WinMergeHelp" Guid="*" Win64="no">\r
+      <Component Id="WinMergeHelp" Guid="*" Win64="$(var.Win64)">\r
         <File Id="WinMergeCHM" \r
           Name="WinMerge.chm" \r
           Source="..\..\Build\Manual\htmlhelp\WinMerge.chm" \r
@@ -149,91 +149,91 @@
     </DirectoryRef>\r
     \r
     <DirectoryRef Id="FILTERSDIR">\r
-      <Component Id="ADAMulti" Guid="*" Win64="no">\r
+      <Component Id="ADAMulti" Guid="*" Win64="$(var.Win64)">\r
         <File Id="ADAMultiFLT" \r
           Name="ADAMulti.flt" \r
           Source="..\..\Filters\ADAMulti.flt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="ASPNET" Guid="*" Win64="no">\r
+      <Component Id="ASPNET" Guid="*" Win64="$(var.Win64)">\r
         <File Id="ASPNETFLT" \r
           Name="ASPNET.flt" \r
           Source="..\..\Filters\ASPNET.flt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="CSharp_loose" Guid="*" Win64="no">\r
+      <Component Id="CSharp_loose" Guid="*" Win64="$(var.Win64)">\r
         <File Id="CSharp_looseFLT" \r
           Name="CSharp_loose.flt" \r
           Source="..\..\Filters\CSharp_loose.flt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Delphi" Guid="*" Win64="no">\r
+      <Component Id="Delphi" Guid="*" Win64="$(var.Win64)">\r
         <File Id="DelphiFLT" \r
           Name="Delphi.flt" \r
           Source="..\..\Filters\Delphi.flt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="FileFilter" Guid="*" Win64="no">\r
+      <Component Id="FileFilter" Guid="*" Win64="$(var.Win64)">\r
         <File Id="FileFilterTMPL" \r
           Name="FileFilter.tmpl" \r
           Source="..\..\Filters\FileFilter.tmpl" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Frontpage" Guid="*" Win64="no">\r
+      <Component Id="Frontpage" Guid="*" Win64="$(var.Win64)">\r
         <File Id="FrontpageFLT" \r
           Name="Frontpage.flt" \r
           Source="..\..\Filters\Frontpage.flt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="MASM" Guid="*" Win64="no">\r
+      <Component Id="MASM" Guid="*" Win64="$(var.Win64)">\r
         <File Id="MASMFLT" \r
           Name="MASM.flt" \r
           Source="..\..\Filters\MASM.flt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Merge_GnuC_loose" Guid="*" Win64="no">\r
+      <Component Id="Merge_GnuC_loose" Guid="*" Win64="$(var.Win64)">\r
         <File Id="Merge_GnuC_looseFLT" \r
           Name="Merge_GnuC_loose.flt" \r
           Source="..\..\Filters\Merge_GnuC_loose.flt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Merge_VB_loose" Guid="*" Win64="no">\r
+      <Component Id="Merge_VB_loose" Guid="*" Win64="$(var.Win64)">\r
         <File Id="Merge_VB_looseFLT" \r
           Name="Merge_VB_loose.flt" \r
           Source="..\..\Filters\Merge_VB_loose.flt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Merge_VC_loose" Guid="*" Win64="no">\r
+      <Component Id="Merge_VC_loose" Guid="*" Win64="$(var.Win64)">\r
         <File Id="Merge_VC_looseFLT" \r
           Name="Merge_VC_loose.flt" \r
           Source="..\..\Filters\Merge_VC_loose.flt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="SourceControl" Guid="*" Win64="no">\r
+      <Component Id="SourceControl" Guid="*" Win64="$(var.Win64)">\r
         <File Id="SourceControlFLT" \r
           Name="SourceControl.flt" \r
           Source="..\..\Filters\SourceControl.flt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Symbian" Guid="*" Win64="no">\r
+      <Component Id="Symbian" Guid="*" Win64="$(var.Win64)">\r
         <File Id="SymbianFLT" \r
           Name="Symbian.flt" \r
           Source="..\..\Filters\Symbian.flt" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="XML_html" Guid="*" Win64="no">\r
+      <Component Id="XML_html" Guid="*" Win64="$(var.Win64)">\r
         <File Id="XML_htmlFLT" \r
           Name="XML_html.flt" \r
           Source="..\..\Filters\XML_html.flt" \r
@@ -242,196 +242,196 @@
     </DirectoryRef>\r
     \r
     <DirectoryRef Id="LANGDIR">\r
-      <Component Id="Brazilian" Guid="*" Win64="no">\r
+      <Component Id="Brazilian" Guid="*" Win64="$(var.Win64)">\r
         <File Id="BrazilianPO" \r
           Name="Brazilian.po" \r
           Source="..\..\Src\Languages\Brazilian.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Bulgarian" Guid="*" Win64="no">\r
+      <Component Id="Bulgarian" Guid="*" Win64="$(var.Win64)">\r
         <File Id="BulgarianPO" \r
           Name="Bulgarian.po" \r
           Source="..\..\Src\Languages\Bulgarian.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Catalan" Guid="*" Win64="no">\r
+      <Component Id="Catalan" Guid="*" Win64="$(var.Win64)">\r
         <File Id="CatalanPO" \r
           Name="Catalan.po" \r
           Source="..\..\Src\Languages\Catalan.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="ChineseSimplified" Guid="*" Win64="no">\r
+      <Component Id="ChineseSimplified" Guid="*" Win64="$(var.Win64)">\r
         <File Id="ChineseSimplifiedPO" \r
           Name="ChineseSimplified.po" \r
           Source="..\..\Src\Languages\ChineseSimplified.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="ChineseTraditional" Guid="*" Win64="no">\r
+      <Component Id="ChineseTraditional" Guid="*" Win64="$(var.Win64)">\r
         <File Id="ChineseTraditionalPO" \r
           Name="ChineseTraditional.po" \r
           Source="..\..\Src\Languages\ChineseTraditional.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Croatian" Guid="*" Win64="no">\r
+      <Component Id="Croatian" Guid="*" Win64="$(var.Win64)">\r
         <File Id="CroatianPO" \r
           Name="Croatian.po" \r
           Source="..\..\Src\Languages\Croatian.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Czech" Guid="*" Win64="no">\r
+      <Component Id="Czech" Guid="*" Win64="$(var.Win64)">\r
         <File Id="CzechPO" \r
           Name="Czech.po" \r
           Source="..\..\Src\Languages\Czech.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Danish" Guid="*" Win64="no">\r
+      <Component Id="Danish" Guid="*" Win64="$(var.Win64)">\r
         <File Id="DanishPO" \r
           Name="Danish.po" \r
           Source="..\..\Src\Languages\Danish.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Dutch" Guid="*" Win64="no">\r
+      <Component Id="Dutch" Guid="*" Win64="$(var.Win64)">\r
         <File Id="DutchPO" \r
           Name="Dutch.po" \r
           Source="..\..\Src\Languages\Dutch.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="French" Guid="*" Win64="no">\r
+      <Component Id="French" Guid="*" Win64="$(var.Win64)">\r
         <File Id="FrenchPO" \r
           Name="French.po" \r
           Source="..\..\Src\Languages\French.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Galician" Guid="*" Win64="no">\r
+      <Component Id="Galician" Guid="*" Win64="$(var.Win64)">\r
         <File Id="GalicianPO" \r
           Name="Galician.po" \r
           Source="..\..\Src\Languages\Galician.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="German" Guid="*" Win64="no">\r
+      <Component Id="German" Guid="*" Win64="$(var.Win64)">\r
         <File Id="GermanPO" \r
           Name="German.po" \r
           Source="..\..\Src\Languages\German.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Greek" Guid="*" Win64="no">\r
+      <Component Id="Greek" Guid="*" Win64="$(var.Win64)">\r
         <File Id="GreekPO" \r
           Name="Greek.po" \r
           Source="..\..\Src\Languages\Greek.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Hungarian" Guid="*" Win64="no">\r
+      <Component Id="Hungarian" Guid="*" Win64="$(var.Win64)">\r
         <File Id="HungarianPO" \r
           Name="Hungarian.po" \r
           Source="..\..\Src\Languages\Hungarian.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Italian" Guid="*" Win64="no">\r
+      <Component Id="Italian" Guid="*" Win64="$(var.Win64)">\r
         <File Id="ItalianPO" \r
           Name="Italian.po" \r
           Source="..\..\Src\Languages\Italian.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Japanese" Guid="*" Win64="no">\r
+      <Component Id="Japanese" Guid="*" Win64="$(var.Win64)">\r
         <File Id="JapanesePO" \r
           Name="Japanese.po" \r
           Source="..\..\Src\Languages\Japanese.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Korean" Guid="*" Win64="no">\r
+      <Component Id="Korean" Guid="*" Win64="$(var.Win64)">\r
         <File Id="KoreanPO" \r
           Name="Korean.po" \r
           Source="..\..\Src\Languages\Korean.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Norwegian" Guid="*" Win64="no">\r
+      <Component Id="Norwegian" Guid="*" Win64="$(var.Win64)">\r
         <File Id="NorwegianPO" \r
           Name="Norwegian.po" \r
           Source="..\..\Src\Languages\Norwegian.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Polish" Guid="*" Win64="no">\r
+      <Component Id="Polish" Guid="*" Win64="$(var.Win64)">\r
         <File Id="PolishPO" \r
           Name="Polish.po" \r
           Source="..\..\Src\Languages\Polish.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Portuguese" Guid="*" Win64="no">\r
+      <Component Id="Portuguese" Guid="*" Win64="$(var.Win64)">\r
         <File Id="PortuguesePO" \r
           Name="Portuguese.po" \r
           Source="..\..\Src\Languages\Portuguese.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Romanian" Guid="*" Win64="no">\r
+      <Component Id="Romanian" Guid="*" Win64="$(var.Win64)">\r
         <File Id="RomanianPO" \r
           Name="Romanian.po" \r
           Source="..\..\Src\Languages\Romanian.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Russian" Guid="*" Win64="no">\r
+      <Component Id="Russian" Guid="*" Win64="$(var.Win64)">\r
         <File Id="RussianPO" \r
           Name="Russian.po" \r
           Source="..\..\Src\Languages\Russian.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Slovak" Guid="*" Win64="no">\r
+      <Component Id="Slovak" Guid="*" Win64="$(var.Win64)">\r
         <File Id="SlovakPO" \r
           Name="Slovak.po" \r
           Source="..\..\Src\Languages\Slovak.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Slovenian" Guid="*" Win64="no">\r
+      <Component Id="Slovenian" Guid="*" Win64="$(var.Win64)">\r
         <File Id="SlovenianPO" \r
           Name="Slovenian.po" \r
           Source="..\..\Src\Languages\Slovenian.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Spanish" Guid="*" Win64="no">\r
+      <Component Id="Spanish" Guid="*" Win64="$(var.Win64)">\r
         <File Id="SpanishPO" \r
           Name="Spanish.po" \r
           Source="..\..\Src\Languages\Spanish.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Swedish" Guid="*" Win64="no">\r
+      <Component Id="Swedish" Guid="*" Win64="$(var.Win64)">\r
         <File Id="SwedishPO" \r
           Name="Swedish.po" \r
           Source="..\..\Src\Languages\Swedish.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Turkish" Guid="*" Win64="no">\r
+      <Component Id="Turkish" Guid="*" Win64="$(var.Win64)">\r
         <File Id="TurkishPO" \r
           Name="Turkish.po" \r
           Source="..\..\Src\Languages\Turkish.po" \r
           Vital="no" />\r
       </Component>\r
       \r
-      <Component Id="Ukrainian" Guid="*" Win64="no">\r
+      <Component Id="Ukrainian" Guid="*" Win64="$(var.Win64)">\r
         <File Id="UkrainianPO" \r
           Name="Ukrainian.po" \r
           Source="..\..\Src\Languages\Ukrainian.po" \r
@@ -630,4 +630,4 @@
     <UI />\r
     \r
   </Product>\r
-</Wix>
\ No newline at end of file
+</Wix>\r