aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
authorAurélien Zanelli <aurelien.zanelli@actronika.com>2018-10-31 12:36:13 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2018-11-02 22:27:25 +0200
commit5af84440bcfb3fd5ab8f2791b5e6a57fabfcbc19 (patch)
tree98d1662bdbfac0676eeba2fa2fd5044e74754220 /mesonbuild/backend/ninjabackend.py
parentf0e1342fb263fff8b2ec514ebc2a5a178739cd28 (diff)
downloadmeson-5af84440bcfb3fd5ab8f2791b5e6a57fabfcbc19.zip
meson-5af84440bcfb3fd5ab8f2791b5e6a57fabfcbc19.tar.gz
meson-5af84440bcfb3fd5ab8f2791b5e6a57fabfcbc19.tar.bz2
ninjabackend: add generated source files to jar compile target source list
Otherwise, passing result of custom_target() to jar() target is ignored and won't be compiled resulting in build fail.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 563b959..229980d 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -767,6 +767,15 @@ int dummy;
main_class = target.get_main_class()
if main_class != '':
e = 'e'
+
+ # Add possible java generated files to src list
+ generated_sources = self.get_target_generated_sources(target)
+ for rel_src, gensrc in generated_sources.items():
+ dirpart, fnamepart = os.path.split(rel_src)
+ raw_src = File(True, dirpart, fnamepart)
+ if rel_src.endswith('.java'):
+ src_list.append(raw_src)
+
for src in src_list:
plain_class_path = self.generate_single_java_compile(src, target, compiler, outfile)
class_list.append(plain_class_path)