From cbfd1152ad1eddb30c4490cd4fe92864c7792c84 Mon Sep 17 00:00:00 2001 From: Bruno Date: Thu, 20 Feb 2025 19:11:14 -0300 Subject: [PATCH] build/windows: Prettify MSYSTEM_PREFIX condition --- build/windows/1_build-deps-msys2.ps1 | 9 +-------- build/windows/2_build-gimp-msys2.ps1 | 2 +- build/windows/installer/3_dist-gimp-inno.ps1 | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/build/windows/1_build-deps-msys2.ps1 b/build/windows/1_build-deps-msys2.ps1 index 69ed3cf0ab..af03e1494a 100644 --- a/build/windows/1_build-deps-msys2.ps1 +++ b/build/windows/1_build-deps-msys2.ps1 @@ -32,14 +32,7 @@ if (-not $MSYS_ROOT) } if (-not $MSYSTEM_PREFIX) { - if ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'ARM64*') - { - $MSYSTEM_PREFIX = 'clangarm64' - } - elseif ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'x64*') - { - $MSYSTEM_PREFIX = 'clang64' - } + $MSYSTEM_PREFIX = if ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'ARM64*') { 'clangarm64' } else { 'clang64' } } if ($MSYSTEM_PREFIX -eq 'clangarm64') { diff --git a/build/windows/2_build-gimp-msys2.ps1 b/build/windows/2_build-gimp-msys2.ps1 index 1f4525f395..2b03cbbf34 100644 --- a/build/windows/2_build-gimp-msys2.ps1 +++ b/build/windows/2_build-gimp-msys2.ps1 @@ -23,7 +23,7 @@ if (-not $GITLAB_CI) # Install the required (pre-built) packages for babl, GEGL and GIMP (again) -Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'MSYS_ROOT\)' -Context 0,28) -replace '> ','') +Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'MSYS_ROOT\)' -Context 0,21) -replace '> ','') if ($GITLAB_CI) { diff --git a/build/windows/installer/3_dist-gimp-inno.ps1 b/build/windows/installer/3_dist-gimp-inno.ps1 index 31cc570401..783a639a58 100644 --- a/build/windows/installer/3_dist-gimp-inno.ps1 +++ b/build/windows/installer/3_dist-gimp-inno.ps1 @@ -13,7 +13,7 @@ $PSNativeCommandUseErrorActionPreference = $true # This script needs a bit of MSYS2 to work -Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'MSYS_ROOT\)' -Context 0,28) -replace '> ','') +Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'MSYS_ROOT\)' -Context 0,21) -replace '> ','') # 1. GET INNO