[gimp/wip/schumaml/gegl-goes-meson] build: .gitlab-ci.yml: GEGL is switching to meson exclusively



commit 68c4424f077c59f191f18eb76cce51fcd3476bd1
Author: Michael Schumacher <schumaml gmx de>
Date:   Fri Aug 16 19:39:33 2019 +0200

    build: .gitlab-ci.yml: GEGL is switching to meson exclusively

 .gitlab-ci.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01b9f54fec..f8dc0c969a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,15 +84,17 @@ babl-git-meson:
     - cd _gegl
     - mkdir _build
 
-gegl-git-autotools:
+gegl-git-meson:
   extends: .gegl-base
   variables:
     GIT_STRATEGY: none
   script:
-    - cd _build
-    - PKG_CONFIG_PATH="$INSTALL_PREFIX/lib/pkgconfig" ../autogen.sh --prefix="$INSTALL_PREFIX" 
$CONFIG_OPTIONS
-    - LD_LIBRARY_PATH="$INSTALL_PREFIX/lib:$LD_LIBRARY_PATH" make -j `nproc`
-    - LD_LIBRARY_PATH="$INSTALL_PREFIX/lib:$LD_LIBRARY_PATH" make install
+    - export PKG_CONFIG_PATH="$INSTALL_PREFIX/lib/pkgconfig"
+    - export LD_LIBRARY_PATH="$INSTALL_PREFIX/lib:$LD_LIBRARY_PATH"
+    - export XDG_DATA_DIRS="$INSTALL_PREFIX/share:$XDG_DATA_DIRS"
+    - meson -Dprefix="$INSTALL_PREFIX" _build
+    - ninja -C _build
+    - ninja -C _build install
 
 .gimp-base:
   stage: gimp
@@ -197,7 +199,7 @@ build-all-git:
   extends: .build-all
   dependencies:
     - babl-git-meson
-    - gegl-git-autotools
+    - gegl-git-meson
 
 # build-all-git-meson:
 #   extends: .build-all


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]