diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-01-06 12:18:38 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-01-08 09:54:47 -0800 |
| commit | 68939da3bd33096f1f01e67ecd2f8ff1ee84a4d9 (patch) | |
| tree | 4c109e6e07804c577821efd0fbb39d6c6cb79fb2 | |
| parent | 5c209e196683289319535ada713759b6f4244ef6 (diff) | |
| download | meson-68939da3bd33096f1f01e67ecd2f8ff1ee84a4d9.tar.gz | |
templates: remove 'c' from vala projects
Meson has added 'c' automatically to vala projects since 0.59, since the
minimum version is now 1.0 this isn't needed
| -rw-r--r-- | mesonbuild/templates/mesontemplates.py | 3 | ||||
| -rw-r--r-- | mesonbuild/templates/valatemplates.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/templates/mesontemplates.py b/mesonbuild/templates/mesontemplates.py index e0f6ca3fb..5c6a116fe 100644 --- a/mesonbuild/templates/mesontemplates.py +++ b/mesonbuild/templates/mesontemplates.py @@ -52,9 +52,8 @@ def create_meson_build(options: Arguments) -> None: for x in options.deps.split(',')) depspec += '],' if options.language != 'java': - language = f"'{options.language}'" if options.language != 'vala' else ['c', 'vala'] content = meson_executable_template.format(project_name=options.name, - language=language, + language=options.language, version=options.version, meson_version='1.0.0', executable=options.executable, diff --git a/mesonbuild/templates/valatemplates.py b/mesonbuild/templates/valatemplates.py index fd93ffaf4..438434032 100644 --- a/mesonbuild/templates/valatemplates.py +++ b/mesonbuild/templates/valatemplates.py @@ -12,7 +12,7 @@ hello_vala_template = '''void main (string[] args) {{ }} ''' -hello_vala_meson_template = '''project('{project_name}', ['c', 'vala'], +hello_vala_meson_template = '''project('{project_name}', 'vala', meson_version : '>= {meson_version}', version : '{version}') @@ -48,7 +48,7 @@ public void main() {{ }} ''' -lib_vala_meson_template = '''project('{project_name}', ['c', 'vala'], +lib_vala_meson_template = '''project('{project_name}', 'vala', meson_version : '>= {meson_version}', version : '{version}') |