Merge branch 'master' into pm-TI-C6000-compiler-support

mesonbuild · Dec 7, 2023 · 23b8d3c · 23b8d3c
2 parents 9869131 + 5de09cb
commit 23b8d3c
Show file tree

Hide file tree

Showing 577 changed files with 4,965 additions and 2,582 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -46,7 +46,7 @@ jobs:
     - uses: actions/setup-python@v4
       with:
         python-version: '3.x'
-    - run: python -m pip install mypy types-PyYAML
+    - run: python -m pip install mypy coverage strictyaml types-PyYAML types-tqdm types-chevron
     - run: python run_mypy.py --allver
       env:
         PYTHONUNBUFFERED: 1

diff --git a/.mypy.ini b/.mypy.ini
@@ -2,7 +2,7 @@
 strict_optional               = False
 show_error_context            = False
 show_column_numbers           = True
-ignore_missing_imports        = True
+ignore_missing_imports        = False
 implicit_reexport             = False
 
 follow_imports                = silent

diff --git a/ci/ciimage/build.py b/ci/ciimage/build.py
@@ -143,13 +143,14 @@ def copy_meson(self) -> None:
         shutil.copytree(
             self.meson_root,
             self.temp_dir / 'meson',
+            symlinks=True,
             ignore=shutil.ignore_patterns(
                 '.git',
                 '*_cache',
                 '__pycache__',
                 # 'work area',
                 self.temp_dir.name,
-            )
+            ),
         )
 
     def do_test(self, tty: bool = False) -> None:

diff --git a/ci/ciimage/common.sh b/ci/ciimage/common.sh
@@ -39,11 +39,11 @@ dub_fetch() {
 }
 
 install_minimal_python_packages() {
-  rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED
+  rm -f /usr/lib*/python3.*/EXTERNALLY-MANAGED
   python3 -m pip install "${base_python_pkgs[@]}" $*
 }
 
 install_python_packages() {
-  rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED
+  rm -f /usr/lib*/python3.*/EXTERNALLY-MANAGED
   python3 -m pip install "${base_python_pkgs[@]}" "${python_pkgs[@]}" $*
 }
