summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2021-08-03 12:10:18 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2021-08-03 12:11:09 +1000
commitc21f20cc5a6072b7727d3269a0cc3213d78483d3 (patch)
tree76f79ce06c4e2070b68992ef580523fa4e7df2d0
parent1773973d4d0933be990d683a5ba0f79e7fe63b9c (diff)
downloadlibinput-c21f20cc5a6072b7727d3269a0cc3213d78483d3.tar.gz
meson.build: disable documentation by default
This does little other than drag in a whole bunch of dependencies. The libinput documentation is designed to be consumed online, so there's no need building it on every machine. We leave the dependencies installed in the images because it's a lot easier to remove them and test if the build still works than adding them and dragging in every updated package since we built the image. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--.gitlab-ci/ci.template6
-rw-r--r--meson_options.txt4
3 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7ffcc99..46f5d18f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -737,11 +737,11 @@ build-no-libwacom-nodeps@fedora:34:
before_script:
- dnf remove -y libwacom libwacom-devel
-build-no-docs@fedora:34:
+build-docs@fedora:34:
extends:
- .fedora-build@template
variables:
- MESON_ARGS: "-Ddocumentation=false"
+ MESON_ARGS: "-Ddocumentation=true"
build-no-docs-nodeps@fedora:34:
extends:
@@ -1056,7 +1056,7 @@ wayland-web:
refs:
- schedules
variables:
- MESON_ARGS: '-Ddebug-gui=false -Dlibwacom=false -Dtests=false'
+ MESON_ARGS: '-Ddocumentation=true -Ddebug-gui=false -Dlibwacom=false -Dtests=false'
MESON_BUILDDIR: 'builddir'
only:
refs:
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 153cfdb9..120e46c2 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -447,11 +447,11 @@ build-no-libwacom-nodeps@{{distro.name}}:{{version}}:
before_script:
- dnf remove -y libwacom libwacom-devel
-build-no-docs@{{distro.name}}:{{version}}:
+build-docs@{{distro.name}}:{{version}}:
extends:
- .{{distro.name}}-build@template
variables:
- MESON_ARGS: "-Ddocumentation=false"
+ MESON_ARGS: "-Ddocumentation=true"
build-no-docs-nodeps@{{distro.name}}:{{version}}:
extends:
@@ -697,7 +697,7 @@ wayland-web:
refs:
- schedules
variables:
- MESON_ARGS: '-Ddebug-gui=false -Dlibwacom=false -Dtests=false'
+ MESON_ARGS: '-Ddocumentation=true -Ddebug-gui=false -Dlibwacom=false -Dtests=false'
MESON_BUILDDIR: 'builddir'
only:
refs:
diff --git a/meson_options.txt b/meson_options.txt
index 7819449c..4fe8e499 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -24,8 +24,8 @@ option('install-tests',
description: 'Install the libinput test command [default=false]')
option('documentation',
type: 'boolean',
- value: true,
- description: 'Build the documentation [default=true]')
+ value: false,
+ description: 'Build the documentation [default=false]')
option('coverity',
type: 'boolean',
value: false,