numpy · rgommers · Oct 26, 2023 · Jul 18, 2023 · May 8, 2023 · Jul 18, 2023
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
@@ -51,9 +51,6 @@ jobs:
             TOOLCHAIN: clang
     env:
       MESON_CI_JOBNAME: msys2-${{ matrix.NAME }}
-      # XXX: For some reason enabling jit debugging "fixes" random python crashes
-      # see https://github.com/msys2/MINGW-packages/issues/11864
-      MSYS: "winjitdebug"
 
     defaults:
       run:

diff --git a/README.md b/README.md
@@ -15,6 +15,11 @@ build system.
  - [Python](https://python.org) (version 3.7 or newer)
  - [Ninja](https://ninja-build.org) (version 1.8.2 or newer)
 
+Latest Meson version supporting previous Python versions:
+- Python 3.6: **0.61.5**
+- Python 3.5: **0.56.2**
+- Python 3.4: **0.45.1**
+
 #### Installing from source
 
 Meson is available on [PyPi](https://pypi.python.org/pypi/meson), so

diff --git a/ci/ciimage/build.py b/ci/ciimage/build.py
@@ -137,13 +137,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:
@@ -175,7 +176,7 @@ def do_test(self, tty: bool = False) -> None:
             else:
                 test_cmd = [
                     self.docker, 'run', '--rm', '-t', 'meson_test_image',
-                    '/bin/bash', '-c', 'source /ci/env_vars.sh; cd meson; ./run_tests.py $CI_ARGS'
+                    '/bin/bash', '-xc', 'source /ci/env_vars.sh; cd meson; ./run_tests.py $CI_ARGS'
                 ]
 
             if subprocess.run(test_cmd).returncode != 0 and not tty:

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/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-15-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/cross/armclang-linux.txt b/cross/armclang-linux.txt
@@ -22,7 +22,7 @@ c = ['/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang', '--tar
 #cpp = '/usr/bin/arm-linux-gnueabihf-g++'
 ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar'
 #strip = '/usr/arm-linux-gnueabihf/bin/strip'
-#pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+#pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
 
 [host_machine]
 system = 'baremetal'

diff --git a/cross/linux-mingw-w64-32bit.txt b/cross/linux-mingw-w64-32bit.txt
@@ -4,7 +4,7 @@ cpp = '/usr/bin/i686-w64-mingw32-g++'
 objc = '/usr/bin/i686-w64-mingw32-gcc'
 ar = '/usr/bin/i686-w64-mingw32-ar'
 strip = '/usr/bin/i686-w64-mingw32-strip'
-pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
+pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
 windres = '/usr/bin/i686-w64-mingw32-windres'
 exe_wrapper = 'wine'
 ld = '/usr/bin/i686-w64-mingw32-ld'

diff --git a/cross/linux-mingw-w64-64bit.txt b/cross/linux-mingw-w64-64bit.txt
@@ -4,9 +4,9 @@ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
 objc = '/usr/bin/x86_64-w64-mingw32-gcc'
 ar = '/usr/bin/x86_64-w64-mingw32-ar'
 strip = '/usr/bin/x86_64-w64-mingw32-strip'
-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
 windres = '/usr/bin/x86_64-w64-mingw32-windres'
-exe_wrapper = 'wine64'
+exe_wrapper = 'wine'
 cmake = '/usr/bin/cmake'
 
 [properties]

diff --git a/cross/none.txt b/cross/none.txt
@@ -15,5 +15,5 @@ fc = ['false']
 objc = ['false']
 objcpp = ['false']
 ar = ['false']
-pkgconfig = ['false']
+pkg-config = ['false']
 cmake = ['false']
diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt
@@ -6,7 +6,7 @@ cpp = ['/usr/bin/arm-linux-gnueabihf-g++']
 rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
 ar = '/usr/arm-linux-gnueabihf/bin/ar'
 strip = '/usr/arm-linux-gnueabihf/bin/strip'
-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
 ld = '/usr/bin/arm-linux/gnueabihf-ld'
 
 [built-in options]

diff --git a/data/test.schema.json b/data/test.schema.json
@@ -26,6 +26,7 @@
               "exe",
               "shared_lib",
               "python_lib",
+              "python_bytecode",
               "pdb",
               "implib",
               "py_implib",

diff --git a/docs/markdown/Machine-files.md b/docs/markdown/Machine-files.md
@@ -90,7 +90,7 @@ arch = 'aarch64-linux-gnu'
 c = arch + '-gcc'
 cpp = arch + '-g++'
 strip = arch + '-strip'
-pkgconfig = arch + '-pkg-config'
+pkg-config = arch + '-pkg-config'
 ...
 ```
 
@@ -165,7 +165,7 @@ c_ld = 'gold'
 cpp_ld = 'gold'
 ar = '/usr/i586-mingw32msvc/bin/ar'
 strip = '/usr/i586-mingw32msvc/bin/strip'
-pkgconfig = '/usr/bin/i586-mingw32msvc-pkg-config'
+pkg-config = '/usr/bin/i586-mingw32msvc-pkg-config'
 ```
 
 An incomplete list of internally used programs that can be overridden
@@ -179,7 +179,7 @@ here is:
 - libwmf-config
 - llvm-config
 - pcap-config
-- pkgconfig
+- pkg-config
 - sdl2-config
 - wx-config (or wx-3.0-config or wx-config-gtk)
 

diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md
@@ -127,11 +127,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.
 

diff --git a/man/meson.1 b/man/meson.1
@@ -1,4 +1,4 @@
-.TH MESON "1" "July 2023" "meson 1.2.0" "User Commands"
+.TH MESON "1" "October 2023" "meson 1.2.3" "User Commands"
 .SH NAME
 meson - a high productivity build system
 .SH DESCRIPTION

diff --git a/mesonbuild/ast/interpreter.py b/mesonbuild/ast/interpreter.py
@@ -29,6 +29,7 @@
     InvalidArguments,
     BreakRequest,
     ContinueRequest,
+    Disabler,
     default_resolve_key,
 )
 
@@ -53,6 +54,7 @@
     NotNode,
     PlusAssignmentNode,
     TernaryNode,
+    TestCaseClauseNode,
 )
 
 if T.TYPE_CHECKING:
@@ -445,3 +447,6 @@ def flatten_kwargs(self, kwargs: T.Dict[str, TYPE_nvar], include_unknown_args: b
             elif isinstance(val, (str, bool, int, float)) or include_unknown_args:
                 flattened_kwargs[key] = val
         return flattened_kwargs
+
+    def evaluate_testcase(self, node: TestCaseClauseNode) -> Disabler | None:
+        return Disabler(subproject=self.subproject)
diff --git a/mesonbuild/ast/introspection.py b/mesonbuild/ast/introspection.py
@@ -362,3 +362,22 @@ def analyze(self) -> None:
         self.sanity_check_ast()
         self.parse_project()
         self.run()
+
+    def extract_subproject_dir(self) -> T.Optional[str]:
+        '''Fast path to extract subproject_dir kwarg.
+           This is faster than self.parse_project() which also initialize options
+           and also calls parse_project() on every subproject.
+        '''
+        if not self.ast.lines:
+            return
+        project = self.ast.lines[0]
+        # first line is always project()
+        if not isinstance(project, FunctionNode):
+            return
+        for kw, val in project.args.kwargs.items():
+            assert isinstance(kw, IdNode), 'for mypy'
+            if kw.value == 'subproject_dir':
+                # mypy does not understand "and isinstance"
+                if isinstance(val, StringNode):
+                    return val.value
+        return None
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
@@ -237,8 +237,10 @@ def _quoter(x, qf = quote_func):
         return ninja_quote(qf(str(x)))
 
     def write(self, outfile: T.TextIO) -> None:
+        rspfile_args = self.args
         if self.rspfile_quote_style is RSPFileSyntax.MSVC:
             rspfile_quote_func = cmd_quote
+            rspfile_args = [NinjaCommandArg('$in_newline', arg.quoting) if arg.s == '$in' else arg for arg in rspfile_args]
         else:
             rspfile_quote_func = gcc_rsp_quote
 
@@ -253,7 +255,7 @@ def rule_iter():
             if rsp == '_RSP':
                 outfile.write(' command = {} @$out.rsp\n'.format(' '.join([self._quoter(x) for x in self.command])))
                 outfile.write(' rspfile = $out.rsp\n')
-                outfile.write(' rspfile_content = {}\n'.format(' '.join([self._quoter(x, rspfile_quote_func) for x in self.args])))
+                outfile.write(' rspfile_content = {}\n'.format(' '.join([self._quoter(x, rspfile_quote_func) for x in rspfile_args])))
             else:
                 outfile.write(' command = {}\n'.format(' '.join([self._quoter(x) for x in self.command + self.args])))
             if self.deps:
@@ -636,7 +638,7 @@ def generate(self, capture: bool = False, vslite_ctx: dict = None) -> T.Optional
             key = OptionKey('b_coverage')
             if (key in self.environment.coredata.options and
                     self.environment.coredata.options[key].value):
-                gcovr_exe, gcovr_version, lcov_exe, genhtml_exe, _ = environment.find_coverage_tools()
+                gcovr_exe, gcovr_version, lcov_exe, lcov_version, genhtml_exe, _ = environment.find_coverage_tools()
                 if gcovr_exe or (lcov_exe and genhtml_exe):
                     self.add_build_comment(NinjaComment('Coverage rules'))
                     self.generate_coverage_rules(gcovr_exe, gcovr_version)
@@ -658,9 +660,9 @@ def generate(self, capture: bool = False, vslite_ctx: dict = None) -> T.Optional
         os.replace(tempfilename, outfilename)
         mlog.cmd_ci_include(outfilename)  # For CI debugging
         # Refresh Ninja's caches. https://github.com/ninja-build/ninja/pull/1685
-        if mesonlib.version_compare(self.ninja_version, '>=1.10.0') and os.path.exists('.ninja_deps'):
-            subprocess.call(self.ninja_command + ['-t', 'restat'])
-            subprocess.call(self.ninja_command + ['-t', 'cleandead'])
+        if mesonlib.version_compare(self.ninja_version, '>=1.10.0') and os.path.exists(os.path.join(self.environment.build_dir, '.ninja_log')):
+            subprocess.call(self.ninja_command + ['-t', 'restat'], cwd=self.environment.build_dir)
+            subprocess.call(self.ninja_command + ['-t', 'cleandead'], cwd=self.environment.build_dir)
         self.generate_compdb()
         self.generate_rust_project_json()
 
@@ -1687,8 +1689,6 @@ def generate_vala_compile(self, target: build.BuildTarget) -> \
             # Without this, it will write it inside c_out_dir
             args += ['--vapi', os.path.join('..', target.vala_vapi)]
             valac_outputs.append(vapiname)
-            target.outputs += [target.vala_header, target.vala_vapi]
-            target.install_tag += ['devel', 'devel']
             # Install header and vapi to default locations if user requests this
             if len(target.install_dir) > 1 and target.install_dir[1] is True:
                 target.install_dir[1] = self.environment.get_includedir()
@@ -1699,8 +1699,6 @@ def generate_vala_compile(self, target: build.BuildTarget) -> \
                 girname = os.path.join(self.get_target_dir(target), target.vala_gir)
                 args += ['--gir', os.path.join('..', target.vala_gir)]
                 valac_outputs.append(girname)
-                target.outputs.append(target.vala_gir)
-                target.install_tag.append('devel')
                 # Install GIR to default location if requested by user
                 if len(target.install_dir) > 3 and target.install_dir[3] is True:
                     target.install_dir[3] = os.path.join(self.environment.get_datadir(), 'gir-1.0')
@@ -2097,13 +2095,14 @@ def generate_rust_target(self, target: build.BuildTarget) -> None:
                 if a in rustc.native_static_libs:
                     # Exclude link args that rustc already add by default
                     continue
-                if a.endswith(('.dll', '.so', '.dylib')):
+                if a.endswith(('.dll', '.so', '.dylib', '.a', '.lib')):
                     dir_, lib = os.path.split(a)
                     linkdirs.add(dir_)
                     lib, ext = os.path.splitext(lib)
                     if lib.startswith('lib'):
                         lib = lib[3:]
-                    args.extend(['-l', f'dylib={lib}'])
+                    _type = 'static' if a.endswith(('.a', '.lib')) else 'dylib'
+                    args.extend(['-l', f'{_type}={lib}'])
                 elif a.startswith('-L'):
                     args.append(a)
                 elif a.startswith('-l'):
@@ -2343,7 +2342,7 @@ def generate_static_link_rules(self):
             if static_linker is None:
                 continue
             rule = 'STATIC_LINKER{}'.format(self.get_rule_suffix(for_machine))
-            cmdlist = []
+            cmdlist: T.List[T.Union[str, NinjaCommandArg]] = []
             args = ['$in']
             # FIXME: Must normalize file names with pathlib.Path before writing
             #        them out to fix this properly on Windows. See:
@@ -2357,6 +2356,22 @@ def generate_static_link_rules(self):
             cmdlist += static_linker.get_exelist()
             cmdlist += ['$LINK_ARGS']
             cmdlist += NinjaCommandArg.list(static_linker.get_output_args('$out'), Quoting.none)
+            # The default ar on MacOS (at least through version 12), does not
+            # add extern'd variables to the symbol table by default, and
+            # requires that apple's ranlib be called with a special flag
+            # instead after linking
+            if static_linker.id == 'applear':
+                # This is a bit of a hack, but we assume that that we won't need
+                # an rspfile on MacOS, otherwise the arguments are passed to
+                # ranlib, not to ar
+                cmdlist.extend(args)
+                args = []
+                # Ensure that we use the user-specified ranlib if any, and
+                # fallback to just picking up some ranlib otherwise
+                ranlib = self.environment.lookup_binary_entry(for_machine, 'ranlib')
+                if ranlib is None:
+                    ranlib = ['ranlib']
+                cmdlist.extend(['&&'] + ranlib + ['-c', '$out'])
             description = 'Linking static target $out'
             if num_pools > 0:
                 pool = 'pool = link_pool'