From 805f7990f3bc14b2af1a249176aa006b15aed4e2 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Fri, 23 Aug 2019 10:08:16 -0500 Subject: [PATCH] trivial: disable gtkdoc by default Since https://fwupd.github.io is now a thing, people can be directed there rather than relying upon locally built documentation by default. Also this will mean one less dependency to install for people who build from source. Lastly this finally means that I can do this set of actions without failure: ``` meson build ninja -C build ninja -C build install (PK prompts for password) rm -rf build ``` Previously gtkdoc stuff was built as root due to the PK prompt and removing it would lead to stuff like this: ``` rm: cannot remove 'build/docs/libfwupd/html/libfwupd-FwupdClient.html': Permission denied ``` --- contrib/ci/ubuntu.sh | 2 +- contrib/debian/rules | 2 +- meson_options.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/ci/ubuntu.sh b/contrib/ci/ubuntu.sh index 0b0c4b7f8..8be1673ff 100755 --- a/contrib/ci/ubuntu.sh +++ b/contrib/ci/ubuntu.sh @@ -8,7 +8,7 @@ eval "$(dpkg-buildflags --export=sh)" export LDFLAGS=$(dpkg-buildflags --get LDFLAGS | sed "s/-Wl,-Bsymbolic-functions\s//") rm -rf build -meson build --werror -Dman=false +meson build --werror -Dman=false -Dgtkdoc=true #build with clang and -Werror ninja -C build test -v diff --git a/contrib/debian/rules b/contrib/debian/rules index 56091c24a..25428e401 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -48,7 +48,7 @@ override_dh_auto_configure: else \ export FLASHROM="-Dplugin_flashrom=false"; \ fi; \ - dh_auto_configure -- $$UEFI $$DELL $$FLASHROM $$CI -Dplugin_dummy=true --libexecdir=/usr/lib + dh_auto_configure -- $$UEFI $$DELL $$FLASHROM $$CI -Dplugin_dummy=true -Dgtkdoc=true --libexecdir=/usr/lib override_dh_install: find debian/tmp/usr -type f -name "*a" -print | xargs rm -f diff --git a/meson_options.txt b/meson_options.txt index b72799fbd..e94e16c1e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,7 +3,7 @@ option('agent', type : 'boolean', value : true, description : 'enable the fwupd option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support') option('firmware-packager', type : 'boolean', value : true, description : 'enable firmware-packager installation') option('gpg', type : 'boolean', value : true, description : 'enable the GPG verification support') -option('gtkdoc', type : 'boolean', value : true, description : 'enable developer documentation') +option('gtkdoc', type : 'boolean', value : false, description : 'enable developer documentation') option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data') option('lvfs', type : 'boolean', value : true, description : 'enable LVFS remotes') option('man', type : 'boolean', value : true, description : 'enable man pages')