aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2022-12-14 11:35:25 -0800
committerJussi Pakkanen <jpakkane@gmail.com>2023-03-28 15:01:10 +0300
commitbe092c252e180d2c7e1fc6639d9ebc56aac80fd1 (patch)
tree35f92443b6f260f054d6eae601868b47b88ed5e0
parent4a014d17240f50059e20ccae3e9faaa395bdbf98 (diff)
downloadmeson-be092c252e180d2c7e1fc6639d9ebc56aac80fd1.zip
meson-be092c252e180d2c7e1fc6639d9ebc56aac80fd1.tar.gz
meson-be092c252e180d2c7e1fc6639d9ebc56aac80fd1.tar.bz2
docs: replace most uses of `meson_options.txt` with `meson.options`
I've left the old release notes in place, but updated everything else to use `meson.options`
-rw-r--r--docs/markdown/Adding-new-projects-to-wrapdb.md2
-rw-r--r--docs/markdown/Build-options.md5
-rw-r--r--docs/markdown/Configuring-a-build-directory.md2
-rw-r--r--docs/markdown/Fs-module.md2
-rw-r--r--docs/markdown/IDE-integration.md2
-rw-r--r--docs/markdown/Porting-from-autotools.md2
6 files changed, 8 insertions, 7 deletions
diff --git a/docs/markdown/Adding-new-projects-to-wrapdb.md b/docs/markdown/Adding-new-projects-to-wrapdb.md
index 03998cd..0e00d16 100644
--- a/docs/markdown/Adding-new-projects-to-wrapdb.md
+++ b/docs/markdown/Adding-new-projects-to-wrapdb.md
@@ -106,7 +106,7 @@ Remember that all files go in the directory
`subprojects/packagefiles/<project-name>`.
```
-${EDITOR} meson.build meson_options.txt
+${EDITOR} meson.build meson.options
```
In order to apply the locally added build files to the upstream
diff --git a/docs/markdown/Build-options.md b/docs/markdown/Build-options.md
index e8785f9..af4a58a 100644
--- a/docs/markdown/Build-options.md
+++ b/docs/markdown/Build-options.md
@@ -7,8 +7,9 @@ short-description: Build options to configure project properties
Most non-trivial builds require user-settable options. As an example a
program may have two different data backends that are selectable at
build time. Meson provides for this by having a option definition
-file. Its name is `meson_options.txt` and it is placed at the root of
-your source tree.
+file. Its name is `meson.options` and it is placed at the root of
+your source tree. For versions of meson before 1.1, this file was called
+`meson_options.txt`.
Here is a simple option file.
diff --git a/docs/markdown/Configuring-a-build-directory.md b/docs/markdown/Configuring-a-build-directory.md
index 6b9bb40..1dcef46 100644
--- a/docs/markdown/Configuring-a-build-directory.md
+++ b/docs/markdown/Configuring-a-build-directory.md
@@ -7,7 +7,7 @@ short-description: Configuring a pre-generated build directory
Often you want to change the settings of your build after it has been
generated. For example you might want to change from a debug build
into a release build, set custom compiler flags, change the build
-options provided in your `meson_options.txt` file and so on.
+options provided in your `meson.options` file and so on.
The main tool for this is the `meson configure` command.
diff --git a/docs/markdown/Fs-module.md b/docs/markdown/Fs-module.md
index 1393551..e18fa56 100644
--- a/docs/markdown/Fs-module.md
+++ b/docs/markdown/Fs-module.md
@@ -16,7 +16,7 @@ If specified, a leading `~` is expanded to the user home directory.
Environment variables are not available as is the rule throughout Meson.
That is, $HOME, %USERPROFILE%, $MKLROOT, etc. have no meaning to the Meson
filesystem module. If needed, pass such variables into Meson via command
-line options in `meson_options.txt`, native-file or cross-file.
+line options in `meson.options`, native-file or cross-file.
Where possible, symlinks and parent directory notation are resolved to an
absolute path.
diff --git a/docs/markdown/IDE-integration.md b/docs/markdown/IDE-integration.md
index eb3881b..d31606e 100644
--- a/docs/markdown/IDE-integration.md
+++ b/docs/markdown/IDE-integration.md
@@ -338,7 +338,7 @@ The output format is as follows:
```json
[
"/Path/to/the/targets/meson.build",
- "/Path/to/the/targets/meson_options.txt",
+ "/Path/to/the/targets/meson.options",
"/Path/to/the/targets/subdir/meson.build"
]
```
diff --git a/docs/markdown/Porting-from-autotools.md b/docs/markdown/Porting-from-autotools.md
index 34e1bbd..dc489af 100644
--- a/docs/markdown/Porting-from-autotools.md
+++ b/docs/markdown/Porting-from-autotools.md
@@ -150,7 +150,7 @@ else
endif
```
-`meson_options.txt`:
+`meson.options`:
```meson
option('enable-dep11', type : 'boolean', value : true, description : 'enable DEP-11')