Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-11-10 13:44:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Always include ARM64 in the installer bundle

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

19
scripts/generate-bundle.bat
View file

@ -5,10 +5,6 @@ rem Run from Qt command prompt with working directory set to root of repo
set BUILD_CONFIG=%1
if "%INCLUDE_ARM64%" EQU "" (
set INCLUDE_ARM64=0
)
rem Convert to lower case for windeployqt
if /I "%BUILD_CONFIG%"=="debug" (
set BUILD_CONFIG=debug
@ -23,9 +19,6 @@ if /I "%BUILD_CONFIG%"=="debug" (
set SIGN=1
set MUST_DEPLOY_SYMBOLS=1
rem Release installers must have ARM64
set INCLUDE_ARM64=1
rem Fail if there are unstaged changes
git diff-index --quiet HEAD --
if !ERRORLEVEL! NEQ 0 (
@ -58,13 +51,11 @@ if not exist "%BUILD_ROOT%\build-x64-%BUILD_CONFIG%\Moonlight.msi" (
echo You must run 'build-arch.bat %BUILD_CONFIG% x64' first
exit /b 1
)
if %INCLUDE_ARM64% NEQ 0 (
if not exist "%BUILD_ROOT%\build-arm64-%BUILD_CONFIG%\Moonlight.msi" (
echo Unable to build bundle - missing binaries for %BUILD_CONFIG% arm64
echo You must run 'build-arch.bat %BUILD_CONFIG% arm64' first
exit /b 1
)
)
echo Cleaning output directories
rmdir /s /q %BUILD_FOLDER%
@ -81,21 +72,13 @@ if !ERRORLEVEL! NEQ 0 goto Error
echo Building bundle
rem Bundles are always x86 binaries
msbuild -Restore %SOURCE_ROOT%\wix\MoonlightSetup\MoonlightSetup.wixproj /p:Configuration=%BUILD_CONFIG% /p:Platform=x86 /p:DefineConstants="INCLUDE_ARM64=%INCLUDE_ARM64%"
msbuild -Restore %SOURCE_ROOT%\wix\MoonlightSetup\MoonlightSetup.wixproj /p:Configuration=%BUILD_CONFIG% /p:Platform=x86
if !ERRORLEVEL! NEQ 0 goto Error
rem Rename the installer to match the publishing convention
ren %INSTALLER_FOLDER%\MoonlightSetup.exe MoonlightSetup-%VERSION%.exe
echo Build successful for Moonlight v%VERSION% installer!
echo.
echo x86 included: YES
echo x64 included: YES
if %INCLUDE_ARM64% NEQ 0 (
echo ARM64 included: YES
) else (
echo ARM64 included: NO
)
exit /b 0
:Error

4
wix/MoonlightSetup/Bundle.wxs
View file

@ -103,7 +103,6 @@
<ExitCode Value="1638" Behavior="success" />
</ExePackage>
<?if $(var.INCLUDE_ARM64) != 0 ?>
<ExePackage Cache="remove"
PerMachine="yes"
Permanent="yes"
@ -123,7 +122,6 @@
<!-- Newer version installed is fine -->
<ExitCode Value="1638" Behavior="success" />
</ExePackage>
<?endif?>
<MsiPackage Id="Moonlight_x86"
SourceFile="$(env.BUILD_ROOT)\build-x86-$(env.BUILD_CONFIG)\Moonlight.msi"
@ -143,7 +141,6 @@
<MsiProperty Name="ADDDESKTOPSHORTCUT" Value="[AddDesktopShortcutCheckbox]" />
</MsiPackage>
<?if $(var.INCLUDE_ARM64) != 0 ?>
<MsiPackage Id="Moonlight_arm64"
SourceFile="$(env.BUILD_ROOT)\build-arm64-$(env.BUILD_CONFIG)\Moonlight.msi"
Name="Moonlight_arm64.msi"
@ -152,7 +149,6 @@
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
<MsiProperty Name="ADDDESKTOPSHORTCUT" Value="[AddDesktopShortcutCheckbox]" />
</MsiPackage>
<?endif?>
</Chain>
</Bundle>