moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-01 15:26:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Download VCRedist on demand rather than always bundling it in the installer

Browse Source
This commit is contained in:
Cameron Gutman 2020-11-29 20:24:23 -06:00
parent fc4488f17f
commit f81509a892
1 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
wix/MoonlightSetup/Bundle.wxs
View File

@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?define VCREDIST_VER = "14.28.29334" ?>
<?define VCREDIST_X86_SIZE = "14328440" ?>
<?define VCREDIST_X86_SHA1 = "17674FCC6CF3A2FFDC391BDCDE082AA936E37A89" ?>
<?define VCREDIST_X86_UPGRADE_CODE = "65E5BD06-6392-3027-8C26-853107D3CF1A" ?>
<?define VCREDIST_X64_SIZE = "14882584" ?>
<?define VCREDIST_X64_SHA1 = "1EFFE7DB3F42D670A1352C5C9B451C4DB3E57AB5" ?>
<?define VCREDIST_X64_UPGRADE_CODE = "36F68A90-239C-34DF-B58C-64B30153CE35" ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
@ -54,6 +62,16 @@
Value="DesktopShortcutInstallState" Value="DesktopShortcutInstallState"
Condition="HasDesktopShortcutInstallStateRegKey" /> Condition="HasDesktopShortcutInstallStateRegKey" />
<util:ProductSearch Id="VCREDIST_142_x86"
UpgradeCode="$(var.VCREDIST_X86_UPGRADE_CODE)"
Result="version"
Variable="VCREDIST_142_x86" />
<util:ProductSearch Id="VCREDIST_142_x64"
UpgradeCode="$(var.VCREDIST_X64_UPGRADE_CODE)"
Result="version"
Variable="VCREDIST_142_x64" />
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense"> <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
<bal:WixStandardBootstrapperApplication <bal:WixStandardBootstrapperApplication
ShowVersion="yes" ShowVersion="yes"
@ -65,16 +83,46 @@
</BootstrapperApplicationRef> </BootstrapperApplicationRef>
<Chain> <Chain>
<ExePackage Cache="no" <ExePackage Name="Microsoft Visual C++ 2015-2019 Redistributable - x86"
Cache="no"
PerMachine="yes" PerMachine="yes"
Permanent="yes" Permanent="yes"
Vital="yes" Vital="yes"
Compressed="yes" InstallCommand="/install /quiet /norestart"
SourceFile="$(env.VCToolsRedistDir)vcredist_$(env.ARCH).exe" DownloadUrl="https://moonlight-stream.org/downloads/vcredist/$(var.VCREDIST_VER)/vcredist_x86.exe"
InstallCommand="/install /quiet /norestart"> InstallCondition="NOT VersionNT64"
DetectCondition="VCREDIST_142_x86 &gt;= v$(var.VCREDIST_VER)">
<RemotePayload Description="Microsoft Visual C++ 2015-2019 Redistributable - x86"
ProductName="Microsoft Visual C++ 2015-2019 Redistributable - x86"
Size="$(var.VCREDIST_X86_SIZE)"
Version="$(var.VCREDIST_VER).0"
Hash="$(var.VCREDIST_X86_SHA1)"/>
<!-- Newer version installed is fine --> <!-- Newer version installed is fine -->
<ExitCode Value="1638" Behavior="success" /> <ExitCode Value="1638" Behavior="success" />
</ExePackage> </ExePackage>
<ExePackage Name="Microsoft Visual C++ 2015-2019 Redistributable - x64"
Cache="no"
PerMachine="yes"
Permanent="yes"
Vital="yes"
InstallCommand="/install /quiet /norestart"
DownloadUrl="https://moonlight-stream.org/downloads/vcredist/$(var.VCREDIST_VER)/vcredist_x64.exe"
InstallCondition="VersionNT64"
DetectCondition="VCREDIST_142_x64 &gt;= v$(var.VCREDIST_VER)">
<RemotePayload Description="Microsoft Visual C++ 2015-2019 Redistributable - x64"
ProductName="Microsoft Visual C++ 2015-2019 Redistributable - x64"
Size="$(var.VCREDIST_X64_SIZE)"
Version="$(var.VCREDIST_VER).0"
Hash="$(var.VCREDIST_X64_SHA1)"/>
<!-- Newer version installed is fine -->
<ExitCode Value="1638" Behavior="success" />
</ExePackage>
<MsiPackage Id="Moonlight" SourceFile="$(var.Moonlight.TargetPath)" Vital="yes"> <MsiPackage Id="Moonlight" SourceFile="$(var.Moonlight.TargetPath)" Vital="yes">
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" /> <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
<MsiProperty Name="REINSTALLMODE" Value="[REINSTALLMODE]" /> <MsiProperty Name="REINSTALLMODE" Value="[REINSTALLMODE]" />