eUgEntOptIc44/gimp
1
1
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-10-06 01:12:40 +02:00
Code Issues Releases Activity

meson: Support Windows native paths (aka backslashes) on -Dprefix

Browse Source 
Closes: #12284
This commit is contained in:
Bruno Lopes
2025-10-04 16:03:01 -03:00
parent 97944a5415
commit aea7042aa1
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -542,7 +542,7 @@ gimp-snap:
before_script: before_script:
- if (-not $env:MSYSTEM_PREFIX) { $env:MSYSTEM_PREFIX = if ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'ARM64*') { 'clangarm64' } else { 'clang64' }} - if (-not $env:MSYSTEM_PREFIX) { $env:MSYSTEM_PREFIX = if ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'ARM64*') { 'clangarm64' } else { 'clang64' }}
# FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284 # FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284
- $GIMP_PREFIX = "$PWD\_install-$env:MSYSTEM_PREFIX".Replace('\', '/') - $GIMP_PREFIX = "$PWD\_install-$env:MSYSTEM_PREFIX"
timeout: 30m timeout: 30m
.win_environ: &WIN_ENVIRON .win_environ: &WIN_ENVIRON

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

@@ -33,7 +33,7 @@ if ($GITLAB_CI)
if (-not $GIMP_PREFIX) if (-not $GIMP_PREFIX)
{ {
#FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284 #FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284
$GIMP_PREFIX = "$PWD\..\_install".Replace('\', '/') $GIMP_PREFIX = "$PWD\..\_install"
} }
Invoke-Expression ((Get-Content .gitlab-ci.yml | Select-String 'win_environ\[' -Context 0,7) -replace '> ','' -replace '- ','') Invoke-Expression ((Get-Content .gitlab-ci.yml | Select-String 'win_environ\[' -Context 0,7) -replace '> ','' -replace '- ','')

2
meson.build
View File

@@ -128,7 +128,7 @@ fs = import('fs')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
prefix = get_option('prefix') prefix = get_option('prefix').replace('\\', '/')
buildtype = get_option('buildtype') buildtype = get_option('buildtype')
exec_ver = '-' + gimp_app_version exec_ver = '-' + gimp_app_version