FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-25 11:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Refactor javaw.py 066a051181

Browse Source
This commit is contained in:
Thomas Nagy 2019-06-02 08:50:06 +02:00
parent 66fafd876a
commit 6bc6cb599c
No known key found for this signature in database
GPG Key ID: 49B4C67C05277AAA
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
waflib/Tools/javaw.py
View File

@ -235,23 +235,25 @@ def use_javac_files(self):
get = self.bld.get_tgen_by_name
for x in names:
try:
y = get(x)
tg = get(x)
except Errors.WafError:
self.uselib.append(x)
else:
y.post()
if hasattr(y, 'jar_task'):
self.use_lst.append(y.jar_task.outputs[0].abspath())
self.javac_task.set_run_after(y.jar_task)
self.javac_task.dep_nodes.extend(y.jar_task.outputs)
tg.post()
if hasattr(tg, 'jar_task'):
self.use_lst.append(tg.jar_task.outputs[0].abspath())
self.javac_task.set_run_after(tg.jar_task)
self.javac_task.dep_nodes.extend(tg.jar_task.outputs)
else:
if hasattr(y, 'outdir'):
self.use_lst.append(y.outdir.abspath())
self.javac_task.dep_nodes.extend([x for x in y.outdir.ant_glob(JAR_RE, remove=False, quiet=True)])
if hasattr(tg, 'outdir'):
base_node = tg.outdir.abspath()
else:
self.use_lst.append(y.path.get_bld().abspath())
self.javac_task.dep_nodes.extend([x for x in y.path.get_bld().ant_glob(JAR_RE, remove=False, quiet=True)])
for tsk in y.tasks:
base_node = tg.path.get_bld()
self.use_lst.append(base_node.abspath())
self.javac_task.dep_nodes.extend([x for x in base_node.ant_glob(JAR_RE, remove=False, quiet=True)])
for tsk in tg.tasks:
self.javac_task.set_run_after(tsk)
# If recurse use scan is enabled recursively add use attribute for each used one