firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 21:23:04 +01:00
Code Issues

Remove dependencies upon a specific version of Visual Studio

Browse Source
This commit is contained in:
Paul Reeves 2022-06-17 18:07:25 +02:00
parent a9ff4ac78d
commit d7128b5701
6 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builds/win32/msvc15/VCCRT_Shared_Body.wxi
View File

@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8"?><Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?xml version="1.0" encoding="utf-8"?><Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="$(var.PRODUCT_ID)" <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" Language="1033"
Version="$(var.MS_CRT_VER)" Version="$(var.MS_CRT_VER)"
Manufacturer="$(var.MANUFACTURER)" Manufacturer="$(var.MANUFACTURER)"
UpgradeCode="$(var.UPGRADE_CODE)" 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)" <Package Id="$(var.PACKAGE_ID)"
Description="$(var.DESCRIPTION)" Description="$(var.DESCRIPTION)"
Comments="$(var.COMMENTS)" Comments="$(var.COMMENTS)"

20
builds/win32/msvc15/VCCRT_Shared_Header.wxi
View File

@ -2,16 +2,20 @@
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!-- This is bad - we really should not be hard coding this <?define PRODUCT_ID = * ?>
version string, but for now it will have to do. .-->
<?define MS_CRT_VER = "14.16.27012.6" ?>
<?define DESCRIPTION = "MSI to redistribute VS2017 CRT libraries" ?> <?define PACKAGE_ID = * ?>
<?define COMMENTS = "This MSI specially created for Firebird." ?>
<?define MSMDIR = "$(env.VCToolsRedistDir)\MergeModules" ?>
<?define MANUFACTURER = "The Firebird Project" ?> <?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> </Include>

7
builds/win32/msvc15/VCCRT_Win32.wxi
View File

@ -1,15 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?define PRODUCT_ID=* ?>
<?define PACKAGE_ID=* ?>
<?define UPGRADE_CODE=272af809-f161-45c3-bcbe-a8594a175e38 ?> <?define UPGRADE_CODE=272af809-f161-45c3-bcbe-a8594a175e38 ?>
<?define MSM="microsoft_vc141_crt_x86.msm" ?> <?define CPUArch="x86" ?>
<?define CPUArch="x86" ?>
</Include> </Include>

2
builds/win32/msvc15/VCCRT_Win32.wxs
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<?include $(sys.SOURCEFILEDIR)\VCCRT_Shared_Header.wxi ?>
<?include $(sys.SOURCEFILEDIR)\VCCRT_Win32.wxi ?> <?include $(sys.SOURCEFILEDIR)\VCCRT_Win32.wxi ?>
<?include $(sys.SOURCEFILEDIR)\VCCRT_Shared_Header.wxi ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

5
builds/win32/msvc15/VCCRT_x64.wxi
View File

@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?define PRODUCT_ID=* ?>
<?define PACKAGE_ID=* ?>
<?define UPGRADE_CODE=9898571a-3905-45b3-b247-5e9511124070 ?> <?define UPGRADE_CODE=9898571a-3905-45b3-b247-5e9511124070 ?>
<?define MSM="microsoft_vc141_crt_x64.msm" ?> <?define CPUArch="x64" ?>
<?define CPUArch="x64" ?>
</Include> </Include>

2
builds/win32/msvc15/VCCRT_x64.wxs
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<?include $(sys.SOURCEFILEDIR)\VCCRT_Shared_Header.wxi ?>
<?include $(sys.SOURCEFILEDIR)\VCCRT_x64.wxi ?> <?include $(sys.SOURCEFILEDIR)\VCCRT_x64.wxi ?>
<?include $(sys.SOURCEFILEDIR)\VCCRT_Shared_Header.wxi ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">