dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build, gitlab-ci: using non-ambiguous `meson setup` syntax. 

Fixes:

> WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated.
This commit is contained in:
Jehan 2023-01-24 15:35:30 +01:00
parent ba5c423331
commit 4699d9e2ac
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci.yml
View File

@ -170,11 +170,11 @@ deps-debian:
- export XDG_DATA_DIRS="${INSTALL_PREFIX}/share:/usr/local/share:/usr/share" - export XDG_DATA_DIRS="${INSTALL_PREFIX}/share:/usr/local/share:/usr/share"
script: script:
- cd _babl - cd _babl
- meson -Dprefix="${INSTALL_PREFIX}" _build - meson setup -Dprefix="${INSTALL_PREFIX}" _build
- ninja -C _build - ninja -C _build
- ninja -C _build install - ninja -C _build install
- cd ../_gegl - cd ../_gegl
- meson --prefix="${INSTALL_PREFIX}" _build - meson setup --prefix="${INSTALL_PREFIX}" _build
- ninja -C _build - ninja -C _build
- ninja -C _build install - ninja -C _build install
needs: ["build-image"] needs: ["build-image"]
@ -240,7 +240,7 @@ gimp-meson-debian:
- if: '$GIMP_CI_SOURCES != null' - if: '$GIMP_CI_SOURCES != null'
extends: .gimp-debian-base extends: .gimp-debian-base
script: script:
- meson _build - meson setup _build
--prefix="${INSTALL_PREFIX}" --prefix="${INSTALL_PREFIX}"
-Dg-ir-doc=true -Dgi-docgen=enabled -Dg-ir-doc=true -Dgi-docgen=enabled
- ninja -C _build - ninja -C _build
@ -267,7 +267,7 @@ gimp-clang-debian:
- mkdir -p "$APT_CACHE" - mkdir -p "$APT_CACHE"
- apt-get install -y --no-install-recommends -o dir::cache::archives="$APT_CACHE" - apt-get install -y --no-install-recommends -o dir::cache::archives="$APT_CACHE"
clang libomp-dev clang libomp-dev
- meson _build - meson setup _build
--prefix="${INSTALL_PREFIX}" --prefix="${INSTALL_PREFIX}"
- ninja -C _build - ninja -C _build
- ninja -C _build test - ninja -C _build test
@ -278,7 +278,7 @@ gimp-meson-raster-icons:
- if: '$GIMP_CI_RASTER_ICONS != null' - if: '$GIMP_CI_RASTER_ICONS != null'
extends: .gimp-debian-base extends: .gimp-debian-base
script: script:
- meson _build - meson setup _build
--prefix="${INSTALL_PREFIX}" --prefix="${INSTALL_PREFIX}"
-Dvector-icons=false -Dvector-icons=false
- ninja -C _build - ninja -C _build
@ -546,7 +546,7 @@ gimp-win64:
script: script:
- export PATH="`pwd`/.local/bin:$PATH" - export PATH="`pwd`/.local/bin:$PATH"
- mkdir _build && cd _build - mkdir _build && cd _build
- echo 'crossroad meson .. - echo 'crossroad meson setup ..
-Dgi-docgen=disabled && ninja && ninja install && -Dgi-docgen=disabled && ninja && ninja install &&
cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/ cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
' | ' |
@ -612,7 +612,7 @@ gimp-win32:
script: script:
- export PATH="`pwd`/.local/bin:$PATH" - export PATH="`pwd`/.local/bin:$PATH"
- mkdir _build && cd _build - mkdir _build && cd _build
- echo 'crossroad meson .. - echo 'crossroad meson setup ..
-Dwmf=disabled -Dmng=disabled -Dgi_docgen=false && ninja && ninja install && -Dwmf=disabled -Dmng=disabled -Dgi_docgen=false && ninja && ninja install &&
cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/ cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
' | ' |

4
build/windows/gitlab-ci/build-deps-crossroad.sh
View File

@ -5,7 +5,7 @@ mkdir _deps && cd _deps
crossroad install lcms2 && \ crossroad install lcms2 && \
git clone --depth 1 https://gitlab.gnome.org/GNOME/babl.git && cd babl && \ git clone --depth 1 https://gitlab.gnome.org/GNOME/babl.git && cd babl && \
crossroad meson _build/ -Denable-gir=false -Dlibdir=lib && \ crossroad meson setup _build/ -Denable-gir=false -Dlibdir=lib && \
ninja -C _build install || exit 1 ninja -C _build install || exit 1
cd .. cd ..
@ -13,7 +13,7 @@ cd ..
crossroad install cairo graphviz json-glib && \ crossroad install cairo graphviz json-glib && \
git clone --depth 1 https://gitlab.gnome.org/GNOME/gegl.git && cd gegl && \ git clone --depth 1 https://gitlab.gnome.org/GNOME/gegl.git && cd gegl && \
crossroad meson _build/ -Dintrospection=false -Dsdl2=disabled -Dlibdir=lib && \ crossroad meson setup _build/ -Dintrospection=false -Dsdl2=disabled -Dlibdir=lib && \
ninja -C _build install || exit 1 ninja -C _build install || exit 1
cd .. cd ..