mirror of
https://github.com/moonlight-stream/moonlight-qt.git
synced 2025-07-01 15:26:09 +00:00
Allow side-by-side installation of nightly and release builds
This commit is contained in:
parent
f28a4df5ee
commit
33e814122e
@ -1,4 +1,4 @@
|
|||||||
version: 0.0.0.{build}
|
version: 0.0.{build}.0
|
||||||
|
|
||||||
clone_depth: 1
|
clone_depth: 1
|
||||||
|
|
||||||
|
@ -12,6 +12,11 @@ if /I "%BUILD_CONFIG%"=="debug" (
|
|||||||
) else (
|
) else (
|
||||||
if /I "%BUILD_CONFIG%"=="release" (
|
if /I "%BUILD_CONFIG%"=="release" (
|
||||||
set BUILD_CONFIG=release
|
set BUILD_CONFIG=release
|
||||||
|
|
||||||
|
if /I "%APPVEYOR%"=="True" (
|
||||||
|
echo Stamping with AppVeyor version: %APPVEYOR_BUILD_VERSION%
|
||||||
|
echo | set /p dummyName="%APPVEYOR_BUILD_VERSION%" > app\version.txt
|
||||||
|
)
|
||||||
) else (
|
) else (
|
||||||
if /I "%BUILD_CONFIG%"=="signed-release" (
|
if /I "%BUILD_CONFIG%"=="signed-release" (
|
||||||
set BUILD_CONFIG=release
|
set BUILD_CONFIG=release
|
||||||
|
@ -1,11 +1,21 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<?if $(env.APPVEYOR) = True ?>
|
||||||
|
<?define ShortName = "Moonlight (Nightly)" ?>
|
||||||
|
<?define FullName = "Moonlight Game Streaming Client (Nightly)" ?>
|
||||||
|
<?define InstallFolder = "Moonlight Game Streaming (Nightly)" ?>
|
||||||
|
<?define RegKeyName = "Moonlight Game Streaming Project (Nightly)" ?>
|
||||||
|
<?define UpgradeCode = "1b3bbb1b-3ee3-4000-adf2-6358eab315f6" ?>
|
||||||
|
<?else?>
|
||||||
<?define ShortName = "Moonlight" ?>
|
<?define ShortName = "Moonlight" ?>
|
||||||
<?define FullName = "Moonlight Game Streaming Client" ?>
|
<?define FullName = "Moonlight Game Streaming Client" ?>
|
||||||
|
<?define InstallFolder = "Moonlight Game Streaming" ?>
|
||||||
|
<?define RegKeyName = "Moonlight Game Streaming Project" ?>
|
||||||
|
<?define UpgradeCode = "5c09f94e-f809-4c6a-9b7b-597c99f041fe" ?>
|
||||||
|
<?endif ?>
|
||||||
|
|
||||||
<?define ShortcutName = "$(var.ShortName)" ?>
|
<?define ShortcutName = "$(var.ShortName)" ?>
|
||||||
<?define ShortcutDesc = "Stream games from your NVIDIA GameStream-enabled PC" ?>
|
<?define ShortcutDesc = "Stream games from your NVIDIA GameStream-enabled PC" ?>
|
||||||
<?define InstallFolder = "Moonlight Game Streaming" ?>
|
|
||||||
|
|
||||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
||||||
xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"
|
xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"
|
||||||
@ -16,7 +26,7 @@
|
|||||||
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="$(var.UpgradeCode)">
|
||||||
|
|
||||||
<Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />
|
<Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />
|
||||||
|
|
||||||
@ -62,7 +72,7 @@
|
|||||||
WorkingDirectory="INSTALLFOLDER" />
|
WorkingDirectory="INSTALLFOLDER" />
|
||||||
<RemoveFolder Id="CleanupStartMenuShortcut" Directory="ApplicationProgramsFolder" On="uninstall" />
|
<RemoveFolder Id="CleanupStartMenuShortcut" Directory="ApplicationProgramsFolder" On="uninstall" />
|
||||||
<util:RemoveFolderEx Id="CleanupAppDataFolder" On="uninstall" Property="APPDATAFOLDER" />
|
<util:RemoveFolderEx Id="CleanupAppDataFolder" On="uninstall" Property="APPDATAFOLDER" />
|
||||||
<RegistryValue Root="HKCU" Key="Software\Moonlight Game Streaming Project" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
|
<RegistryValue Root="HKCU" Key="Software\$(var.RegKeyName)" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
|
||||||
</Component>
|
</Component>
|
||||||
|
|
||||||
<Component Id="MoonlightDesktopShortcut" Guid="*" Directory="INSTALLFOLDER">
|
<Component Id="MoonlightDesktopShortcut" Guid="*" Directory="INSTALLFOLDER">
|
||||||
@ -74,7 +84,7 @@
|
|||||||
WorkingDirectory="INSTALLFOLDER" />
|
WorkingDirectory="INSTALLFOLDER" />
|
||||||
<RemoveFolder Id="CleanupDesktopShortcut" Directory="DesktopFolder" On="uninstall" />
|
<RemoveFolder Id="CleanupDesktopShortcut" Directory="DesktopFolder" On="uninstall" />
|
||||||
<RegistryValue Root="HKCU"
|
<RegistryValue Root="HKCU"
|
||||||
Key="Software\Moonlight Game Streaming Project"
|
Key="Software\$(var.RegKeyName)"
|
||||||
Name="DesktopShortcutInstalled"
|
Name="DesktopShortcutInstalled"
|
||||||
Type="integer"
|
Type="integer"
|
||||||
Value="1"
|
Value="1"
|
||||||
@ -87,7 +97,7 @@
|
|||||||
product -->
|
product -->
|
||||||
<Component Id="MoonlightDesktopShortcutState" Guid="*" Directory="INSTALLFOLDER">
|
<Component Id="MoonlightDesktopShortcutState" Guid="*" Directory="INSTALLFOLDER">
|
||||||
<RegistryValue Root="HKCU"
|
<RegistryValue Root="HKCU"
|
||||||
Key="Software\Moonlight Game Streaming Project"
|
Key="Software\$(var.RegKeyName)"
|
||||||
Name="DesktopShortcutInstallState"
|
Name="DesktopShortcutInstallState"
|
||||||
Type="integer"
|
Type="integer"
|
||||||
Value="[ADDDESKTOPSHORTCUT]"
|
Value="[ADDDESKTOPSHORTCUT]"
|
||||||
|
@ -1,13 +1,25 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<?if $(env.APPVEYOR) = True ?>
|
||||||
|
<?define FullName = "Moonlight Game Streaming Client (Nightly)" ?>
|
||||||
|
<?define InstallFolder = "Moonlight Game Streaming (Nightly)" ?>
|
||||||
|
<?define RegKeyName = "Moonlight Game Streaming Project (Nightly)" ?>
|
||||||
|
<?define UpgradeCode = "12825490-fd66-4f80-87f9-56531ca66421" ?>
|
||||||
|
<?else?>
|
||||||
|
<?define FullName = "Moonlight Game Streaming Client" ?>
|
||||||
|
<?define InstallFolder = "Moonlight Game Streaming" ?>
|
||||||
|
<?define RegKeyName = "Moonlight Game Streaming Project" ?>
|
||||||
|
<?define UpgradeCode = "466fa35d-4be4-40ef-9ce5-afadc3b63bc5" ?>
|
||||||
|
<?endif ?>
|
||||||
|
|
||||||
<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">
|
||||||
|
|
||||||
<Bundle Name="Moonlight Game Streaming Client"
|
<Bundle Name="$(var.FullName)"
|
||||||
Version="!(bind.PackageVersion.Moonlight)"
|
Version="!(bind.PackageVersion.Moonlight)"
|
||||||
Manufacturer="Moonlight Game Streaming Project"
|
Manufacturer="Moonlight Game Streaming Project"
|
||||||
UpgradeCode="466fa35d-4be4-40ef-9ce5-afadc3b63bc5"
|
UpgradeCode="$(var.UpgradeCode)"
|
||||||
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"
|
||||||
@ -31,9 +43,9 @@
|
|||||||
<Variable Name="REINSTALLMODE" bal:Overridable="yes" Value="dmus" />
|
<Variable Name="REINSTALLMODE" bal:Overridable="yes" Value="dmus" />
|
||||||
|
|
||||||
<?if $(env.ARCH) ~= x64 ?>
|
<?if $(env.ARCH) ~= x64 ?>
|
||||||
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]Moonlight Game Streaming" />
|
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]$(var.InstallFolder)" />
|
||||||
<?elseif $(env.ARCH) ~= x86 ?>
|
<?elseif $(env.ARCH) ~= x86 ?>
|
||||||
<Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]Moonlight Game Streaming" />
|
<Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]$(var.InstallFolder)" />
|
||||||
<?endif ?>
|
<?endif ?>
|
||||||
|
|
||||||
<!-- Define "Add desktop shortcut" -checkbox's state by defining a variable
|
<!-- Define "Add desktop shortcut" -checkbox's state by defining a variable
|
||||||
@ -45,12 +57,12 @@
|
|||||||
"DesktopShortcutInstallState" is set in Product.wxs. -->
|
"DesktopShortcutInstallState" is set in Product.wxs. -->
|
||||||
<util:RegistrySearch Variable="HasDesktopShortcutInstallStateRegKey"
|
<util:RegistrySearch Variable="HasDesktopShortcutInstallStateRegKey"
|
||||||
Root="HKCU"
|
Root="HKCU"
|
||||||
Key="Software\Moonlight Game Streaming Project"
|
Key="Software\$(var.RegKeyName)"
|
||||||
Value="DesktopShortcutInstallState"
|
Value="DesktopShortcutInstallState"
|
||||||
Result="exists" />
|
Result="exists" />
|
||||||
<util:RegistrySearch Variable="AddDesktopShortcutCheckbox"
|
<util:RegistrySearch Variable="AddDesktopShortcutCheckbox"
|
||||||
Root="HKCU"
|
Root="HKCU"
|
||||||
Key="Software\Moonlight Game Streaming Project"
|
Key="Software\$(var.RegKeyName)"
|
||||||
Value="DesktopShortcutInstallState"
|
Value="DesktopShortcutInstallState"
|
||||||
Condition="HasDesktopShortcutInstallStateRegKey" />
|
Condition="HasDesktopShortcutInstallStateRegKey" />
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user