templates: fix remaining languages for source file discovery too

I missed this in 9104bb6 as we were only
testing whitelisted languages for source file discovery.

Tests now handle all of these by using the map we have in compilers, as
we need to know the suffix to use for the invalid source files we inject.

Note that for tests, we mix explicit --lang in some cases and not others,
which we could probably do better with. For these 'must fail' tests, I've
stuck with explicit `--lang` to make sure we're testing what we want,
but the others are perhaps up for debate.

Bug: #15286

Author: thesamesam

mesonbuild/templates/cstemplates.py

@@ -35,9 +35,13 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 exe = executable(
   '{exe_name}',
-  '{source_name}',
+  [sources],
   install : true,
   dependencies : dependencies,
 )
@@ -83,9 +87,13 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 stlib = shared_library(
   '{lib_name}',
-  '{source_file}',
+  [sources],
   dependencies : dependencies,
   install : true,
 )

mesonbuild/templates/cudatemplates.py

@@ -36,9 +36,13 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 exe = executable(
   '{exe_name}',
-  '{source_name}',
+  [sources],
   dependencies : dependencies,
   install : true,
 )
@@ -122,9 +126,13 @@ class {utoken}_PUBLIC {class_name} {{
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 lib = library(
   '{lib_name}',
-  '{source_file}',
+  [sources],
   install : true,
   cpp_shared_args : lib_args,
   gnu_symbol_visibility : 'hidden',

mesonbuild/templates/fortrantemplates.py

@@ -56,9 +56,13 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 lib = library(
   '{lib_name}',
-  '{source_file}',
+  [sources],
   install : true,
   fortran_shared_args : lib_args,
   gnu_symbol_visibility : 'hidden',
@@ -110,9 +114,13 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 exe = executable(
   '{exe_name}',
-  '{source_name}',
+  [sources],
   dependencies : dependencies,
   install : true,
 )

mesonbuild/templates/objcpptemplates.py

@@ -67,13 +67,17 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 # These arguments are only used to build the shared library
 # not the executables that use the library.
 lib_args = ['-DBUILDING_{utoken}']
 
 lib = library(
   '{lib_name}',
-  '{source_file}',
+  [sources],
   install : true,
   objcpp_shared_args : lib_args,
   dependencies : dependencies,
@@ -133,9 +137,13 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 exe = executable(
   '{exe_name}',
-  '{source_name}',
+  [sources],
   dependencies : dependencies,
   install : true,
 )

mesonbuild/templates/objctemplates.py

@@ -67,13 +67,17 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 # These arguments are only used to build the shared library
 # not the executables that use the library.
 lib_args = ['-DBUILDING_{utoken}']
 
 lib = library(
   '{lib_name}',
-  '{source_file}',
+  [sources],
   install : true,
   objc_shared_args : lib_args,
   dependencies : dependencies,
@@ -132,9 +136,13 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 exe = executable(
   '{exe_name}',
-  '{source_name}',
+  [sources],
   dependencies : dependencies,
   install : true,
 )

mesonbuild/templates/rusttemplates.py

@@ -50,9 +50,13 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 lib = static_library(
   '{lib_name}',
-  '{source_file}',
+  [sources],
   dependencies : dependencies,
   install : true,
 )
@@ -86,9 +90,13 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 exe = executable(
   '{exe_name}',
-  '{source_name}',
+  [sources],
   dependencies : dependencies,
   install : true,
 )

mesonbuild/templates/valatemplates.py

@@ -24,9 +24,12 @@
   dependency('gobject-2.0'),{dependencies}
 ]
 
+sources = [{source_files}
+]
+
 exe = executable(
   '{exe_name}',
-  '{source_name}',
+  [sources],
   dependencies : dependencies,
   install : true,
 )
@@ -67,11 +70,15 @@
   dependency('gobject-2.0'),{dependencies}
 ]
 
+sources = [{source_files}
+
+]
+
 # These arguments are only used to build the shared library
 # not the executables that use the library.
 lib = shared_library(
   'foo',
-  '{source_file}',
+  [sources],
   dependencies : dependencies,
   install : true,
   install_dir : [true, true, true],

unittests/allplatformstests.py

@@ -47,7 +47,7 @@
 from mesonbuild.compilers.cpp import VisualStudioCPPCompiler, ClangClCPPCompiler
 from mesonbuild.compilers import (
     detect_static_linker, detect_c_compiler, compiler_from_language,
-    detect_compiler_for
+    detect_compiler_for, lang_suffixes
 )
 from mesonbuild.linkers import linkers
 
@@ -2569,43 +2569,35 @@ def _template_test_dirty(lang, target_type):
                 self._run(ninja,
                             workdir=os.path.join(tmpdir, 'builddir'))
 
+            # Check for whether we're doing source collection by repeating
+            # with a bogus file we should pick up (and then fail to compile).
+            with tempfile.TemporaryDirectory() as tmpdir:
+                suffix = lang_suffixes[lang][0]
+                # Assume that this is a good enough string to error out
+                # in all languages.
+                with open(os.path.join(tmpdir, 'bar.' + suffix), 'w', encoding='utf-8') as f:
+                    f.write('error bar')
+                self._run(self.meson_command + ['init', '--language', lang, '--type', target_type],
+                        workdir=tmpdir)
+                self._run(self.setup_command + ['--backend=ninja', 'builddir'],
+                        workdir=tmpdir)
+                with self.assertRaises(subprocess.CalledProcessError):
+                    self._run(ninja,
+                            workdir=os.path.join(tmpdir, 'builddir'))
+
             # test directory with existing code file
             if lang in {'c', 'cpp', 'd'}:
                 with tempfile.TemporaryDirectory() as tmpdir:
                     with open(os.path.join(tmpdir, 'foo.' + lang), 'w', encoding='utf-8') as f:
                         f.write('int main(void) {}')
                     self._run(self.meson_command + ['init', '-b'], workdir=tmpdir)
 
-                # Check for whether we're doing source collection by repeating
-                # with a bogus file we should pick up (and then fail to compile).
-                with tempfile.TemporaryDirectory() as tmpdir:
-                    with open(os.path.join(tmpdir, 'bar.' + lang), 'w', encoding='utf-8') as f:
-                        f.write('#error bar')
-                    self._run(self.meson_command + ['init'], workdir=tmpdir)
-                    self._run(self.setup_command + ['--backend=ninja', 'builddir'],
-                            workdir=tmpdir)
-                    with self.assertRaises(subprocess.CalledProcessError):
-                        self._run(ninja,
-                                workdir=os.path.join(tmpdir, 'builddir'))
-
             elif lang in {'java'}:
                 with tempfile.TemporaryDirectory() as tmpdir:
                     with open(os.path.join(tmpdir, 'Foo.' + lang), 'w', encoding='utf-8') as f:
                         f.write('public class Foo { public static void main() {} }')
                     self._run(self.meson_command + ['init', '-b'], workdir=tmpdir)
 
-                # Check for whether we're doing source collection by repeating
-                # with a bogus file we should pick up (and then fail to compile).
-                with tempfile.TemporaryDirectory() as tmpdir:
-                    with open(os.path.join(tmpdir, 'Bar.' + lang), 'w', encoding='utf-8') as f:
-                        f.write('public class Bar { public private static void main() {} }')
-                    self._run(self.meson_command + ['init'], workdir=tmpdir)
-                    self._run(self.setup_command + ['--backend=ninja', 'builddir'],
-                            workdir=tmpdir)
-                    with self.assertRaises(subprocess.CalledProcessError):
-                        self._run(ninja,
-                                workdir=os.path.join(tmpdir, 'builddir'))
-
         for lang, target_type, fresh in itertools.product(langs, ('executable', 'library'), (True, False)):
             with self.subTest(f'Language: {lang}; type: {target_type}; fresh: {fresh}'):
                 _template_test_fresh(lang, target_type) if fresh else _template_test_dirty(lang, target_type)