diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2020-03-30 01:27:39 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-04-01 20:37:49 +0300 |
| commit | 03870de639d90aff28dd2d135e71f24879888107 (patch) | |
| tree | a5065771355683927a9f6479deb087f5aac5157d /mesonbuild/templates | |
| parent | 7828f2c9c2e7fb1cbeb1ee5bcaa415d0aa0eb622 (diff) | |
| download | meson-03870de639d90aff28dd2d135e71f24879888107.zip meson-03870de639d90aff28dd2d135e71f24879888107.tar.gz meson-03870de639d90aff28dd2d135e71f24879888107.tar.bz2 | |
Fix meson_jar_template
It was generating an extra comma.
The Meson build system
Version: 0.54.0
Source dir: /tmp/tmp34halxhe
Build dir: /tmp/tmp34halxhe/build
Build type: native build
meson.build:6:15: ERROR: Expecting rparen got comma.
'Foo.java',,
^
For a block that started at 5,3
jar('tmp34halxhe',
^
A full log can be found at /tmp/tmp34halxhe/build/meson-logs/meson-log.txt
Using "tmp34halxhe" (name of current directory) as project name.
Using "tmp34halxhe" (project name) as name of executable to build.
Detected source files: Foo.java
Detected language: java
Generated meson.build file:
project('tmp34halxhe', 'java',
version : '0.1',
default_options : ['warning_level=3'])
jar('tmp34halxhe',
'Foo.java',,
main_class: tmp34halxhe,
install : true)
It was also missing quotes around the main class name.
The Meson build system
Version: 0.54.0
Source dir: /tmp/tmpjm5cg44a
Build dir: /tmp/tmpjm5cg44a/build
Build type: native build
Project name: tmpjm5cg44a
Project version: 0.1
Java compiler for the host machine: javac (unknown 1.8.0)
Host machine cpu family: x86_64
Host machine cpu: x86_64
meson.build:5:0: ERROR: Unknown variable "tmpjm5cg44a".
A full log can be found at /tmp/tmpjm5cg44a/build/meson-logs/meson-log.txt
Using "tmpjm5cg44a" (name of current directory) as project name.
Using "tmpjm5cg44a" (project name) as name of executable to build.
Detected source files: Foo.java
Detected language: java
Generated meson.build file:
project('tmpjm5cg44a', 'java',
version : '0.1',
default_options : ['warning_level=3'])
jar('tmpjm5cg44a',
'Foo.java',
main_class: tmpjm5cg44a,
install : true)
Diffstat (limited to 'mesonbuild/templates')
| -rw-r--r-- | mesonbuild/templates/mesontemplates.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/templates/mesontemplates.py b/mesonbuild/templates/mesontemplates.py index 2739c9d..6b341a2 100644 --- a/mesonbuild/templates/mesontemplates.py +++ b/mesonbuild/templates/mesontemplates.py @@ -27,8 +27,8 @@ meson_jar_template = '''project('{project_name}', '{language}', default_options : [{default_options}]) jar('{executable}', - {sourcespec},{depspec}, - main_class: {main_class}, + {sourcespec},{depspec} + main_class: '{main_class}', install : true) ''' |