diff options
| author | Sam James <sam@gentoo.org> | 2025-11-24 18:56:54 +0000 |
|---|---|---|
| committer | Jussi Pakkanen <jussi.pakkanen@mailbox.org> | 2025-12-01 16:55:18 +0200 |
| commit | 3ca4a378e686efc8c67d8b64746bd6101d0b0b70 (patch) | |
| tree | f655f274fddcc423e9b8007db0cc066ac084d261 | |
| parent | aed2444f75d2089872d37ad8c608321e39b2aa78 (diff) | |
| download | meson-3ca4a378e686efc8c67d8b64746bd6101d0b0b70.tar.gz | |
templates: simplify (whitespace, flatten array)
| -rw-r--r-- | mesonbuild/templates/cpptemplates.py | 5 | ||||
| -rw-r--r-- | mesonbuild/templates/cstemplates.py | 6 | ||||
| -rw-r--r-- | mesonbuild/templates/ctemplates.py | 4 | ||||
| -rw-r--r-- | mesonbuild/templates/cudatemplates.py | 6 | ||||
| -rw-r--r-- | mesonbuild/templates/dlangtemplates.py | 6 | ||||
| -rw-r--r-- | mesonbuild/templates/fortrantemplates.py | 6 | ||||
| -rw-r--r-- | mesonbuild/templates/javatemplates.py | 6 | ||||
| -rw-r--r-- | mesonbuild/templates/objcpptemplates.py | 6 | ||||
| -rw-r--r-- | mesonbuild/templates/objctemplates.py | 6 | ||||
| -rw-r--r-- | mesonbuild/templates/rusttemplates.py | 6 | ||||
| -rw-r--r-- | mesonbuild/templates/valatemplates.py | 5 |
11 files changed, 22 insertions, 40 deletions
diff --git a/mesonbuild/templates/cpptemplates.py b/mesonbuild/templates/cpptemplates.py index 77e61e417..79f88a5de 100644 --- a/mesonbuild/templates/cpptemplates.py +++ b/mesonbuild/templates/cpptemplates.py @@ -40,7 +40,7 @@ sources = [{source_files} exe = executable( '{exe_name}', - [sources], + sources, install : true, dependencies : dependencies, ) @@ -131,12 +131,11 @@ dependencies = [{dependencies} lib_args = ['-DBUILDING_{utoken}'] sources = [{source_files} - ] lib = library( '{lib_name}', - [sources], + sources, install : true, cpp_shared_args : lib_args, gnu_symbol_visibility : 'hidden', diff --git a/mesonbuild/templates/cstemplates.py b/mesonbuild/templates/cstemplates.py index 297d9b1d4..e44cf6f64 100644 --- a/mesonbuild/templates/cstemplates.py +++ b/mesonbuild/templates/cstemplates.py @@ -36,12 +36,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] exe = executable( '{exe_name}', - [sources], + sources, install : true, dependencies : dependencies, ) @@ -88,12 +87,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] stlib = shared_library( '{lib_name}', - [sources], + sources, dependencies : dependencies, install : true, ) diff --git a/mesonbuild/templates/ctemplates.py b/mesonbuild/templates/ctemplates.py index 134e43b3f..3db6477aa 100644 --- a/mesonbuild/templates/ctemplates.py +++ b/mesonbuild/templates/ctemplates.py @@ -82,7 +82,7 @@ sources = [{source_files} lib = library( '{lib_name}', - [sources], + sources, install : true, c_shared_args : lib_args, gnu_symbol_visibility : 'hidden', @@ -147,7 +147,7 @@ sources = [{source_files} exe = executable( '{exe_name}', - [sources], + sources, dependencies : dependencies, install : true, ) diff --git a/mesonbuild/templates/cudatemplates.py b/mesonbuild/templates/cudatemplates.py index 45cd155f9..d10fb7619 100644 --- a/mesonbuild/templates/cudatemplates.py +++ b/mesonbuild/templates/cudatemplates.py @@ -37,12 +37,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] exe = executable( '{exe_name}', - [sources], + sources, dependencies : dependencies, install : true, ) @@ -127,12 +126,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] lib = library( '{lib_name}', - [sources], + sources, install : true, cpp_shared_args : lib_args, gnu_symbol_visibility : 'hidden', diff --git a/mesonbuild/templates/dlangtemplates.py b/mesonbuild/templates/dlangtemplates.py index 4ca91a69b..727ee209c 100644 --- a/mesonbuild/templates/dlangtemplates.py +++ b/mesonbuild/templates/dlangtemplates.py @@ -36,12 +36,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] exe = executable( '{exe_name}', - [sources], + sources, dependencies : dependencies, install : true, ) @@ -89,12 +88,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] stlib = static_library( '{lib_name}', - [sources], + sources, install : true, gnu_symbol_visibility : 'hidden', dependencies : dependencies, diff --git a/mesonbuild/templates/fortrantemplates.py b/mesonbuild/templates/fortrantemplates.py index 7d97c58f6..03f0ff922 100644 --- a/mesonbuild/templates/fortrantemplates.py +++ b/mesonbuild/templates/fortrantemplates.py @@ -57,12 +57,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] lib = library( '{lib_name}', - [sources], + sources, install : true, fortran_shared_args : lib_args, gnu_symbol_visibility : 'hidden', @@ -115,12 +114,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] exe = executable( '{exe_name}', - [sources], + sources, dependencies : dependencies, install : true, ) diff --git a/mesonbuild/templates/javatemplates.py b/mesonbuild/templates/javatemplates.py index 458142e6b..ed32194fe 100644 --- a/mesonbuild/templates/javatemplates.py +++ b/mesonbuild/templates/javatemplates.py @@ -36,12 +36,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] exe = jar( '{exe_name}', - [sources], + sources, main_class : '{exe_name}', dependencies : dependencies, install : true, @@ -91,12 +90,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] jarlib = jar( '{class_name}', - [sources], + sources, dependencies : dependencies, main_class : '{class_name}', install : true, diff --git a/mesonbuild/templates/objcpptemplates.py b/mesonbuild/templates/objcpptemplates.py index c6eddd646..d80c37485 100644 --- a/mesonbuild/templates/objcpptemplates.py +++ b/mesonbuild/templates/objcpptemplates.py @@ -74,7 +74,6 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] # These arguments are only used to build the shared library @@ -83,7 +82,7 @@ lib_args = ['-DBUILDING_{utoken}'] lib = library( '{lib_name}', - [sources], + sources, install : true, objcpp_shared_args : lib_args, dependencies : dependencies, @@ -144,12 +143,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] exe = executable( '{exe_name}', - [sources], + sources, dependencies : dependencies, install : true, ) diff --git a/mesonbuild/templates/objctemplates.py b/mesonbuild/templates/objctemplates.py index 8b73b365f..7dc3d4f98 100644 --- a/mesonbuild/templates/objctemplates.py +++ b/mesonbuild/templates/objctemplates.py @@ -74,7 +74,6 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] # These arguments are only used to build the shared library @@ -83,7 +82,7 @@ lib_args = ['-DBUILDING_{utoken}'] lib = library( '{lib_name}', - [sources], + sources, install : true, objc_shared_args : lib_args, dependencies : dependencies, @@ -143,12 +142,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] exe = executable( '{exe_name}', - [sources], + sources, dependencies : dependencies, install : true, ) diff --git a/mesonbuild/templates/rusttemplates.py b/mesonbuild/templates/rusttemplates.py index 4c10cdd99..b415be7c6 100644 --- a/mesonbuild/templates/rusttemplates.py +++ b/mesonbuild/templates/rusttemplates.py @@ -51,12 +51,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] lib = static_library( '{lib_name}', - [sources], + sources, dependencies : dependencies, install : true, ) @@ -91,12 +90,11 @@ dependencies = [{dependencies} ] sources = [{source_files} - ] exe = executable( '{exe_name}', - [sources], + sources, dependencies : dependencies, install : true, ) diff --git a/mesonbuild/templates/valatemplates.py b/mesonbuild/templates/valatemplates.py index 4e867d49a..de3187767 100644 --- a/mesonbuild/templates/valatemplates.py +++ b/mesonbuild/templates/valatemplates.py @@ -29,7 +29,7 @@ sources = [{source_files} exe = executable( '{exe_name}', - [sources], + sources, dependencies : dependencies, install : true, ) @@ -71,14 +71,13 @@ 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', - [sources], + sources, dependencies : dependencies, install : true, install_dir : [true, true, true], |
