diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-10 22:49:41 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-12 21:01:10 +0200 |
| commit | 5787a4b4fba7a5ef3075b30d941239e17ef4fa4f (patch) | |
| tree | f3d337b59e8077362bba250226d1125d7f271128 /mesonbuild/backend/ninjabackend.py | |
| parent | e128d26b350e4b8ba02e4de8858aa3deafa07ce1 (diff) | |
| download | meson-5787a4b4fba7a5ef3075b30d941239e17ef4fa4f.zip meson-5787a4b4fba7a5ef3075b30d941239e17ef4fa4f.tar.gz meson-5787a4b4fba7a5ef3075b30d941239e17ef4fa4f.tar.bz2 | |
Make Java compilation work with inner classes. Closes #1157.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index b002656..d8dc333 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -803,8 +803,10 @@ int dummy; if e != '': commands.append(main_class) commands.append(self.get_target_filename(target)) - for cls in class_list: - commands += ['-C', self.get_target_private_dir(target), cls] + # Java compilation can produce an arbitrary number of output + # class files for a single source file. Thus tell jar to just + # grab everything in the final package. + commands += ['-C', self.get_target_private_dir(target), '.'] elem = NinjaBuildElement(self.all_outputs, outname_rel, jar_rule, []) elem.add_dep(class_dep_list) elem.add_item('ARGS', commands) |