Merge in changes included in Meson 1.5.2

.github/workflows/macos.yml

@@ -96,7 +96,7 @@ jobs:
         find /opt/homebrew/Cellar/python* -name EXTERNALLY-MANAGED -print0 | xargs -0 rm -vf
     # use python3 from homebrew because it is a valid framework, unlike the actions one:
     # https://github.com/actions/setup-python/issues/58
-    - run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc zstd ncurses objfw
+    - run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc zstd ncurses objfw libomp
     - run: |
         python3 -m pip install --upgrade setuptools
         python3 -m pip install --upgrade pip

.github/workflows/os_comp.yml

@@ -26,6 +26,12 @@ on:
       - ".github/workflows/os_comp.yml"
       - "run*tests.py"
 
+# make GHA actions use node16 which still works with bionic
+# See https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
+# Unclear how long this will work though
+env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
 permissions:
   contents: read
 

.pylintrc

@@ -17,6 +17,7 @@ disable=
     cell-var-from-loop,
     consider-using-f-string,
     consider-using-with,
+    contextmanager-generator-missing-cleanup,
     cyclic-import,
     deprecated-decorator,
     duplicate-code,
@@ -47,6 +48,7 @@ disable=
     not-an-iterable,
     not-callable,
     pointless-string-statement,
+    possibly-used-before-assignment,
     protected-access,
     raise-missing-from,
     redeclared-assigned-name,
@@ -75,6 +77,7 @@ disable=
     unsubscriptable-object,
     unused-argument,
     unused-variable,
+    used-before-assignment,
     useless-super-delegation,
     wrong-import-order,
     wrong-import-position,

azure-pipelines.yml

@@ -26,7 +26,7 @@ trigger:
       - 'test cases'
       - 'unittests'
       - 'azure-pipelines.yml'
-      - 'ci/azure-steps.yml'
+      - 'ci/run.ps1'
       - 'run_project_tests.py'
       - 'run_tests.py'
       - 'run_unittests.py'
@@ -41,7 +41,7 @@ pr:
       - 'test cases'
       - 'unittests'
       - 'azure-pipelines.yml'
-      - 'ci/azure-steps.yml'
+      - 'ci/run.ps1'
       - 'run_project_tests.py'
       - 'run_tests.py'
       - 'run_unittests.py'

ci/ciimage/build.py

