mirror of https://gitlab.com/ita1024/waf.git
Merge branch 'javaw_outdir_type' into 'master'
javaw: bugfix outdir is always a node (since converted in apply_javac) See merge request ita1024/waf!2242
This commit is contained in:
commit
d536d3ebab
|
@ -0,0 +1,14 @@
|
|||
|
||||
package org.example;
|
||||
|
||||
//import org.example.Animal;
|
||||
import org.example.Cat;
|
||||
|
||||
class Bengala extends Cat {
|
||||
|
||||
public String sound() {
|
||||
return "Bengala Meow!";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
#! /usr/bin/env python
|
||||
|
||||
def build(bld):
|
||||
|
||||
bld(features = 'javac',
|
||||
srcdir = 'src',
|
||||
compat = '1.7',
|
||||
use = 'cats-src',
|
||||
name = 'bengala-cat',
|
||||
recurse_use = True,
|
||||
)
|
||||
|
|
@ -49,5 +49,5 @@ def build(bld):
|
|||
javadoc_output = 'javadoc',
|
||||
)
|
||||
|
||||
bld.recurse('animals cats')
|
||||
bld.recurse('animals cats bengala')
|
||||
|
||||
|
|
|
@ -246,7 +246,7 @@ def use_javac_files(self):
|
|||
self.javac_task.dep_nodes.extend(tg.jar_task.outputs)
|
||||
else:
|
||||
if hasattr(tg, 'outdir'):
|
||||
base_node = tg.outdir.abspath()
|
||||
base_node = tg.outdir
|
||||
else:
|
||||
base_node = tg.path.get_bld()
|
||||
|
||||
|
|
Loading…
Reference in New Issue