diff --git a/ci/ciimage/fedora/install.sh b/ci/ciimage/fedora/install.sh
@@ -8,7 +8,7 @@ pkgs=(
   python python-pip python3-devel
   ninja-build make git autoconf automake patch
   elfutils gcc gcc-c++ gcc-fortran gcc-objc gcc-objc++ vala rust bison flex ldc libasan libasan-static
-  mono-core boost-devel gtkmm30 gtest-devel gmock-devel protobuf-devel wxGTK3-devel gobject-introspection
+  mono-core boost-devel gtkmm30 gtest-devel gmock-devel protobuf-devel wxGTK-devel gobject-introspection
   boost-python3-devel
   itstool gtk3-devel java-latest-openjdk-devel gtk-doc llvm-devel clang-devel SDL2-devel graphviz-devel zlib zlib-devel zlib-static
   #hdf5-openmpi-devel hdf5-devel netcdf-openmpi-devel netcdf-devel netcdf-fortran-openmpi-devel netcdf-fortran-devel scalapack-openmpi-devel

diff --git a/ci/ciimage/opensuse/install.sh b/ci/ciimage/opensuse/install.sh
@@ -9,7 +9,7 @@ pkgs=(
   ninja make git autoconf automake patch libjpeg-devel
   elfutils gcc gcc-c++ gcc-fortran gcc-objc gcc-obj-c++ vala rust bison flex curl lcov
   mono-core gtkmm3-devel gtest gmock protobuf-devel wxGTK3-3_2-devel gobject-introspection-devel
-  itstool gtk3-devel java-20-openjdk-devel gtk-doc llvm-devel clang-devel libSDL2-devel graphviz-devel zlib-devel zlib-devel-static
+  itstool gtk3-devel java-17-openjdk-devel gtk-doc llvm-devel clang-devel libSDL2-devel graphviz-devel zlib-devel zlib-devel-static
   #hdf5-devel netcdf-devel libscalapack2-openmpi3-devel libscalapack2-gnu-openmpi3-hpc-devel openmpi3-devel
   doxygen vulkan-devel vulkan-validationlayers openssh mercurial gtk-sharp3-complete gtk-sharp2-complete libpcap-devel libgpgme-devel
   libqt5-qtbase-devel libqt5-qttools-devel libqt5-linguist libqt5-qtbase-private-headers-devel

diff --git a/ci/ciimage/ubuntu-rolling/install.sh b/ci/ciimage/ubuntu-rolling/install.sh
@@ -56,6 +56,7 @@ apt-get -y remove rustc || true
 wget -O - https://sh.rustup.rs | sh -s -- -y --profile minimal --component clippy
 source "$HOME/.cargo/env"
 rustup target add x86_64-pc-windows-gnu
+rustup target add arm-unknown-linux-gnueabihf
 
 # cleanup
 apt-get -y clean

diff --git a/cross/metrowerks-arm.txt b/cross/metrowerks-arm.txt
@@ -2,12 +2,6 @@
 # toolchain is added to the environment(PATH) variable, so that
 # Meson can find the binaries while building.
 
-# You should also do one of the following to ensure Meson can
-# locate the .lcf linker script:
-# - Add the cross directory to PATH as well
-# - Edit c_link_args and cpp_link_args with the full
-#   path to the .lcf file on your machine
-
 [binaries]
 c = 'mwccarm'
 c_ld = 'mwldarm'
@@ -18,11 +12,12 @@ as = 'mwasmarm'
 
 [built-in options]
 c_args = ['-lang', 'c99', '-D_NITRO', '-nosyspath']
-c_link_args = 'metrowerks.lcf'
+c_link_args = '@DIRNAME@' / 'metrowerks.lcf'
 cpp_args = ['-lang', 'c++', '-D_NITRO', '-nosyspath']
-cpp_link_args = 'metrowerks.lcf'
+cpp_link_args = '@DIRNAME@' / 'metrowerks.lcf'
 
 [host_machine]
 system = 'bare metal'
+cpu = 'arm'
 cpu_family = 'arm'
-endian = 'little'
+endian = 'little'
diff --git a/cross/metrowerks-eppc.txt b/cross/metrowerks-eppc.txt
@@ -2,12 +2,6 @@
 # of choice is added to the environment(PATH) variable, so that
 # Meson can find the binaries while building.
 
-# You should also do one of the following to ensure Meson can
-# locate the .lcf linker script:
-# - Add the cross directory to PATH as well
-# - Edit c_link_args and cpp_link_args with the full
-#   path to the lcf file on your machine
-
 [binaries]
 c = 'mwcceppc'
 c_ld = 'mwldeppc'
@@ -18,11 +12,12 @@ as = 'mwasmeppc'
 
 [built-in options]
 c_args = ['-lang', 'c99', '-nosyspath']
-c_link_args = 'metrowerks.lcf'
+c_link_args = '@DIRNAME@' / 'metrowerks.lcf'
 cpp_args = ['-lang', 'c++', '-nosyspath']
-cpp_link_args = 'metrowerks.lcf'
+cpp_link_args = '@DIRNAME@' / 'metrowerks.lcf'
 
 [host_machine]
 system = 'bare metal'
+cpu = 'ppc'
 cpu_family = 'ppc'
-endian = 'little'
+endian = 'little'
diff --git a/data/shell-completions/bash/meson b/data/shell-completions/bash/meson
@@ -168,60 +168,66 @@ _meson_compgen_options() {
   return 0
 }
 
+_meson_common_setup_configure_longopts=(
+  help
+  prefix
+  bindir
+  datadir
+  includedir
+  infodir
+  libdir
+  licensedir
+  libexecdir
+  localedir
+  localstatedir
+  mandir
+  sbindir
+  sharedstatedir
+  sysconfdir
+  auto-features
+  backend
+  genvslite
+  buildtype
+  debug
+  default-library
+  errorlogs
+  install-umask
+  layout
+  optimization
+  prefer-static
+  stdsplit
+  strip
+  unity
+  unity-size
+  warnlevel
+  werror
+  wrap-mode
+  force-fallback-for
+  vsenv
+  pkgconfig.relocatable
+  python.bytecompile
+  python.install-env
+  python.platlibdir
+  python.purelibdir
+  python.allow-limited-api
+  pkg-config-path
+  build.pkg-config-path
+  cmake-prefix-path
+  build.cmake-prefix-path
+  clearcache
+)
+
 _meson-setup() {
   shortopts=(
     h
     D
     v
   )
 
-  # backend-startup-project is currently VS backend only.
-
   longopts=(
-    help
-    prefix
-    bindir
-    datadir
-    includedir
-    infodir
-    libdir
-    libexecdir
-    licensedir
-    localedir
-    localstatedir
-    mandir
-    sbindir
-    sharedstatedir
-    sysconfdir
-    auto-features
-    backend
-    buildtype
-    debug
-    default-library
-    errorlogs
-    install-umask
-    layout
-    optimization
-    prefer-static
-    stdsplit
-    strip
-    unity
-    unity-size
-    warnlevel
-    werror
-    wrap-mode
-    force-fallback-for
-    pkgconfig.relocatable
-    python.install-env
-    python.platlibdir
-    python.purelibdir
-    pkg-config-path
-    build.pkg-config-path
-    cmake-prefix-path
-    build.cmake-prefix-path
+    ${_meson_common_setup_configure_longopts[@]}
     native-file
     cross-file
-    vsenv
     version
     fatal-meson-warnings
     reconfigure
@@ -266,49 +272,7 @@ _meson-configure() {
   )
 
   longopts=(
-    help
-    prefix
-    bindir
-    datadir
-    includedir
-    infodir
-    libdir
-    libexecdir
-    licensedir
-    localedir
-    localstatedir
-    mandir
-    sbindir
-    sharedstatedir
-    sysconfdir
-    auto-features
-    backend
-    buildtype
-    debug
-    default-library
-    errorlogs
-    install-umask
-    layout
-    optimization
-    prefer-static
-    stdsplit
-    strip
-    unity
-    unity-size
-    warnlevel
-    werror
-    wrap-mode
-    force-fallback-for
-    backend-startup-project
-    pkgconfig.relocatable
-    python.install-env
-    python.platlibdir
-    python.purelibdir
-    pkg-config-path
-    build.pkg-config-path
-    cmake-prefix-path
-    build.cmake-prefix-path
-    clearcache
+    ${_meson_common_setup_configure_longopts[@]}
     no-pager
   )
 

diff --git a/data/test.schema.json b/data/test.schema.json
@@ -33,7 +33,8 @@
               "py_implib",
               "py_limited_implib",
               "implibempty",
-              "expr"
+              "expr",
+              "link"
             ]
           },
           "platform": {

diff --git a/docs/markdown/Commands.md b/docs/markdown/Commands.md
@@ -58,14 +58,17 @@ Builds a default or a specified target of a configured Meson project.
 
 *(since 0.55.0)*
 
-`TARGET` has the following syntax `[PATH/]NAME[:TYPE]`, where:
+`TARGET` has the following syntax `[PATH/]NAME.SUFFIX[:TYPE]`, where:
 - `NAME`: name of the target from `meson.build` (e.g. `foo` from `executable('foo', ...)`).
+- `SUFFIX`: name of the suffix of the target from `meson.build` (e.g. `exe` from `executable('foo', suffix: 'exe', ...)`).
 - `PATH`: path to the target relative to the root `meson.build` file. Note: relative path for a target specified in the root `meson.build` is `./`.
 - `TYPE`: type of the target. Can be one of the following: 'executable', 'static_library', 'shared_library', 'shared_module', 'custom', 'alias', 'run', 'jar'.
 
-`PATH` and/or `TYPE` can be omitted if the resulting `TARGET` can be
+`PATH`, `SUFFIX`, and `TYPE` can all be omitted if the resulting `TARGET` can be
 used to uniquely identify the target in `meson.build`.
 
+Note that `SUFFIX` did not exist prior to 1.3.0.
+
 #### Backend specific arguments
 
 *(since 0.55.0)*

diff --git a/docs/markdown/Quick-guide.md b/docs/markdown/Quick-guide.md
@@ -55,7 +55,7 @@ $ pip3 install --user meson
 ```
 Install as root:
 ```console
-$ pip3 install meson
+# pip3 install meson
 ```
 
 *If you are unsure whether to install as root or a local user, install

diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md
@@ -131,11 +131,13 @@ set in the cross file.
 | sh4                 | SuperH SH-4              |
 | sparc               | 32 bit SPARC             |
 | sparc64             | SPARC v9 processor       |
+| sw_64               | 64 bit sunway processor  |
 | wasm32              | 32 bit Webassembly       |
 | wasm64              | 64 bit Webassembly       |
 | x86                 | 32 bit x86 processor     |
 | x86_64              | 64 bit x86 processor     |
 
+
 Any cpu family not listed in the above list is not guaranteed to
 remain stable in future releases.
 
@@ -380,6 +382,26 @@ machine](#Environment-variables-per-machine) section for details.
 *The old environment variables are still supported, but are deprecated
 and will be removed in a future version of Meson.*
 
+*changed in 1.3.0* Paths with spaces were split unconditionally to extract
+components such as the [path to Ccache](Feature-autodetection.md#ccache),
+intrinsic compiler flags like `-m32` or `--target`, etc. This broke passing
+a hardcoded compiler path to CMake subprojects. To work around this, paths
+must be wrapped with double quotes:
+
+```bash
+export CC='"C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.34.31933/bin/Hostx64/x64/cl.exe"'
+```
+
+You can also set the values through [machine files](Machine-files.md#binaries).
+
+*New in 1.3.0* Paths that point to an existing executable no longer need
+wrapping:
+
+```bash
+export CC='C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.34.31933/bin/Hostx64/x64/cl.exe'
+```
+
+
 ## Environment variables per machine
 
 Since *0.54.0*, Following Autotool and other legacy build systems,