From 4a014d17240f50059e20ccae3e9faaa395bdbf98 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 14 Dec 2022 10:59:36 -0800 Subject: Add support for meson.options as a replacement for meson_options.txt We will still try to load `meson_options.txt` if `meson.options` doesn't exist. Because there are some advantages to using `meson.options` even with older versions of meson (such as better text editor handling) we will not warn about the existence of a `meson.options` file if a `meson_options.txt` file or symlink also exists. The name `meson.options` was picked instead of alternative proposals, such as `meson_options.build` for a couple of reasons: 1. meson.options is shorter 2. While the syntax is the same, only the `option()` function may be called in meson.options, while, it may not be called in meson.build 3. While the two files share a syntax and elementary types (strings, arrays, etc), they have different purposes: `meson.build` declares build targets, `meson.options` declares options. This is similar to the difference between C's `.c` and `.h` extensions. As an implementation detail `Interpreter.option_file` has been removed, as it is used exactly once, in the `project()` call to read the options, and we can just calculate it there and not store it. Fixes: #11176 --- man/meson.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man') diff --git a/man/meson.1 b/man/meson.1 index 7e7f486b1..5a4aa6e1e 100644 --- a/man/meson.1 +++ b/man/meson.1 @@ -105,7 +105,7 @@ print all top level targets (executables, libraries, etc) print the source files of the given target .TP \fB\-\-buildsystem\-files\fR -print all files that make up the build system (meson.build, meson_options.txt etc) +print all files that make up the build system (meson.build, meson.options, meson_options.txt etc) .TP \fB\-\-tests\fR print all unit tests -- cgit v1.2.3