From 4c8e5f442b5557a32e7d97f451d3d685f2fe26b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 17 Sep 2020 09:02:16 +0200 Subject: [PATCH] meson: make "developer" mode the default This means that the dbus doc consistency checks will be enabled by default, including in the CI. I think that will work better than current state where people do not enable them and them follow-up patches for the docs like the parent commit must be had. --- docs/HACKING.md | 7 +++++++ meson.build | 1 + meson_options.txt | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/HACKING.md b/docs/HACKING.md index 990f78c9eb4..7ec3dde95b7 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -99,6 +99,13 @@ And after that, head over to your repo on GitHub and click "Compare & pull reque Happy hacking! +## Developer and release modes + +In the default meson configuration (`-Dmode=developer`), certain checks are +enabled that are suitable when hacking on systemd (such as internal +documentation consistency checks). Those are not useful when compiling for code +for distribution and can be disabled by setting `-Dmode=release`. + ## Fuzzers systemd includes fuzzers in `src/fuzz/` that use libFuzzer and are automatically diff --git a/meson.build b/meson.build index e6804900a66..f914ac582eb 100644 --- a/meson.build +++ b/meson.build @@ -3503,6 +3503,7 @@ watchdog_opt = service_watchdog == '' ? 'disabled' : service_watchdog status = [ '@0@ @1@'.format(meson.project_name(), meson.project_version()), + 'build mode: @0@'.format(get_option('mode')), 'split /usr: @0@'.format(split_usr), 'split bin-sbin: @0@'.format(split_bin), 'prefix directory: @0@'.format(prefixdir), diff --git a/meson_options.txt b/meson_options.txt index 1ad0969a1a6..fc9e4379f38 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,7 +4,7 @@ option('version-tag', type : 'string', description : 'override the git version string') -option('mode', type : 'combo', choices : ['default', 'developer'], +option('mode', type : 'combo', choices : ['developer', 'release'], description : 'enable additional checks suitable for systemd development') option('split-usr', type : 'combo', choices : ['auto', 'true', 'false'],