@@ -80,11 +80,6 @@ def gen_bashrc(self) -> None:
             fi
         '''
 
-        if self.data_dir.name == 'gentoo':
-            out_data += '''
-                source /etc/profile
-            '''
-
         out_file.write_text(out_data, encoding='utf-8')
 
         # make it executable

ci/ciimage/cuda/install.sh

@@ -18,4 +18,4 @@ install_minimal_python_packages
 # Manually remove cache to avoid GitHub space restrictions
 rm -rf /var/cache/pacman
 
-echo "source /etc/profile.d/cuda.sh" >> /ci/env_vars.sh
+echo "source /etc/profile" >> /ci/env_vars.sh

ci/ciimage/gentoo/install.sh

@@ -156,3 +156,5 @@ rm /usr/lib/python/EXTERNALLY-MANAGED
 python3 -m ensurepip
 install_python_packages
 python3 -m pip install "${base_python_pkgs[@]}"
+
+echo "source /etc/profile" >> /ci/env_vars.sh

ci/run.ps1

@@ -8,21 +8,22 @@ if ($LastExitCode -ne 0) {
 $env:Path = ($env:Path.Split(';') | Where-Object { $_ -notmatch 'mingw|Strawberry|Chocolatey|PostgreSQL' }) -join ';'
 
 if ($env:arch -eq 'x64') {
+    rustup default 1.77
     # Rust puts its shared stdlib in a secret place, but it is needed to run tests.
-    $env:Path += ";$HOME/.rustup/toolchains/stable-x86_64-pc-windows-msvc/bin"
+    $env:Path += ";$HOME/.rustup/toolchains/1.77-x86_64-pc-windows-msvc/bin"
 } elseif ($env:arch -eq 'x86') {
     # Switch to the x86 Rust toolchain
-    rustup default stable-i686-pc-windows-msvc
-
-    # Also install clippy
-    rustup component add clippy
+    rustup default 1.77-i686-pc-windows-msvc
 
     # Rust puts its shared stdlib in a secret place, but it is needed to run tests.
-    $env:Path += ";$HOME/.rustup/toolchains/stable-i686-pc-windows-msvc/bin"
+    $env:Path += ";$HOME/.rustup/toolchains/1.77-i686-pc-windows-msvc/bin"
     # Need 32-bit Python for tests that need the Python dependency
     $env:Path = "C:\hostedtoolcache\windows\Python\3.7.9\x86;C:\hostedtoolcache\windows\Python\3.7.9\x86\Scripts;$env:Path"
 }
 
+# Also install clippy
+rustup component add clippy
+
 # Set the CI env var for the meson test framework
 $env:CI = '1'
 

data/shell-completions/bash/meson

@@ -580,6 +580,7 @@ _meson-test() {
     quiet
     timeout-multiplier
     setup
+    max-lines
     test-args
   )
 

data/shell-completions/zsh/_meson

@@ -196,6 +196,7 @@ local -a meson_commands=(
   '(--quiet -q)'{'--quiet','-q'}'[produce less output to the terminal]'
   '(--timeout-multiplier -t)'{'--timeout-multiplier','-t'}'[a multiplier for test timeouts]:Python floating-point number: '
   '--setup[which test setup to use]:test setup: '
+  '--max-lines[Maximum number of lines to show from a long test log]:Python integer number: '
   '--test-args[arguments to pass to the tests]: : '
   '*:Meson tests:__meson_test_names'
   )

docs/markdown/Builtin-options.md

@@ -408,7 +408,8 @@ interpreter directly, even if it is a venv. Setting to `venv` will instead use
 the paths for the virtualenv the python found installation comes from (or fail
 if it is not a virtualenv).  Setting to `auto` will check if the found
 installation is a virtualenv, and use `venv` or `system` as appropriate (but
-never `prefix`). This option is mutually exclusive with the `platlibdir`/`purelibdir`.
+never `prefix`). Note that Conda environments are treated as `system`.
+This option is mutually exclusive with the `platlibdir`/`purelibdir`.
 
 For backwards compatibility purposes, the default `install_env` is `prefix`.
 

docs/markdown/Configuration.md

@@ -39,7 +39,7 @@ use a single `configuration_data` object as many times as you like,
 but it becomes immutable after being passed to the `configure_file`
 function. That is, after it has been used once to generate output the
 `set` function becomes unusable and trying to call it causes an error.
-*Since 1.5.0* Copy of immutable `configuration_data` is however mutable.
+Copy of immutable `configuration_data` is still immutable.
 
 For more complex configuration file generation Meson provides a second
 form. To use it, put a line like this in your configuration file.

docs/markdown/FAQ.md

@@ -695,3 +695,16 @@ directory. It glob ignores ```"*"```, since all generated files should not be
 checked into git.
 
 Users of older versions of Meson may need to set up ignore files themselves.
+
+## How to add preprocessor defines to a target?
+
+Just add `-DFOO` to `c_args` or `cpp_args`. This works for all known compilers.
+
+```meson
+mylib = library('mylib', 'mysource.c', c_args: ['-DFOO'])
+```
+
+Even though [MSVC documentation](https://learn.microsoft.com/en-us/cpp/build/reference/d-preprocessor-definitions)
+uses `/D` for preprocessor defines, its [command-line syntax](https://learn.microsoft.com/en-us/cpp/build/reference/compiler-command-line-syntax)
+accepts `-` instead of `/`.
+It's not necessary to treat preprocessor defines specially in Meson ([GH-6269](https://github.com/mesonbuild/meson/issues/6269#issuecomment-560003922)).

docs/markdown/Python-module.md

@@ -12,6 +12,15 @@ authors:
 This module provides support for finding and building extensions against
 python installations, be they python 2 or 3.
 
+If you want to build and package Python extension modules using tools
+compatible with [PEP-517](https://peps.python.org/pep-0517/), check out
+[meson-python](https://mesonbuild.com/meson-python/index.html).
+
+If you are building Python extension modules against a Python interpreter
+located in a venv or Conda environment, you probably want to set
+`python.install_venv=auto`;
+see [Python module options](Builtin-options.md#python-module) for details.
+
 *Added 0.46.0*
 
 ## Functions

docs/markdown/Release-notes-for-1.5.0.md

@@ -0,0 +1,214 @@
+---
+title: Release 1.5.0
+short-description: Release notes for 1.5.0
+...
+
+# New features
+
+Meson 1.5.0 was released on 10 July 2024
+## Support for `bztar` in `meson dist`
+
+The `bztar` format is now supported in `meson dist`. This format is also known
+as `bzip2`.
+
+## Cargo dependencies names now include the API version
+
+Cargo dependencies names are now in the format `<package_name>-<version>-rs`:
+- `package_name` is defined in `[package] name = ...` section of the `Cargo.toml`.
+- `version` is the API version deduced from `[package] version = ...` as follow:
+  * `x.y.z` -> 'x'
+  * `0.x.y` -> '0.x'
+  * `0.0.x` -> '0'
+  It allows to make different dependencies for uncompatible versions of the same
+  crate.
+- `-rs` suffix is added to distinguish from regular system dependencies, for
+  example `gstreamer-1.0` is a system pkg-config dependency and `gstreamer-0.22-rs`
+  is a Cargo dependency.
+
+That means the `.wrap` file should have `dependency_names = foo-1-rs` in their
+`[provide]` section when `Cargo.toml` has package name `foo` and version `1.2`.
+
+This is a breaking change (Cargo subprojects are still experimental), previous
+versions were using `<package_name>-rs` format.
+
+## Added support `Cargo.lock` file
+
+When a (sub)project has a `Cargo.lock` file at its root, it is loaded to provide
+an automatic fallback for dependencies it defines, fetching code from
+https://crates.io or git. This is identical as providing `subprojects/*.wrap`,
+see [cargo wraps](Wrap-dependency-system-manual.md#cargo-wraps) dependency naming convention.
+
+## Meson now propagates its build type to CMake
+
+When the CMake build type variable, `CMAKE_BUILD_TYPE`, is not set via the
+`add_cmake_defines` method of the [`cmake options` object](CMake-module.md#cmake-options-object),
+it is inferred from the [Meson build type](Builtin-options.md#details-for-buildtype).
+Build types of the two build systems do not match perfectly. The mapping from
+Meson build type to CMake build type is as follows:
+
+- `debug` -> `Debug`
+- `debugoptimized` -> `RelWithDebInfo`
+- `release` -> `Release`
+- `minsize` -> `MinSizeRel`
+
+No CMake build type is set for the `plain` Meson build type. The inferred CMake
+build type overrides any `CMAKE_BUILD_TYPE` environment variable.
+
+## compiler.run() method is now available for all languages
+
+It used to be only implemented for C-like and D languages, but it is now available
+for all languages.
+
+## dependencies created by compiler.find_library implement the `name()` method
+
+Previously, for a [[@dep]] that might be returned by either [[dependency]] or
+[[compiler.find_library]], the method might or might not exist with no way
+of telling.
+
+## New version_argument kwarg for find_program
+
+When finding an external program with `find_program`, the `version_argument`
+can be used to override the default `--version` argument when trying to parse
+the version of the program.
+
+For example, if the following is used:
+```meson
+foo = find_program('foo', version_argument: '-version')
+```
+
+meson will internally run `foo -version` when trying to find the version of `foo`.
+
+## Meson configure handles changes to options in more cases
+
+Meson configure now correctly handles updates to the options file without a full
+reconfigure. This allows making a change to the `meson.options` or
+`meson_options.txt` file without a reconfigure.
+
+For example, this now works:
+```sh
+meson setup builddir
+git pull
+meson configure builddir -Doption-added-by-pull=value
+```
+
+## New meson format command
+
+This command is similar to `muon fmt` and allows to format a `meson.build`
+document.
+
+## Added support for GCC's `null_terminated_string_arg` function attribute
+
+You can now check if a compiler support the `null_terminated_string_arg`
+function attribute via the `has_function_attribute()` method on the
+[[@compiler]] object.
+
+```meson
+cc = meson.get_compiler('c')
+
+if cc.has_function_attribute('null_terminated_string_arg')
+  # We have it...
+endif
+```
+
+## A new dependency for ObjFW is now supported
+
+For example, you can create a simple application written using ObjFW like this:
+
+```meson
+project('SimpleApp', 'objc')
+
+objfw_dep = dependency('objfw', version: '>= 1.0')
+
+executable('SimpleApp', 'SimpleApp.m',
+  dependencies: [objfw_dep])
+```
+
+Modules are also supported. A test case using ObjFWTest can be created like
+this:
+
+```meson
+project('Tests', 'objc')
+
+objfwtest_dep = dependency('objfw', version: '>= 1.1', modules: ['ObjFWTest'])
+
+executable('Tests', ['FooTest.m', 'BarTest.m'],
+  dependencies: [objfwtest_dep])
+```
+
+## Support of indexed `@PLAINNAME@` and `@BASENAME@`
+
+In `custom_target()` and `configure_file()` with multiple inputs,
+it is now possible to specify index for `@PLAINNAME@` and `@BASENAME@`
+macros in `output`:
+```
+custom_target('target_name',
+  output: '@[email protected]',
+  input: [dep1, dep2],
+  command: cmd)
+```
+
+## Required kwarg on more `compiler` methods
+
+The following `compiler` methods now support the `required` keyword argument:
+
+- `compiler.compiles()`
+- `compiler.links()`
+- `compiler.runs()`
+
+```meson
+cc.compiles(valid, name: 'valid', required : true)
+cc.links(valid, name: 'valid', required : true)
+cc.run(valid, name: 'valid', required : true)
+
+assert(not cc.compiles(valid, name: 'valid', required : opt))
+assert(not cc.links(valid, name: 'valid', required : opt))
+res = cc.run(valid, name: 'valid', required : opt)
+assert(res.compiled())
+assert(res.returncode() == 0)
+assert(res.stdout() == '')
+assert(res.stderr() == '')
+```
+
+## The Meson test program supports a new "--interactive" argument
+
+`meson test --interactive` invokes tests with stdout, stdin and stderr
+connected directly to the calling terminal. This can be useful when running
+integration tests that run in containers or virtual machines which can spawn a
+debug shell if a test fails.
+
+## meson test now sets the `MESON_TEST_ITERATION` environment variable
+
+`meson test` will now set the `MESON_TEST_ITERATION` environment variable to the
+current iteration of the test. This will always be `1` unless `--repeat` is used
+to run the same test multiple times.
+
+## The Meson test program supports a new "--max-lines" argument
+
+By default `meson test` only shows the last 100 lines of test output from tests
+that produce large amounts of output. This default can now be changed with the
+new `--max-lines` option. For example, `--max-lines=1000` will increase the
+maximum number of log output lines from 100 to 1000.
+
+## Basic support for TI Arm Clang (tiarmclang)
+
+Support for TI's newer [Clang-based ARM toolchain](https://www.ti.com/tool/ARM-CGT).
+
+## Support for Texas Instruments C6000 C/C++ compiler
+
+Meson now supports the TI C6000 C/C++ compiler use for the C6000 cpu family.
+The example cross file is available in `cross/ti-c6000.txt`.
+
+## Wayland stable protocols can be versioned
+
+The wayland module now accepts a version number for stable protocols.
+
+```meson
+wl_mod = import('unstable-wayland')
+
+wl_mod.find_protocol(
+  'linux-dmabuf',
+  state: 'stable'
+  version: 1
+)
+```
+