[gobject-introspection] meson: disable doctool by default
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] meson: disable doctool by default
- Date: Thu, 3 Jan 2019 18:35:26 +0000 (UTC)
commit 0c96702e056f6e1afa67c0dff60a4a539efbe668
Author: Christoph Reiter <reiter christoph gmail com>
Date: Thu Jan 3 19:34:33 2019 +0100
meson: disable doctool by default
To unbreak continuous
.gitlab-ci.yml | 2 +-
.gitlab-ci/test-msys2-meson.sh | 2 +-
meson_options.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 469dbc21..b98e7e42 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ fedora-x86_64-meson:
CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache"
CFLAGS: "-Werror"
script:
- - meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Dgtk-doc=true -Dcairo=true -Dpython=python3
_build .
+ - meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Ddoctool=true -Dgtk-doc=true -Dcairo=true
-Dpython=python3 _build .
- cd _build
- ninja
- meson test --print-errorlogs --suite=gobject-introspection --no-suite=glib
diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh
index daeca63a..7c63581c 100644
--- a/.gitlab-ci/test-msys2-meson.sh
+++ b/.gitlab-ci/test-msys2-meson.sh
@@ -38,7 +38,7 @@ export PATH="$HOME/.local/bin:$PATH"
# Passing the full interpreter path works around the issue
PYTHON="$(which python3)"
export CFLAGS="-Werror"
-meson -Dcairo=true -Dpython="${PYTHON}" --buildtype debug _build
+meson -Dcairo=true -Ddoctool=true -Dpython="${PYTHON}" --buildtype debug _build
cd _build
ninja
diff --git a/meson_options.txt b/meson_options.txt
index ee6958dd..f268607a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,7 +2,7 @@ option('cairo', type: 'boolean', value : false,
description: 'Use cairo for tests'
)
-option('doctool', type: 'boolean', value : true,
+option('doctool', type: 'boolean', value : false,
description: 'Install g-ir-doc-tool'
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]