meson: default to -Dman=false to make development quicker

This makes the default build much quicker. If people are building systemd for
packaging or actual installation, they probably need to set some more options
anyway (-Ddns-servers=, -Dntp-servers=), so adding -Dman=true is not a big
burden.

For CIs configured locally, -Dman=true is added to restore status quo ante.

diff --git a/meson_options.txt b/meson_options.txt
index c1cb4617d0fc2511dd8dec7d318bd45fb341f4ab..5d68970ff6b5c776d292b1743ac62a6e823a336b 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -126,6 +126,7 @@ option('hwdb', type : 'boolean',
 option('rfkill', type : 'boolean',
        description : 'support for the rfkill tools')
 option('man', type : 'combo', choices : ['auto', 'true', 'false'],
+       value : 'false',
        description : 'build and install man pages')
 option('html', type : 'combo', choices : ['auto', 'true', 'false'],
        value : 'false',

diff --git a/semaphoreci/semaphore-runner.sh b/semaphoreci/semaphore-runner.sh
index 5117bb48617d55003d19468db652748d8231b454..bc320962c131c7d5e9651614aaf22de045a65415 100755 (executable)
--- a/semaphoreci/semaphore-runner.sh
+++ b/semaphoreci/semaphore-runner.sh
@@ -87,7 +87,7 @@ EOF
             # disable autopkgtests which are not for upstream
             sed -i '/# NOUPSTREAM/ q' debian/tests/control
             # enable more unit tests
-            sed -i '/^CONFFLAGS =/ s/=/= -Dtests=unsafe -Dsplit-usr=true -Dslow-tests=true /' debian/rules
+            sed -i '/^CONFFLAGS =/ s/=/= -Dtests=unsafe -Dsplit-usr=true -Dslow-tests=true -Dman=true /' debian/rules
             # no orig tarball
             echo '1.0' > debian/source/format
 

diff --git a/travis-ci/managers/debian.sh b/travis-ci/managers/debian.sh
index 72ffcee439b92f2ad31f154cf1bd15cfda79a00b..df26b16e2c5b239fd3a4daa5b41a1dfaf24ff626 100755 (executable)
--- a/travis-ci/managers/debian.sh
+++ b/travis-ci/managers/debian.sh
@@ -44,7 +44,7 @@ for phase in "${PHASES[@]}"; do
             if [[ "$phase" = "RUN_CLANG" ]]; then
                 ENV_VARS="-e CC=clang -e CXX=clang++"
             fi
-            docker exec $ENV_VARS -it $CONT_NAME meson --werror -Dtests=unsafe -Dslow-tests=true -Dsplit-usr=true build
+            docker exec $ENV_VARS -it $CONT_NAME meson --werror -Dtests=unsafe -Dslow-tests=true -Dsplit-usr=true -Dman=true build
             $DOCKER_EXEC ninja -v -C build
             docker exec -e "TRAVIS=$TRAVIS" -it $CONT_NAME ninja -C build test
             $DOCKER_EXEC tools/check-directives.sh

diff --git a/travis-ci/managers/fedora.sh b/travis-ci/managers/fedora.sh
index 760ed5b1ea5d0431588f25cfe35c436a8ebe7e35..f821ee264084691ab969735af08072934badd717 100755 (executable)
--- a/travis-ci/managers/fedora.sh
+++ b/travis-ci/managers/fedora.sh
@@ -53,7 +53,7 @@ for phase in "${PHASES[@]}"; do
             $DOCKER_EXEC tools/check-directives.sh
             ;;
         RUN_CLANG)
-            docker exec -e CC=clang -e CXX=clang++ -it $CONT_NAME meson --werror -Dtests=unsafe -Dslow-tests=true build
+            docker exec -e CC=clang -e CXX=clang++ -it $CONT_NAME meson --werror -Dtests=unsafe -Dslow-tests=true -Dman=true build
             $DOCKER_EXEC ninja -v -C build
             $DOCKER_EXEC ninja -C build test
             ;;

diff --git a/travis-ci/managers/xenial.sh b/travis-ci/managers/xenial.sh
index 4822bdd4b73b84c7ff12b44c37c3f4e490a332fa..71a65e406decbaa14dde601b9adb7dceb2b92afa 100755 (executable)
--- a/travis-ci/managers/xenial.sh
+++ b/travis-ci/managers/xenial.sh
@@ -12,7 +12,7 @@ cd $REPO_ROOT
 
 sed -i 's/2\.30/2.27/' meson.build
 
-meson --werror -Db_sanitize=address,undefined -Dsplit-usr=true build
+meson --werror -Db_sanitize=address,undefined -Dsplit-usr=true -Dman=true build
 ninja -v -C build
 make -C test/TEST-01-BASIC clean setup run TEST_NO_QEMU=yes NSPAWN_ARGUMENTS=--keep-unit RUN_IN_UNPRIVILEGED_CONTAINER=no