meson: rename meson_options.txt

The proper name for the meson options changed to meson.options in Meson
1.1. Since we don't support older versions of Meson anyway, let's just
rename the options-file to the new name.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Engestrom <None>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33445>
This commit is contained in:
Erik Faye-Lund 2025-02-07 13:58:11 +01:00 committed by Marge Bot
parent fd77cc7c32
commit 6652eb0ec3
7 changed files with 6 additions and 6 deletions

View file

@ -31,7 +31,7 @@ indent_size = 3
[*.patch] [*.patch]
trim_trailing_whitespace = false trim_trailing_whitespace = false
[{meson.build,meson_options.txt}] [{meson.build,meson.options}]
indent_style = space indent_style = space
indent_size = 2 indent_size = 2

View file

@ -55,7 +55,7 @@
- .gitlab-ci/**/* - .gitlab-ci/**/*
- include/**/* - include/**/*
- meson.build - meson.build
- meson_options.txt - meson.options
- build-support/**/* - build-support/**/*
- subprojects/**/* - subprojects/**/*
- .gitattributes - .gitattributes

View file

@ -140,7 +140,7 @@ merge_requests:
'^include/drm-uapi/i915_drm.h': ['intel'] '^include/drm-uapi/i915_drm.h': ['intel']
'^include/drm-uapi/xe_drm.h': ['intel'] '^include/drm-uapi/xe_drm.h': ['intel']
'^include/vulkan/': ['vulkan'] '^include/vulkan/': ['vulkan']
'^meson_options.txt': ['meson'] '^meson.options': ['meson']
'^README.rst': ['docs'] '^README.rst': ['docs']
'^src/amd/addrlib/': ['AMD common'] '^src/amd/addrlib/': ['AMD common']
'^src/amd/common/': ['AMD common'] '^src/amd/common/': ['AMD common']

View file

@ -21,7 +21,7 @@
# Build system - Meson # Build system - Meson
meson.build @dbaker @eric meson.build @dbaker @eric
/meson_options.txt @dbaker @eric /meson.options @dbaker @eric
/docs/meson.rst @dbaker @eric /docs/meson.rst @dbaker @eric
# Build system - Android # Build system - Android

View file

@ -169,7 +169,7 @@ To review the options which Meson chose, run:
Recent version of Meson can print the available options and their Recent version of Meson can print the available options and their
default values by running ``meson configure`` in the source directory. default values by running ``meson configure`` in the source directory.
If your Meson version is too old, you can always look in the If your Meson version is too old, you can always look in the
`meson_options.txt <https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/meson_options.txt>`__ `meson.options <https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/meson.options>`__
file at the root of the project. file at the root of the project.
With additional arguments ``meson configure`` can be used to change With additional arguments ``meson configure`` can be used to change

View file

@ -36,7 +36,7 @@
- !reference [.test, rules] - !reference [.test, rules]
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
# Old copy of .core-rules, missing: # Old copy of .core-rules, missing:
# - meson_options.txt # - meson.options
# - build-support/**/* # - build-support/**/*
# - subprojects/**/* # - subprojects/**/*
# - src/* # - src/*