From 47350c5fb64e7c76e071a928bf9251dfe79d3ab3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 14 Apr 2021 13:17:22 +0200 Subject: [PATCH] meson: simplify the BUILD_MODE conditional Using a enum is all nice and generic, but at this point it seems unlikely that we'll add further build modes. But having an enum means that we need to include the header file with the enumeration whenerever the conditional is used. I want to use the conditional in log.h, which makes it hard to avoid circular imports. --- meson.build | 8 ++++---- src/analyze/analyze.c | 2 +- src/basic/build.h | 5 ----- src/basic/missing_capability.h | 2 +- src/import/curl-util.c | 2 +- src/journal-remote/journal-upload.c | 2 +- src/libudev/test-libudev.c | 2 +- src/stdio-bridge/stdio-bridge.c | 2 +- src/test/test-cgroup-setup.c | 2 +- src/test/test-cgroup-util.c | 2 +- src/test/test-udev.c | 2 +- src/udev/dmi_memory_id/dmi_memory_id.c | 2 +- src/udev/scsi_id/scsi_id.c | 2 +- src/udev/udevadm.h | 1 - src/udev/udevd.c | 2 +- 15 files changed, 16 insertions(+), 22 deletions(-) diff --git a/meson.build b/meson.build index fa929370bd5..7d9f2d3d4c6 100644 --- a/meson.build +++ b/meson.build @@ -38,8 +38,8 @@ relative_source_path = run_command('realpath', project_source_root).stdout().strip() conf.set_quoted('RELATIVE_SOURCE_PATH', relative_source_path) -conf.set('BUILD_MODE', 'BUILD_MODE_' + get_option('mode').to_upper(), - description : 'tailor build to development or release builds') +conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer', + description : 'tailor build to development or release builds') want_ossfuzz = get_option('oss-fuzz') want_libfuzzer = get_option('llvm-fuzz') @@ -1117,7 +1117,7 @@ else libcurl = [] endif conf.set10('HAVE_LIBCURL', have) -conf.set10('CURL_NO_OLDIES', get_option('mode') == 'developer') +conf.set10('CURL_NO_OLDIES', conf.get('BUILD_MODE_DEVELOPER') == 1) want_libidn = get_option('libidn') want_libidn2 = get_option('libidn2') @@ -3640,7 +3640,7 @@ if dbus_docs.length() > 0 '@INPUT@'], input : dbus_docs) - if conf.get('BUILD_MODE') == 'BUILD_MODE_DEVELOPER' + if conf.get('BUILD_MODE_DEVELOPER') == 1 test('dbus-docs-fresh', update_dbus_docs_py, args : ['--build-dir=@0@'.format(project_build_root), diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 1a38d878a36..1ad37318526 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -15,7 +15,6 @@ #include "analyze-condition.h" #include "analyze-security.h" #include "analyze-verify.h" -#include "build.h" #include "bus-error.h" #include "bus-locator.h" #include "bus-map-properties.h" @@ -53,6 +52,7 @@ #include "unit-name.h" #include "util.h" #include "verbs.h" +#include "version.h" #define SCALE_X (0.1 / 1000.0) /* pixels per us */ #define SCALE_Y (20.0) diff --git a/src/basic/build.h b/src/basic/build.h index 3de0d36cc9f..87276bf686b 100644 --- a/src/basic/build.h +++ b/src/basic/build.h @@ -4,8 +4,3 @@ #include "version.h" extern const char* const systemd_features; - -enum { - BUILD_MODE_DEVELOPER, - BUILD_MODE_RELEASE, -}; diff --git a/src/basic/missing_capability.h b/src/basic/missing_capability.h index 4cf31cb839a..5adda554e59 100644 --- a/src/basic/missing_capability.h +++ b/src/basic/missing_capability.h @@ -27,7 +27,7 @@ #ifdef CAP_LAST_CAP # if CAP_LAST_CAP > SYSTEMD_CAP_LAST_CAP -# if BUILD_MODE == BUILD_MODE_DEVELOPER && defined(TEST_CAPABILITY_C) +# if BUILD_MODE_DEVELOPER && defined(TEST_CAPABILITY_C) # warning "The capability list here is outdated" # endif # else diff --git a/src/import/curl-util.c b/src/import/curl-util.c index e6db8106355..ed2ac0a654a 100644 --- a/src/import/curl-util.c +++ b/src/import/curl-util.c @@ -3,11 +3,11 @@ #include #include "alloc-util.h" -#include "build.h" #include "curl-util.h" #include "fd-util.h" #include "locale-util.h" #include "string-util.h" +#include "version.h" static void curl_glue_check_finished(CurlGlue *g) { CURLMsg *msg; diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index a8f1f7e5115..d7e45364a6e 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -9,7 +9,6 @@ #include "sd-daemon.h" #include "alloc-util.h" -#include "build.h" #include "conf-parser.h" #include "daemon-util.h" #include "def.h" @@ -34,6 +33,7 @@ #include "strv.h" #include "tmpfile-util.h" #include "util.h" +#include "version.h" #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem" #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-upload.pem" diff --git a/src/libudev/test-libudev.c b/src/libudev/test-libudev.c index 12bd0d62994..a7510567954 100644 --- a/src/libudev/test-libudev.c +++ b/src/libudev/test-libudev.c @@ -6,7 +6,6 @@ #include #include "alloc-util.h" -#include "build.h" #include "fd-util.h" #include "libudev-list-internal.h" #include "libudev-util.h" @@ -15,6 +14,7 @@ #include "stdio-util.h" #include "string-util.h" #include "tests.h" +#include "version.h" static bool arg_monitor = false; diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c index 217bd97ea5e..b45f7912cbe 100644 --- a/src/stdio-bridge/stdio-bridge.c +++ b/src/stdio-bridge/stdio-bridge.c @@ -10,7 +10,6 @@ #include "sd-daemon.h" #include "alloc-util.h" -#include "build.h" #include "bus-internal.h" #include "bus-util.h" #include "errno-util.h" @@ -18,6 +17,7 @@ #include "log.h" #include "main-func.h" #include "util.h" +#include "version.h" #define DEFAULT_BUS_PATH "unix:path=/run/dbus/system_bus_socket" diff --git a/src/test/test-cgroup-setup.c b/src/test/test-cgroup-setup.c index 4978a92e463..37ef66b0fd8 100644 --- a/src/test/test-cgroup-setup.c +++ b/src/test/test-cgroup-setup.c @@ -3,13 +3,13 @@ #include #include "alloc-util.h" -#include "build.h" #include "cgroup-setup.h" #include "errno-util.h" #include "log.h" #include "proc-cmdline.h" #include "string-util.h" #include "tests.h" +#include "version.h" static void test_is_wanted_print(bool header) { _cleanup_free_ char *cmdline = NULL; diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c index f95832acf61..c2adfa07ce0 100644 --- a/src/test/test-cgroup-util.c +++ b/src/test/test-cgroup-util.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" -#include "build.h" #include "cgroup-util.h" #include "dirent-util.h" #include "errno-util.h" @@ -17,6 +16,7 @@ #include "tests.h" #include "user-util.h" #include "util.h" +#include "version.h" static void check_p_d_u(const char *path, int code, const char *result) { _cleanup_free_ char *unit = NULL; diff --git a/src/test/test-udev.c b/src/test/test-udev.c index 488b965c822..6bb8a9e4fc8 100644 --- a/src/test/test-udev.c +++ b/src/test/test-udev.c @@ -11,7 +11,6 @@ #include #include -#include "build.h" #include "device-private.h" #include "fs-util.h" #include "log.h" @@ -24,6 +23,7 @@ #include "string-util.h" #include "tests.h" #include "udev-event.h" +#include "version.h" static int fake_filesystems(void) { static const struct fakefs { diff --git a/src/udev/dmi_memory_id/dmi_memory_id.c b/src/udev/dmi_memory_id/dmi_memory_id.c index c5bea8c9a80..64eba0d314e 100644 --- a/src/udev/dmi_memory_id/dmi_memory_id.c +++ b/src/udev/dmi_memory_id/dmi_memory_id.c @@ -45,12 +45,12 @@ #include #include "alloc-util.h" -#include "build.h" #include "fileio.h" #include "main-func.h" #include "string-util.h" #include "udev-util.h" #include "unaligned.h" +#include "version.h" #define SUPPORTED_SMBIOS_VER 0x030300 diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index d9d897c00ca..41f92b68bea 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -17,7 +17,6 @@ #include #include "alloc-util.h" -#include "build.h" #include "device-nodes.h" #include "extract-word.h" #include "fd-util.h" @@ -27,6 +26,7 @@ #include "strv.h" #include "strxcpyx.h" #include "udev-util.h" +#include "version.h" static const struct option options[] = { { "device", required_argument, NULL, 'd' }, diff --git a/src/udev/udevadm.h b/src/udev/udevadm.h index 162bbb9a436..75ce633632b 100644 --- a/src/udev/udevadm.h +++ b/src/udev/udevadm.h @@ -3,7 +3,6 @@ #include -#include "build.h" #include "macro.h" int info_main(int argc, char *argv[], void *userdata); diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 0a44b40a320..2c702d0388d 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -28,7 +28,6 @@ #include "sd-event.h" #include "alloc-util.h" -#include "build.h" #include "cgroup-util.h" #include "cpu-set-util.h" #include "dev-setup.h" @@ -65,6 +64,7 @@ #include "udev-util.h" #include "udev-watch.h" #include "user-util.h" +#include "version.h" #define WORKER_NUM_MAX 2048U -- 2.47.3