From d7128b5701851dd20a176035339195fbf9796e06 Mon Sep 17 00:00:00 2001
From: Paul Reeves <preeves@ibphoenix.com>
Date: Fri, 17 Jun 2022 18:07:25 +0200
Subject: [PATCH] Remove dependencies upon a specific version of Visual Studio

---
 builds/win32/msvc15/VCCRT_Shared_Body.wxi   |  5 ++++-
 builds/win32/msvc15/VCCRT_Shared_Header.wxi | 20 ++++++++++++--------
 builds/win32/msvc15/VCCRT_Win32.wxi         |  7 +------
 builds/win32/msvc15/VCCRT_Win32.wxs         |  2 +-
 builds/win32/msvc15/VCCRT_x64.wxi           |  5 +----
 builds/win32/msvc15/VCCRT_x64.wxs           |  2 +-
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/builds/win32/msvc15/VCCRT_Shared_Body.wxi b/builds/win32/msvc15/VCCRT_Shared_Body.wxi
index 2b5aa9ba94..b807b3ee02 100644
--- a/builds/win32/msvc15/VCCRT_Shared_Body.wxi
+++ b/builds/win32/msvc15/VCCRT_Shared_Body.wxi
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?><Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <Product Id="$(var.PRODUCT_ID)"
-    Name="MSI to redistribute MS VS2017 CRT libraries for $(var.CPUArch)"
+    Name="MSI to redistribute MS Visual Studio Runtime libraries for $(var.CPUArch)"
 	Language="1033"
 	Version="$(var.MS_CRT_VER)"
 	Manufacturer="$(var.MANUFACTURER)"
 	UpgradeCode="$(var.UPGRADE_CODE)"
 	>
 
+  <!-- NOTE - InstallerVersion is hard-coded to 405 - this indicates Windows
+      Installer 4.5 is the minimum required version. Of course there is no
+      product called Windows Installer on your computer. It is actually msiexec -->
   <Package Id="$(var.PACKAGE_ID)"
 		Description="$(var.DESCRIPTION)"
 		Comments="$(var.COMMENTS)"
diff --git a/builds/win32/msvc15/VCCRT_Shared_Header.wxi b/builds/win32/msvc15/VCCRT_Shared_Header.wxi
index 70bff3661b..d5dae53e82 100644
--- a/builds/win32/msvc15/VCCRT_Shared_Header.wxi
+++ b/builds/win32/msvc15/VCCRT_Shared_Header.wxi
@@ -2,16 +2,20 @@
 
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-	<!-- This is  bad - we really should not be hard coding this
-		 version string, but for now it will have to do. .-->
-    <?define MS_CRT_VER = "14.16.27012.6" ?>
+    <?define PRODUCT_ID = * ?>
 
-    <?define DESCRIPTION = "MSI to redistribute VS2017 CRT libraries" ?>
-
-    <?define COMMENTS = "This MSI specially created for Firebird." ?>
-
-	<?define MSMDIR = "$(env.VCToolsRedistDir)\MergeModules" ?>
+    <?define PACKAGE_ID = * ?>
 
     <?define MANUFACTURER = "The Firebird Project" ?>
 
+    <?define DESCRIPTION = "MSI to redistribute Visual Studio Runtime libraries" ?>
+
+    <?define COMMENTS = "This MSI specially created for Firebird." ?>
+
+    <?define MS_CRT_VER = "$(env.VCToolsVersion)" ?>
+
+    <?define MSMDIR = "$(env.VCToolsRedistDir)\MergeModules" ?>
+
+    <?define MSM = "microsoft_vc$(env.MSVC_RUNTIME_MAJOR_VERSION)$(env.MSVC_RUNTIME_MINOR_VERSION)_crt_$(var.CPUArch).msm" ?>
+
 </Include>
diff --git a/builds/win32/msvc15/VCCRT_Win32.wxi b/builds/win32/msvc15/VCCRT_Win32.wxi
index b7f8032608..adf673927a 100644
--- a/builds/win32/msvc15/VCCRT_Win32.wxi
+++ b/builds/win32/msvc15/VCCRT_Win32.wxi
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <?define PRODUCT_ID=* ?>
 
-    <?define PACKAGE_ID=* ?>
 
     <?define UPGRADE_CODE=272af809-f161-45c3-bcbe-a8594a175e38 ?>
 
-    <?define MSM="microsoft_vc141_crt_x86.msm" ?>
-
-	<?define CPUArch="x86" ?>
-
+    <?define CPUArch="x86" ?>
 
 
 </Include>
diff --git a/builds/win32/msvc15/VCCRT_Win32.wxs b/builds/win32/msvc15/VCCRT_Win32.wxs
index 83adf5dad1..a7758ce851 100644
--- a/builds/win32/msvc15/VCCRT_Win32.wxs
+++ b/builds/win32/msvc15/VCCRT_Win32.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<?include $(sys.SOURCEFILEDIR)\VCCRT_Shared_Header.wxi ?>
 <?include $(sys.SOURCEFILEDIR)\VCCRT_Win32.wxi ?>
+<?include $(sys.SOURCEFILEDIR)\VCCRT_Shared_Header.wxi ?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
diff --git a/builds/win32/msvc15/VCCRT_x64.wxi b/builds/win32/msvc15/VCCRT_x64.wxi
index 03c1c9d7bc..9ea44febd9 100644
--- a/builds/win32/msvc15/VCCRT_x64.wxi
+++ b/builds/win32/msvc15/VCCRT_x64.wxi
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <?define PRODUCT_ID=* ?>
 
-    <?define PACKAGE_ID=* ?>
 
     <?define UPGRADE_CODE=9898571a-3905-45b3-b247-5e9511124070 ?>
 
-    <?define MSM="microsoft_vc141_crt_x64.msm" ?>
+    <?define CPUArch="x64" ?>
 
-	<?define CPUArch="x64" ?>
 
 </Include>
 
diff --git a/builds/win32/msvc15/VCCRT_x64.wxs b/builds/win32/msvc15/VCCRT_x64.wxs
index ba82d427d3..4a20f57fee 100644
--- a/builds/win32/msvc15/VCCRT_x64.wxs
+++ b/builds/win32/msvc15/VCCRT_x64.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<?include $(sys.SOURCEFILEDIR)\VCCRT_Shared_Header.wxi ?>
 <?include $(sys.SOURCEFILEDIR)\VCCRT_x64.wxi ?>
+<?include $(sys.SOURCEFILEDIR)\VCCRT_Shared_Header.wxi ?>
 
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">