FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Federico Pellegrin 2019-05-08 05:06:29 +02:00
parent d9babce4ce
commit b22b5636e9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
waflib/Tools/javaw.py
View File

@ -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)