templates: fix --executable, source discovery for more langs, test refactoring

mesonbuild/templates/cpptemplates.py

@@ -40,7 +40,7 @@
 
 exe = executable(
   '{exe_name}',
-  [sources],
+  sources,
   install : true,
   dependencies : dependencies,
 )
@@ -131,12 +131,11 @@ class {utoken}_PUBLIC {class_name} {{
 lib_args = ['-DBUILDING_{utoken}']
 
 sources = [{source_files}
-
 ]
 
 lib = library(
   '{lib_name}',
-  [sources],
+  sources,
   install : true,
   cpp_shared_args : lib_args,
   gnu_symbol_visibility : 'hidden',

mesonbuild/templates/cstemplates.py

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

mesonbuild/templates/ctemplates.py

@@ -82,7 +82,7 @@
 
 lib = library(
   '{lib_name}',
-  [sources],
+  sources,
   install : true,
   c_shared_args : lib_args,
   gnu_symbol_visibility : 'hidden',
@@ -147,7 +147,7 @@
 
 exe = executable(
   '{exe_name}',
-  [sources],
+  sources,
   dependencies : dependencies,
   install : true,
 )

mesonbuild/templates/cudatemplates.py

@@ -36,9 +36,12 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+]
+
 exe = executable(
   '{exe_name}',
-  '{source_name}',
+  sources,
   dependencies : dependencies,
   install : true,
 )
@@ -122,9 +125,12 @@ 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/dlangtemplates.py

@@ -36,12 +36,11 @@
 ]
 
 sources = [{source_files}
-
 ]
 
 exe = executable(
   '{exe_name}',
-  [sources],
+  sources,
   dependencies : dependencies,
   install : true,
 )
@@ -89,12 +88,11 @@
 ]
 
 sources = [{source_files}
-
 ]
 
 stlib = static_library(
   '{lib_name}',
-  [sources],
+  sources,
   install : true,
   gnu_symbol_visibility : 'hidden',
   dependencies : dependencies,

mesonbuild/templates/fortrantemplates.py

@@ -56,9 +56,12 @@
 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 +113,12 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+]
+
 exe = executable(
   '{exe_name}',
-  '{source_name}',
+  sources,
   dependencies : dependencies,
   install : true,
 )

mesonbuild/templates/javatemplates.py

@@ -36,12 +36,11 @@
 ]
 
 sources = [{source_files}
-
 ]
 
 exe = jar(
   '{exe_name}',
-  [sources],
+  sources,
   main_class : '{exe_name}',
   dependencies : dependencies,
   install : true,
@@ -91,12 +90,11 @@
 ]
 
 sources = [{source_files}
-
 ]
 
 jarlib = jar(
   '{class_name}',
-  [sources],
+  sources,
   dependencies : dependencies,
   main_class : '{class_name}',
   install : true,

mesonbuild/templates/objcpptemplates.py

@@ -73,13 +73,16 @@
 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,
@@ -139,9 +142,12 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+]
+
 exe = executable(
   '{exe_name}',
-  '{source_name}',
+  sources,
   dependencies : dependencies,
   install : true,
 )

mesonbuild/templates/objctemplates.py

@@ -73,13 +73,16 @@
 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,
@@ -138,9 +141,12 @@
 dependencies = [{dependencies}
 ]
 
+sources = [{source_files}
+]
+
 exe = executable(
   '{exe_name}',
-  '{source_name}',
+  sources,
   dependencies : dependencies,
   install : true,
 )

mesonbuild/templates/rusttemplates.py

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

mesonbuild/templates/sampleimpl.py

@@ -133,7 +133,7 @@ class FileImpl(SampleImpl):
 
     def __init__(self, args: Arguments):
         super().__init__(args)
-        self.sources = args.srcfiles if args.srcfiles else [Path(f'{self.executable_name}.{self.source_ext}')]
+        self.sources = args.srcfiles if args.srcfiles else [Path(f'{self.name}.{self.source_ext}')]
 
     def create_executable(self) -> None:
         source_name = f'{self.lowercase_token}.{self.source_ext}'

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,14 @@
   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],