diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-07-12 17:38:55 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-07-19 00:17:29 +0200 |
| commit | ed348b7da81dd05aaa7ac398ae9acc4b15bc2733 (patch) | |
| tree | 51d84a271055315bfa4530d9d3db1d6c943b5c5f /mesonbuild/backend/backends.py | |
| parent | 8239d71025ad59e44e7ac7b43849554990efe9f9 (diff) | |
| download | meson-ed348b7da81dd05aaa7ac398ae9acc4b15bc2733.zip meson-ed348b7da81dd05aaa7ac398ae9acc4b15bc2733.tar.gz meson-ed348b7da81dd05aaa7ac398ae9acc4b15bc2733.tar.bz2 | |
backends: discover java/mono wrapper at generation time
Move the magic to execute jar and .exe files from "meson --internal exe"
to the backend, so that "ninja -v" shows more clearly what is happening.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 8328c57..5316d45 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -355,6 +355,10 @@ class Backend: 'check the command and/or add it to PATH.' raise MesonException(msg.format(exe_wrapper.name, tname)) else: + if exe_cmd[0].endswith('.jar'): + exe_cmd = ['java', '-jar'] + exe_cmd + elif exe_cmd[0].endswith('.exe') and not (mesonlib.is_windows() or mesonlib.is_cygwin()): + exe_cmd = ['mono'] + exe_cmd exe_wrapper = None force_serialize = force_serialize or extra_paths or workdir or \ |