From b22b5636e903aa91c8f86e81fd0f5855c8b3868a Mon Sep 17 00:00:00 2001 From: Federico Pellegrin Date: Wed, 8 May 2019 05:06:29 +0200 Subject: [PATCH] javaw: also when using non-jar CLASSPATH has to be populated to use-d tasks. In this case we point to the directory instead of the JAR file --- waflib/Tools/javaw.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/waflib/Tools/javaw.py b/waflib/Tools/javaw.py index faa4a04c..adc92a49 100644 --- a/waflib/Tools/javaw.py +++ b/waflib/Tools/javaw.py @@ -212,6 +212,8 @@ def java_use_rec(self, name, **kw): # is already guaranteed by ordering done between the single tasks if hasattr(y, 'jar_task'): self.use_lst.append(y.jar_task.outputs[0].abspath()) + else: + self.use_lst.append(y.outdir.abspath()) for x in self.to_list(getattr(y, 'use', [])): self.java_use_rec(x) @@ -240,6 +242,7 @@ def use_javac_files(self): self.javac_task.set_run_after(y.jar_task) self.javac_task.dep_nodes.extend(y.jar_task.outputs) else: + self.use_lst.append(y.outdir.abspath()) for tsk in y.tasks: self.javac_task.set_run_after(tsk)