Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-11-24 20:23:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Allow side-by-side installation of nightly and release builds"

Browse source 
This reverts commit 33e814122e.
This commit is contained in:
Cameron Gutman 2020-05-04 17:50:03 -07:00
parent 4f73af2920
commit 96fe1a7da1
4 changed files with 12 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appveyor.yml
View file

@ -1,4 +1,4 @@
version: 0.0.{build}.0
version: 0.0.0.{build}
clone_depth: 1

5
scripts/generate-installers.bat
View file

@ -12,11 +12,6 @@ if /I "%BUILD_CONFIG%"=="debug" (
) else (
if /I "%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 (
if /I "%BUILD_CONFIG%"=="signed-release" (
set BUILD_CONFIG=release

20
wix/Moonlight/Product.wxs
View file

@ -1,21 +1,11 @@
<?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 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 ShortcutDesc = "Stream games from your NVIDIA GameStream-enabled PC" ?>
<?define InstallFolder = "Moonlight Game Streaming" ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"
@ -26,7 +16,7 @@
Language="1033"
Version="!(bind.fileVersion.MoonlightExe)"
Manufacturer="Moonlight Game Streaming Project"
UpgradeCode="$(var.UpgradeCode)">
UpgradeCode="5c09f94e-f809-4c6a-9b7b-597c99f041fe">
<Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />
@ -72,7 +62,7 @@
WorkingDirectory="INSTALLFOLDER" />
<RemoveFolder Id="CleanupStartMenuShortcut" Directory="ApplicationProgramsFolder" On="uninstall" />
<util:RemoveFolderEx Id="CleanupAppDataFolder" On="uninstall" Property="APPDATAFOLDER" />
<RegistryValue Root="HKCU" Key="Software\$(var.RegKeyName)" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
<RegistryValue Root="HKCU" Key="Software\Moonlight Game Streaming Project" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
</Component>
<Component Id="MoonlightDesktopShortcut" Guid="*" Directory="INSTALLFOLDER">
@ -84,7 +74,7 @@
WorkingDirectory="INSTALLFOLDER" />
<RemoveFolder Id="CleanupDesktopShortcut" Directory="DesktopFolder" On="uninstall" />
<RegistryValue Root="HKCU"
Key="Software\$(var.RegKeyName)"
Key="Software\Moonlight Game Streaming Project"
Name="DesktopShortcutInstalled"
Type="integer"
Value="1"
@ -97,7 +87,7 @@
product -->
<Component Id="MoonlightDesktopShortcutState" Guid="*" Directory="INSTALLFOLDER">
<RegistryValue Root="HKCU"
Key="Software\$(var.RegKeyName)"
Key="Software\Moonlight Game Streaming Project"
Name="DesktopShortcutInstallState"
Type="integer"
Value="[ADDDESKTOPSHORTCUT]"

24
wix/MoonlightSetup/Bundle.wxs
View file

@ -1,25 +1,13 @@
<?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"
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Bundle Name="$(var.FullName)"
<Bundle Name="Moonlight Game Streaming Client"
Version="!(bind.PackageVersion.Moonlight)"
Manufacturer="Moonlight Game Streaming Project"
UpgradeCode="$(var.UpgradeCode)"
UpgradeCode="466fa35d-4be4-40ef-9ce5-afadc3b63bc5"
HelpUrl="https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide"
UpdateUrl="https://github.com/moonlight-stream/moonlight-qt/releases"
DisableModify="yes"
@ -43,9 +31,9 @@
<Variable Name="REINSTALLMODE" bal:Overridable="yes" Value="dmus" />
<?if $(env.ARCH) ~= x64 ?>
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]$(var.InstallFolder)" />
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]Moonlight Game Streaming" />
<?elseif $(env.ARCH) ~= x86 ?>
<Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]$(var.InstallFolder)" />
<Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]Moonlight Game Streaming" />
<?endif ?>
<!-- Define "Add desktop shortcut" -checkbox's state by defining a variable
@ -57,12 +45,12 @@
"DesktopShortcutInstallState" is set in Product.wxs. -->
<util:RegistrySearch Variable="HasDesktopShortcutInstallStateRegKey"
Root="HKCU"
Key="Software\$(var.RegKeyName)"
Key="Software\Moonlight Game Streaming Project"
Value="DesktopShortcutInstallState"
Result="exists" />
<util:RegistrySearch Variable="AddDesktopShortcutCheckbox"
Root="HKCU"
Key="Software\$(var.RegKeyName)"
Key="Software\Moonlight Game Streaming Project"
Value="DesktopShortcutInstallState"
Condition="HasDesktopShortcutInstallStateRegKey" />