From 79487f7484ab2aa2518e6ef4ea04327257386947 Mon Sep 17 00:00:00 2001 From: Daniel Playfair Cal Date: Tue, 14 Aug 2018 09:08:47 +1000 Subject: Build: revert to the old "enable-gtk-doc" flag since there is no reason to change it --- .gitlab-ci.yml | 6 +++--- docs/meson.build | 2 +- meson_options.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 868c797..a12002c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: build-job: stage: build script: - - meson -Db_coverage=true -Dman=true -Dgtk_doc=true --buildtype debug --werror _build . + - meson -Db_coverage=true -Dman=true -Denable-gtk-doc=true --buildtype debug --werror _build . - ninja -C _build all dconf-doc except: - tags @@ -32,7 +32,7 @@ build-job: test: stage: test script: - - meson _build . -Db_coverage=true -Dman=true -Dgtk_doc=true + - meson _build . -Db_coverage=true -Dman=true -Denable-gtk-doc=true - ninja -C _build all dconf-doc - mkdir -p _coverage - lcov --rc lcov_branch_coverage=1 --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov" @@ -67,7 +67,7 @@ pages: only: - master script: - - meson -Db_coverage=true -Dgtk_doc=true _build . + - meson -Db_coverage=true -Denable-gtk-doc=true _build . - ninja -C _build all dconf-doc - mkdir -p _coverage - lcov --rc lcov_branch_coverage=1 --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov" diff --git a/docs/meson.build b/docs/meson.build index d510464..581f9c2 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,4 +1,4 @@ -if get_option('gtk_doc') +if get_option('enable-gtk-doc') gnome.gtkdoc( 'dconf', main_xml: 'dconf-docs.xml', diff --git a/meson_options.txt b/meson_options.txt index 9c8e3e6..4fbd85c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,3 @@ option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files') option('man', type: 'boolean', value: true, description: 'generate man pages') -option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') +option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') -- cgit v1.2.1