diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-02-02 19:37:51 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-02-06 19:09:22 +0100 |
| commit | 14e0529a037eb8f3d809822c811d2c034d8f0788 (patch) | |
| tree | 59615c73a5455fbb4cfe6cdc9e9515f53fbaf438 | |
| parent | a9c4428c6925c921102e52aeaea1b92ed6914af1 (diff) | |
| download | meson-14e0529a037eb8f3d809822c811d2c034d8f0788.zip meson-14e0529a037eb8f3d809822c811d2c034d8f0788.tar.gz meson-14e0529a037eb8f3d809822c811d2c034d8f0788.tar.bz2 | |
Do not strip jar targets. Closes #1343.
| -rw-r--r-- | mesonbuild/scripts/meson_install.py | 3 | ||||
| -rw-r--r-- | test cases/java/1 basic/installed_files.txt | 1 | ||||
| -rw-r--r-- | test cases/java/1 basic/meson.build | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index a74573e..2ffc505 100644 --- a/mesonbuild/scripts/meson_install.py +++ b/mesonbuild/scripts/meson_install.py @@ -237,6 +237,9 @@ def install_targets(d): elif os.path.isfile(fname): do_copyfile(fname, outname) if should_strip: + if fname.endswith('.jar'): + print('Not stripping jar target:', os.path.split(fname)[1]) + continue print('Stripping target {!r}'.format(fname)) ps, stdo, stde = Popen_safe(['strip', outname]) if ps.returncode != 0: diff --git a/test cases/java/1 basic/installed_files.txt b/test cases/java/1 basic/installed_files.txt new file mode 100644 index 0000000..1c7cede --- /dev/null +++ b/test cases/java/1 basic/installed_files.txt @@ -0,0 +1 @@ +usr/bin/myprog.jar diff --git a/test cases/java/1 basic/meson.build b/test cases/java/1 basic/meson.build index bed5c0f..201a609 100644 --- a/test cases/java/1 basic/meson.build +++ b/test cases/java/1 basic/meson.build @@ -1,5 +1,7 @@ project('simplejava', 'java') javaprog = jar('myprog', 'com/mesonbuild/Simple.java', - main_class : 'com.mesonbuild.Simple') + main_class : 'com.mesonbuild.Simple', + install : true, + install_dir : get_option('bindir')) test('mytest', javaprog) |