[gimp/wip/schumaml/crossraods-optimization: 55/76] gitlab-ci: adjust gimp-win32 and gimp-win64 steps to system-wide crossroad

[Michael Schumacher <schumaml src gnome org>]

commit 47d13aaa7eaeacde3235528cf5f5823ccde884ed
Author: Michael Schumacher <schumaml gmx de>
Date:   Thu Dec 3 23:28:19 2020 +0100

    gitlab-ci: adjust gimp-win32 and gimp-win64 steps to system-wide crossroad

 .gitlab-ci.yml | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36ef230042..a4954c034a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,16 +239,21 @@ gimp-win64:
   variables:
     XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
     XDG_DATA_HOME:  "/usr/local/lib/"
-  cache:
+    PREFIX:         "$CI_PROJECT_DIR/.local"
+    GIMP_PREFIX:    "$PREFIX/gimp-prefix"
+   cache:
     paths:
     - .cache/crossroad/
     - apt-cache
+  before_script:
+    - export PATH="$PREFIX/bin:$PATH"
+    - export 
CROSSROAD_PKG_CONFIG_PATH="$PREFIX/share/pkgconfig:$PREFIX/lib/pkgconfig:$CROSSROAD_PKG_CONFIG_PATH"
+    - export LD_LIBRARY_PATH="$PREFIX/lib/:$PREFIX/lib:$LD_LIBRARY_PATH"
+    - export XDG_DATA_DIRS="$PREFIX/share/:$XDG_DATA_DIRS"
   script:
-    - export PATH="`pwd`/.local/bin:$PATH"
-    - mkdir _build && cd _build
-    - echo 'crossroad meson .. -Dgtk-doc=false' | crossroad w64 gimp --run="-"
-    - echo 'ninja install' | crossroad w64 gimp --run="-"
-    - echo 'cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/' | crossroad w64 gimp --run="-"
+    - echo 'crossroad meson _build -Dgtk-doc=false --prefix=$PREFIX' | crossroad w64 gimp --run="-"
+    - echo 'ninja -C _build install' | crossroad w64 gimp --run="-"
+#    - echo 'cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/' | crossroad w64 gimp --run="-"
   needs: ["deps-win64"]
   artifacts:
     name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
@@ -306,18 +311,22 @@ gimp-win32:
   variables:
     XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
     XDG_DATA_HOME:  "$CI_PROJECT_DIR/.local/share/"
+    PREFIX:         "$CI_PROJECT_DIR/.local"
+    GIMP_PREFIX:    "$PREFIX/gimp-prefix"
   cache:
     paths:
     - .cache/crossroad/
     - apt-cache
+  before_script:
+    - export PATH="$PREFIX/bin:$PATH"
+    - export 
CROSSROAD_PKG_CONFIG_PATH="$PREFIX/share/pkgconfig:$PREFIX/lib/pkgconfig:$CROSSROAD_PKG_CONFIG_PATH"
+    - export LD_LIBRARY_PATH="$PREFIX/lib/:$PREFIX/lib:$LD_LIBRARY_PATH"
+    - export XDG_DATA_DIRS="$PREFIX/share/:$XDG_DATA_DIRS"
   script:
-    - export PATH="`pwd`/.local/bin:$PATH"
-    - mkdir _build && cd _build
-    - echo 'crossroad meson ..
-              -Dwmf=disabled  -Dmng=disabled -Dgtk-doc=false && ninja install &&
-            cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
-            ' |
-      crossroad w32 gimp --run="-"
+    - echo 'crossroad meson _build -Dwmf=disabled  -Dgtk-doc=false --prefix=$PREFIX' | crossroad w32 gimp 
--run="-"
+    - echo 'ninja -C _build install' | crossroad w32 gimp --run="-"
+#            cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
+#            ' | crossroad w32 gimp --run="-"
   needs: ["deps-win32"]
   artifacts:
     name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"