callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build/windows: Improve MSYSTEM_PREFIX AND MINGW_PACKAGE_PREFIX detection

Browse Source
This commit is contained in:
Bruno
2025-02-19 11:07:15 -03:00
parent 693f95a25c
commit d27828c00f
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -576,6 +576,8 @@ gimp-win:
matrix:
- RUNNER: win32-ps
MSYSTEM_PREFIX: mingw32
variables:
MINGW_PACKAGE_PREFIX: mingw-w64-i686
deps-win-x86:
extends: .win-x86
@ -588,7 +590,8 @@ gimp-win-x86:
extends: .win-x86
needs: ["deps-win-x86"]
stage: !reference [gimp-win, stage]
variables: !reference [gimp-win, variables]
variables:
GIT_SUBMODULE_STRATEGY: recursive
script:
- !reference [gimp-win, script]
# We split 32-bit DWARF symbols here because LLVM-objcopy do NOT support them

17
build/windows/1_build-deps-msys2.ps1
View File

@ -30,14 +30,23 @@ if (-not $MSYS_ROOT)
exit 1
}
}
if ((Get-WmiObject -Class Win32_ComputerSystem).SystemType -like 'ARM64*')
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'
}
}
if ($MSYSTEM_PREFIX -eq 'clangarm64')
{
$MSYSTEM_PREFIX = 'clangarm64'
$MINGW_PACKAGE_PREFIX = 'mingw-w64-clang-aarch64'
}
elseif ((Get-WmiObject -Class Win32_ComputerSystem).SystemType -like 'x64*')
elseif ($MSYSTEM_PREFIX -eq 'clang64')
{
$MSYSTEM_PREFIX = 'clang64'
$MINGW_PACKAGE_PREFIX = 'mingw-w64-clang-x86_64'
}
$env:Path = "$MSYS_ROOT/$MSYSTEM_PREFIX/bin;$MSYS_ROOT/usr/bin;" + $env:Path

2
build/windows/2_build-gimp-msys2.ps1
View File

@ -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,19) -replace '> ','')
Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'MSYS_ROOT\)' -Context 0,28) -replace '> ','')
if ($GITLAB_CI)
{

2
build/windows/installer/3_dist-gimp-inno.ps1
View File

@ -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,19) -replace '> ','')
Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'MSYS_ROOT\)' -Context 0,28) -replace '> ','')
# 1. GET INNO