procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

build/windows: Only MSYS_ROOT env is needed for fix_msg.py

Browse source 
Fix regression introduced by c346731e, avoiding CYGWIN bins on PATH.
This commit is contained in:
Bruno Lopes 2025-05-19 13:58:43 -03:00
parent 6268eb5ed4
commit b25e489f6b
No known key found for this signature in database
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build/windows/installer/3_dist-gimp-inno.ps1
View file

@ -33,8 +33,10 @@ if (-not $GITLAB_CI)
#if (-not (Get-Command "python" -ErrorAction SilentlyContinue) -or "$(Get-Command "python" -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Source)" -like '*WindowsApps*')
# {
Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'MSYS_ROOT\)' -Context 0,12) -replace '> ','')
$env:PATH = "$MSYS_ROOT/usr/bin;" + $env:PATH
Invoke-Expression ((Get-Content .gitlab-ci.yml | Select-String 'win_environ\[' -Context 0,7) -replace '> ','' -replace '- ','')
#Need to install python modules (see lang\fix_msg.py)
$env:MSYS_ROOT = "$MSYS_ROOT"
#Needed to run python
$env:PATH = "$MSYS_ROOT/$MSYSTEM_PREFIX/bin;" + $env:PATH
# }

2
build/windows/installer/lang/fix_msg.py
View file

@ -13,7 +13,7 @@ except ImportError:
subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'charset_normalizer'])
else:
MINGW_PACKAGE_PREFIX = "mingw-w64-clang-aarch64" if platform.machine() == "ARM64" else "mingw-w64-clang-x86_64"
subprocess.check_call(['powershell', 'pacman', '--noconfirm', '-S', '--needed', f"{MINGW_PACKAGE_PREFIX}-python-charset-normalizer"])
subprocess.check_call(['powershell', os.getenv("MSYS_ROOT") + '/usr/bin/pacman', '--noconfirm', '-S', '--needed', f"{MINGW_PACKAGE_PREFIX}-python-charset-normalizer"])
finally:
from charset_normalizer import detect