Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-12-14 05:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix indentation after WiX v4 autoconversion

Browse source
This commit is contained in:
Cameron Gutman 2023-09-10 15:11:45 -05:00
parent 45a98a391a
commit 3e3f384218
2 changed files with 121 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
wix/Moonlight/Product.wxs
View file

@ -8,77 +8,77 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:fire="http://wixtoolset.org/schemas/v4/wxs/firewall" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:fire="http://wixtoolset.org/schemas/v4/wxs/firewall" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<Package Name="$(var.FullName)" <Package Name="$(var.FullName)"
Language="1033" Language="1033"
Version="!(bind.fileVersion.MoonlightExe)" Version="!(bind.fileVersion.MoonlightExe)"
Manufacturer="Moonlight Game Streaming Project" Manufacturer="Moonlight Game Streaming Project"
UpgradeCode="5c09f94e-f809-4c6a-9b7b-597c99f041fe"> UpgradeCode="5c09f94e-f809-4c6a-9b7b-597c99f041fe">
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallInitialize" /> <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallInitialize" />
<MediaTemplate CompressionLevel="high" EmbedCab="yes" /> <MediaTemplate CompressionLevel="high" EmbedCab="yes" />
<Property Id="MPSSVC_START"> <Property Id="MPSSVC_START">
<RegistrySearch Id="MpsSvcStart" <RegistrySearch Id="MpsSvcStart"
Root="HKLM" Root="HKLM"
Key="System\CurrentControlSet\Services\MpsSvc" Key="System\CurrentControlSet\Services\MpsSvc"
Name="Start" Name="Start"
Type="raw" /> Type="raw" />
</Property> </Property>
<Launch Condition="Installed OR MPSSVC_START=&quot;#2&quot;" <Launch Condition="Installed OR MPSSVC_START=&quot;#2&quot;"
Message="Setup cannot proceed because the Windows Firewall service has been improperly disabled or stopped. You must start the Windows Firewall service (MpsSvc) to continue. If you would like to disable Windows Firewall properly, use the Windows Firewall options in Control Panel." /> Message="Setup cannot proceed because the Windows Firewall service has been improperly disabled or stopped. You must start the Windows Firewall service (MpsSvc) to continue. If you would like to disable Windows Firewall properly, use the Windows Firewall options in Control Panel." />
<Property Id="APPDATAFOLDER" Value="%LOCALAPPDATA%\Moonlight Game Streaming Project" /> <Property Id="APPDATAFOLDER" Value="%LOCALAPPDATA%\Moonlight Game Streaming Project" />
<!-- There's no way to delete a registry key on uninstall but not major upgrade, so <!-- There's no way to delete a registry key on uninstall but not major upgrade, so
we have to roll our own deletion via custom action --> we have to roll our own deletion via custom action -->
<CustomAction Id="DeleteRegistryKey" <CustomAction Id="DeleteRegistryKey"
Directory="ProgramFiles6432Folder" Directory="ProgramFiles6432Folder"
ExeCommand="reg.exe delete &quot;HKCU\Software\Moonlight Game Streaming Project&quot; /f" ExeCommand="reg.exe delete &quot;HKCU\Software\Moonlight Game Streaming Project&quot; /f"
Execute="deferred" Execute="deferred"
Return="ignore" Return="ignore"
Impersonate="yes" /> Impersonate="yes" />
<InstallExecuteSequence> <InstallExecuteSequence>
<Custom Action="DeleteRegistryKey" <Custom Action="DeleteRegistryKey"
Before="InstallFinalize" Before="InstallFinalize"
Condition="Installed AND REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE" /> Condition="Installed AND REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE" />
</InstallExecuteSequence> </InstallExecuteSequence>
<Component Id="MoonlightShortcuts" Directory="INSTALLFOLDER"> <Component Id="MoonlightShortcuts" Directory="INSTALLFOLDER">
<Shortcut Id="StartMenuShortcut" <Shortcut Id="StartMenuShortcut"
Name="$(var.ShortcutName)" Name="$(var.ShortcutName)"
Description="$(var.ShortcutDesc)" Description="$(var.ShortcutDesc)"
Target="[#MoonlightExe]" Target="[#MoonlightExe]"
Directory="ApplicationProgramsFolder" Directory="ApplicationProgramsFolder"
WorkingDirectory="INSTALLFOLDER" /> WorkingDirectory="INSTALLFOLDER" />
<RemoveFolder Id="CleanupStartMenuShortcut" <RemoveFolder Id="CleanupStartMenuShortcut"
Directory="ApplicationProgramsFolder" Directory="ApplicationProgramsFolder"
On="uninstall" /> On="uninstall" />
<util:RemoveFolderEx Id="CleanupAppDataFolder" <util:RemoveFolderEx Id="CleanupAppDataFolder"
On="uninstall" On="uninstall"
Property="APPDATAFOLDER" /> Property="APPDATAFOLDER" />
<RegistryValue Root="HKCU" <RegistryValue Root="HKCU"
Key="Software\Moonlight Game Streaming Project" Key="Software\Moonlight Game Streaming Project"
Name="Installed" Name="Installed"
Type="integer" Type="integer"
Value="1" Value="1"
KeyPath="yes" /> KeyPath="yes" />
</Component> </Component>
<Component Id="MoonlightDesktopShortcut" Directory="INSTALLFOLDER" Condition="ADDDESKTOPSHORTCUT=1"> <Component Id="MoonlightDesktopShortcut" Directory="INSTALLFOLDER" Condition="ADDDESKTOPSHORTCUT=1">
<Shortcut Id="DesktopShortcut" <Shortcut Id="DesktopShortcut"
Name="$(var.ShortcutName)" Name="$(var.ShortcutName)"
Description="$(var.ShortcutDesc)" Description="$(var.ShortcutDesc)"
Target="[#MoonlightExe]" Target="[#MoonlightExe]"
Directory="DesktopFolder" Directory="DesktopFolder"
WorkingDirectory="INSTALLFOLDER" /> WorkingDirectory="INSTALLFOLDER" />
<RemoveFolder Id="CleanupDesktopShortcut" <RemoveFolder Id="CleanupDesktopShortcut"
Directory="DesktopFolder" Directory="DesktopFolder"
On="uninstall" /> On="uninstall" />
<RegistryValue Root="HKCU" <RegistryValue Root="HKCU"
Key="Software\Moonlight Game Streaming Project" Key="Software\Moonlight Game Streaming Project"
Name="DesktopShortcutInstalled" Name="DesktopShortcutInstalled"
Type="integer" Type="integer"
Value="1" Value="1"
KeyPath="yes" /> KeyPath="yes" />
</Component> </Component>
<!-- Persist desktop shortcut's installed state to let Bundle.wxs know if <!-- Persist desktop shortcut's installed state to let Bundle.wxs know if
@ -86,22 +86,22 @@
product --> product -->
<Component Id="MoonlightDesktopShortcutState" Directory="INSTALLFOLDER"> <Component Id="MoonlightDesktopShortcutState" Directory="INSTALLFOLDER">
<RegistryValue Root="HKCU" <RegistryValue Root="HKCU"
Key="Software\Moonlight Game Streaming Project" Key="Software\Moonlight Game Streaming Project"
Name="DesktopShortcutInstallState" Name="DesktopShortcutInstallState"
Type="integer" Type="integer"
Value="[ADDDESKTOPSHORTCUT]" Value="[ADDDESKTOPSHORTCUT]"
KeyPath="yes" /> KeyPath="yes" />
</Component> </Component>
<DirectoryRef Id="INSTALLFOLDER"> <DirectoryRef Id="INSTALLFOLDER">
<Component Id="Moonlight"> <Component Id="Moonlight">
<File Id="MoonlightExe" <File Id="MoonlightExe"
KeyPath="yes" KeyPath="yes"
Checksum="yes" Checksum="yes"
Source="$(var.BuildDir)\app\$(var.Configuration)\Moonlight.exe"> Source="$(var.BuildDir)\app\$(var.Configuration)\Moonlight.exe">
<fire:FirewallException Id="MoonlightFirewallException" <fire:FirewallException Id="MoonlightFirewallException"
Scope="any" Scope="any"
Name="$(var.FullName)" /> Name="$(var.FullName)" />
</File> </File>
</Component> </Component>
</DirectoryRef> </DirectoryRef>
@ -113,7 +113,7 @@
<ComponentRef Id="MoonlightDesktopShortcut" /> <ComponentRef Id="MoonlightDesktopShortcut" />
<ComponentGroupRef Id="MoonlightDependencies" /> <ComponentGroupRef Id="MoonlightDependencies" />
</Feature> </Feature>
<StandardDirectory Id="DesktopFolder" /> <StandardDirectory Id="DesktopFolder" />
<StandardDirectory Id="ProgramFiles6432Folder"> <StandardDirectory Id="ProgramFiles6432Folder">
<Directory Id="INSTALLFOLDER" Name="$(var.InstallFolder)" /> <Directory Id="INSTALLFOLDER" Name="$(var.InstallFolder)" />

