FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2025-01-27 02:30:41 +01:00
Code Issues Projects Releases Wiki Activity

Identify java tasks more accurately and add build order on non-jar tasks - Issue 1725

Browse Source
This commit is contained in:
Thomas Nagy 2016-04-10 13:59:39 +02:00
parent aeed691829
commit e0080e9f58
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
waflib/Tools/javaw.py
View File

@ -124,9 +124,12 @@ def use_javac_files(self):
self.uselib.append(x)
else:
y.post()
lst.append(y.jar_task.outputs[0].abspath())
self.javac_task.set_run_after(y.jar_task)
if hasattr(y, 'jar_task'):
lst.append(y.jar_task.outputs[0].abspath())
self.javac_task.set_run_after(y.jar_task)
else:
for tsk in y.tasks:
self.javac_task.set_run_after(tsk)
if lst:
self.env.append_value('CLASSPATH', lst)
@ -240,6 +243,12 @@ class javac(Task.Task):
"""
The javac task will be executed again if the variables CLASSPATH, JAVACFLAGS, JAVAC or OUTDIR change.
"""
def uid(self):
"""Identify java tasks by input&output folder"""
lst = [self.__class__.__name__, self.generator.outdir.abspath()]
for x in self.srcdir:
lst.append(x.abspath())
return Utils.h_list(lst)
def runnable_status(self):
"""