diff --git a/demos/java/bengala/src/org/example/Bengala.java b/demos/java/bengala/src/org/example/Bengala.java new file mode 100644 index 00000000..30f50b70 --- /dev/null +++ b/demos/java/bengala/src/org/example/Bengala.java @@ -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!"; + } + +} + diff --git a/demos/java/bengala/wscript b/demos/java/bengala/wscript new file mode 100644 index 00000000..ad9d7635 --- /dev/null +++ b/demos/java/bengala/wscript @@ -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, + ) + diff --git a/demos/java/wscript b/demos/java/wscript index 9c927c7c..4ee2f952 100644 --- a/demos/java/wscript +++ b/demos/java/wscript @@ -49,5 +49,5 @@ def build(bld): javadoc_output = 'javadoc', ) - bld.recurse('animals cats') + bld.recurse('animals cats bengala') diff --git a/waflib/Tools/javaw.py b/waflib/Tools/javaw.py index fd1cf469..ceb08c28 100644 --- a/waflib/Tools/javaw.py +++ b/waflib/Tools/javaw.py @@ -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()