134
wix/MoonlightSetup/Bundle.wxs
View file

@ -16,13 +16,13 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<Bundle Name="Moonlight Game Streaming Client" <Bundle Name="Moonlight Game Streaming Client"
Version="!(bind.PackageVersion.Moonlight_x64)" Version="!(bind.PackageVersion.Moonlight_x64)"
Manufacturer="Moonlight Game Streaming Project" Manufacturer="Moonlight Game Streaming Project"
UpgradeCode="466fa35d-4be4-40ef-9ce5-afadc3b63bc5" UpgradeCode="466fa35d-4be4-40ef-9ce5-afadc3b63bc5"
HelpUrl="https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide" HelpUrl="https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide"
UpdateUrl="https://github.com/moonlight-stream/moonlight-qt/releases" UpdateUrl="https://github.com/moonlight-stream/moonlight-qt/releases"
DisableModify="yes" DisableModify="yes"
IconSourceFile="..\..\app\moonlight.ico"> IconSourceFile="..\..\app\moonlight.ico">
<bal:Condition Message="Moonlight requires Windows 7 or later." Condition="VersionNT &gt;= v6.1" /> <bal:Condition Message="Moonlight requires Windows 7 or later." Condition="VersionNT &gt;= v6.1" />
@ -39,65 +39,65 @@
<util:RegistrySearch Variable="AddDesktopShortcutCheckbox" Root="HKCU" Key="Software\Moonlight Game Streaming Project" Value="DesktopShortcutInstallState" Condition="HasDesktopShortcutInstallStateRegKey" /> <util:RegistrySearch Variable="AddDesktopShortcutCheckbox" Root="HKCU" Key="Software\Moonlight Game Streaming Project" Value="DesktopShortcutInstallState" Condition="HasDesktopShortcutInstallStateRegKey" />
<util:ProductSearch Id="VCREDIST_14_x86" <util:ProductSearch Id="VCREDIST_14_x86"
UpgradeCode="$(var.VCREDIST_X86_UPGRADE_CODE)" UpgradeCode="$(var.VCREDIST_X86_UPGRADE_CODE)"
Result="version" Result="version"
Variable="VCREDIST_14_x86" /> Variable="VCREDIST_14_x86" />
<util:ProductSearch Id="VCREDIST_14_x64" <util:ProductSearch Id="VCREDIST_14_x64"
UpgradeCode="$(var.VCREDIST_X64_UPGRADE_CODE)" UpgradeCode="$(var.VCREDIST_X64_UPGRADE_CODE)"
Result="version" Result="version"
Variable="VCREDIST_14_x64" /> Variable="VCREDIST_14_x64" />
<util:ProductSearch Id="VCREDIST_14_ARM64" <util:ProductSearch Id="VCREDIST_14_ARM64"
UpgradeCode="$(var.VCREDIST_ARM64_UPGRADE_CODE)" UpgradeCode="$(var.VCREDIST_ARM64_UPGRADE_CODE)"
Result="version" Result="version"
Variable="VCREDIST_14_ARM64" /> Variable="VCREDIST_14_ARM64" />
<BootstrapperApplication> <BootstrapperApplication>
<bal:WixStandardBootstrapperApplication ShowVersion="yes" <bal:WixStandardBootstrapperApplication ShowVersion="yes"
LicenseFile="license.rtf" LicenseFile="license.rtf"
LogoFile="..\..\app\moonlight_wix.png" LogoFile="..\..\app\moonlight_wix.png"
LaunchTarget="[InstallFolder]\Moonlight.exe" LaunchTarget="[InstallFolder]\Moonlight.exe"
ThemeFile="RtfTheme.xml" ThemeFile="RtfTheme.xml"
Theme="rtfLicense" /> Theme="rtfLicense" />
</BootstrapperApplication> </BootstrapperApplication>
<Chain> <Chain>
<ExePackage Cache="remove" <ExePackage Cache="remove"
PerMachine="yes" PerMachine="yes"
Permanent="yes" Permanent="yes"
Vital="yes" Vital="yes"
InstallCondition="(NOT VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 332)" InstallCondition="(NOT VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 332)"
DetectCondition="VCREDIST_14_x86 &gt;= v$(var.VCREDIST_VER)" DetectCondition="VCREDIST_14_x86 &gt;= v$(var.VCREDIST_VER)"
InstallArguments="/install /quiet /norestart"> InstallArguments="/install /quiet /norestart">
<ExePackagePayload Description="Microsoft Visual C++ 2015-2022 Redistributable - x86" <ExePackagePayload Description="Microsoft Visual C++ 2015-2022 Redistributable - x86"
ProductName="Microsoft Visual C++ 2015-2022 Redistributable - x86" ProductName="Microsoft Visual C++ 2015-2022 Redistributable - x86"
Size="$(var.VCREDIST_X86_SIZE)" Size="$(var.VCREDIST_X86_SIZE)"
Version="$(var.VCREDIST_VER)" Version="$(var.VCREDIST_VER)"
Hash="$(var.VCREDIST_X86_SHA512)" Hash="$(var.VCREDIST_X86_SHA512)"
Name="VC_redist.x86.exe" Name="VC_redist.x86.exe"
DownloadUrl="$(var.VCREDIST_X86_URL)" /> DownloadUrl="$(var.VCREDIST_X86_URL)" />
<!-- Newer version installed is fine --> <!-- Newer version installed is fine -->
<ExitCode Value="1638" Behavior="success" /> <ExitCode Value="1638" Behavior="success" />
</ExePackage> </ExePackage>
<ExePackage Cache="remove" <ExePackage Cache="remove"
PerMachine="yes" PerMachine="yes"
Permanent="yes" Permanent="yes"
Vital="yes" Vital="yes"
InstallCondition="(VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 34404)" InstallCondition="(VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 34404)"
DetectCondition="VCREDIST_14_x64 &gt;= v$(var.VCREDIST_VER)" DetectCondition="VCREDIST_14_x64 &gt;= v$(var.VCREDIST_VER)"
InstallArguments="/install /quiet /norestart"> InstallArguments="/install /quiet /norestart">
<ExePackagePayload Description="Microsoft Visual C++ 2015-2022 Redistributable - x64" <ExePackagePayload Description="Microsoft Visual C++ 2015-2022 Redistributable - x64"
ProductName="Microsoft Visual C++ 2015-2022 Redistributable - x64" ProductName="Microsoft Visual C++ 2015-2022 Redistributable - x64"
Size="$(var.VCREDIST_X64_SIZE)" Size="$(var.VCREDIST_X64_SIZE)"
Version="$(var.VCREDIST_VER)" Version="$(var.VCREDIST_VER)"
Hash="$(var.VCREDIST_X64_SHA512)" Hash="$(var.VCREDIST_X64_SHA512)"
Name="VC_redist.x64.exe" Name="VC_redist.x64.exe"
DownloadUrl="$(var.VCREDIST_X64_URL)" /> DownloadUrl="$(var.VCREDIST_X64_URL)" />
<!-- Newer version installed is fine --> <!-- Newer version installed is fine -->
<ExitCode Value="1638" Behavior="success" /> <ExitCode Value="1638" Behavior="success" />
@ -105,20 +105,20 @@
<?if $(var.INCLUDE_ARM64) != 0 ?> <?if $(var.INCLUDE_ARM64) != 0 ?>
<ExePackage Cache="remove" <ExePackage Cache="remove"
PerMachine="yes" PerMachine="yes"
Permanent="yes" Permanent="yes"
Vital="yes" Vital="yes"
InstallCondition="NativeMachine = 43620" InstallCondition="NativeMachine = 43620"
DetectCondition="VCREDIST_14_ARM64 &gt;= v$(var.VCREDIST_VER)" DetectCondition="VCREDIST_14_ARM64 &gt;= v$(var.VCREDIST_VER)"
InstallArguments="/install /quiet /norestart"> InstallArguments="/install /quiet /norestart">
<ExePackagePayload Description="Microsoft Visual C++ 2015-2022 Redistributable - ARM64" <ExePackagePayload Description="Microsoft Visual C++ 2015-2022 Redistributable - ARM64"
ProductName="Microsoft Visual C++ 2015-2022 Redistributable - ARM64" ProductName="Microsoft Visual C++ 2015-2022 Redistributable - ARM64"
Size="$(var.VCREDIST_ARM64_SIZE)" Size="$(var.VCREDIST_ARM64_SIZE)"
Version="$(var.VCREDIST_VER)" Version="$(var.VCREDIST_VER)"
Hash="$(var.VCREDIST_ARM64_SHA512)" Hash="$(var.VCREDIST_ARM64_SHA512)"
Name="VC_redist.arm64.exe" Name="VC_redist.arm64.exe"
DownloadUrl="$(var.VCREDIST_ARM64_URL)" /> DownloadUrl="$(var.VCREDIST_ARM64_URL)" />
<!-- Newer version installed is fine --> <!-- Newer version installed is fine -->
<ExitCode Value="1638" Behavior="success" /> <ExitCode Value="1638" Behavior="success" />
@ -126,29 +126,29 @@
<?endif?> <?endif?>
<MsiPackage Id="Moonlight_x86" <MsiPackage Id="Moonlight_x86"
SourceFile="$(env.BUILD_ROOT)\build-x86-$(env.BUILD_CONFIG)\Moonlight.msi" SourceFile="$(env.BUILD_ROOT)\build-x86-$(env.BUILD_CONFIG)\Moonlight.msi"
Name="Moonlight_x86.msi" Name="Moonlight_x86.msi"
InstallCondition="(NOT VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 332)" InstallCondition="(NOT VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 332)"
Vital="yes"> Vital="yes">
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" /> <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
<MsiProperty Name="ADDDESKTOPSHORTCUT" Value="[AddDesktopShortcutCheckbox]" /> <MsiProperty Name="ADDDESKTOPSHORTCUT" Value="[AddDesktopShortcutCheckbox]" />
</MsiPackage> </MsiPackage>
<MsiPackage Id="Moonlight_x64" <MsiPackage Id="Moonlight_x64"
SourceFile="$(env.BUILD_ROOT)\build-x64-$(env.BUILD_CONFIG)\Moonlight.msi" SourceFile="$(env.BUILD_ROOT)\build-x64-$(env.BUILD_CONFIG)\Moonlight.msi"
Name="Moonlight_x64.msi" Name="Moonlight_x64.msi"
InstallCondition="(VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 34404)" InstallCondition="(VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 34404)"
Vital="yes"> Vital="yes">
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" /> <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
<MsiProperty Name="ADDDESKTOPSHORTCUT" Value="[AddDesktopShortcutCheckbox]" /> <MsiProperty Name="ADDDESKTOPSHORTCUT" Value="[AddDesktopShortcutCheckbox]" />
</MsiPackage> </MsiPackage>
<?if $(var.INCLUDE_ARM64) != 0 ?> <?if $(var.INCLUDE_ARM64) != 0 ?>
<MsiPackage Id="Moonlight_arm64" <MsiPackage Id="Moonlight_arm64"
SourceFile="$(env.BUILD_ROOT)\build-arm64-$(env.BUILD_CONFIG)\Moonlight.msi" SourceFile="$(env.BUILD_ROOT)\build-arm64-$(env.BUILD_CONFIG)\Moonlight.msi"
Name="Moonlight_arm64.msi" Name="Moonlight_arm64.msi"
InstallCondition="NativeMachine = 43620" InstallCondition="NativeMachine = 43620"
Vital="yes"> Vital="yes">
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" /> <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
<MsiProperty Name="ADDDESKTOPSHORTCUT" Value="[AddDesktopShortcutCheckbox]" /> <MsiProperty Name="ADDDESKTOPSHORTCUT" Value="[AddDesktopShortcutCheckbox]" />
</MsiPackage> </MsiPackage>