diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 8ac765841..c7e194e67 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1031,6 +1031,7 @@ int dummy; args += compiler.get_output_args(self.get_target_private_dir(target)) curdir = target.get_subdir() sourcepath = os.path.join(self.build_to_src, curdir) + os.pathsep + sourcepath += os.path.normpath(curdir) + os.pathsep for i in target.include_dirs: for idir in i.get_incdirs(): sourcepath += os.path.join(self.build_to_src, i.curdir, idir) + os.pathsep diff --git a/test cases/java/7 codegen/com/mesonbuild/Config.java.in b/test cases/java/7 codegen/com/mesonbuild/Config.java.in new file mode 100644 index 000000000..fcc88117e --- /dev/null +++ b/test cases/java/7 codegen/com/mesonbuild/Config.java.in @@ -0,0 +1,5 @@ +package com.mesonbuild; + +public class Config { + public static final boolean FOOBAR = @foobar@; +} diff --git a/test cases/java/7 codegen/com/mesonbuild/Simple.java b/test cases/java/7 codegen/com/mesonbuild/Simple.java new file mode 100644 index 000000000..df3c53df3 --- /dev/null +++ b/test cases/java/7 codegen/com/mesonbuild/Simple.java @@ -0,0 +1,12 @@ +package com.mesonbuild; + +import com.mesonbuild.Config; + +class Simple { + public static void main(String [] args) { + if (Config.FOOBAR) { + TextPrinter t = new TextPrinter("Printing from Java."); + t.print(); + } + } +} diff --git a/test cases/java/7 codegen/com/mesonbuild/TextPrinter.java b/test cases/java/7 codegen/com/mesonbuild/TextPrinter.java new file mode 100644 index 000000000..7e330a60b --- /dev/null +++ b/test cases/java/7 codegen/com/mesonbuild/TextPrinter.java @@ -0,0 +1,14 @@ +package com.mesonbuild; + +class TextPrinter { + + private String msg; + + TextPrinter(String s) { + msg = s; + } + + public void print() { + System.out.println(msg); + } +} diff --git a/test cases/java/7 codegen/com/mesonbuild/meson.build b/test cases/java/7 codegen/com/mesonbuild/meson.build new file mode 100644 index 000000000..188bedf10 --- /dev/null +++ b/test cases/java/7 codegen/com/mesonbuild/meson.build @@ -0,0 +1,6 @@ + +conf_data = configuration_data() +conf_data.set('foobar', 'true') +config_file = configure_file(input : 'Config.java.in', + output : 'Config.java', + configuration : conf_data) diff --git a/test cases/java/7 codegen/meson.build b/test cases/java/7 codegen/meson.build new file mode 100644 index 000000000..f85d45ae0 --- /dev/null +++ b/test cases/java/7 codegen/meson.build @@ -0,0 +1,15 @@ +# If we generate code under the build directory then the backend needs to add +# the build directory to the -sourcepath passed to javac otherwise the compiler +# won't be able to handle the -implicit:class behaviour of automatically +# compiling dependency classes. + +project('codegenjava', 'java') + +subdir('com/mesonbuild') + +javaprog = jar('myprog', + config_file, + 'com/mesonbuild/Simple.java', + 'com/mesonbuild/TextPrinter.java', + main_class : 'com.mesonbuild.Simple') +test('subdirtest', javaprog)