Fix @typed_pos_args on java.generate_native_headers

5 files changed, 33 insertions, 17 deletions

diff --git a/test cases/java/9 jni/meson.build b/test cases/java/9 jni/meson.build
index 1239e19..90a8485 100644
--- a/test cases/java/9 jni/meson.build
+++ b/test cases/java/9 jni/meson.build
@@ -16,6 +16,17 @@ java = find_program('java')
 jni_dep = dependency('jni', version : '>=1.8', modules: ['jvm', 'awt'])
 
 # generate native headers
-subdir('src/com/mesonbuild')
-subdir('lib')
 subdir('src')
+subdir('lib')
+
+test(
+  'jnitest',
+  java,
+  args: [
+    '-Djava.library.path=@0@'.format(fs.parent(jnijava.full_path())),
+    '-jar',
+    jnijar,
+  ],
+  protocol : 'exitcode',
+  depends : [jnijava],
+)
diff --git a/test cases/java/9 jni/src/com/mesonbuild/Configured.java.in b/test cases/java/9 jni/src/com/mesonbuild/Configured.java.in
new file mode 100644
index 0000000..fac6e05
--- /dev/null
+++ b/test cases/java/9 jni/src/com/mesonbuild/Configured.java.in
@@ -0,0 +1,5 @@
+package com.mesonbuild;
+
+public final class Configured {
+    public static final int FINGERPRINT = @fingerprint@;
+}
diff --git a/test cases/java/9 jni/src/com/mesonbuild/JniTest.java b/test cases/java/9 jni/src/com/mesonbuild/JniTest.java
index f80b326..4bfffe9 100644
--- a/test cases/java/9 jni/src/com/mesonbuild/JniTest.java
+++ b/test cases/java/9 jni/src/com/mesonbuild/JniTest.java
@@ -4,7 +4,7 @@ public final class JniTest {
     private static native int jni_test();
 
     public static void main(String[] args) {
-        if (jni_test() != 0xdeadbeef) {
+        if (jni_test() != Configured.FINGERPRINT) {
             throw new RuntimeException("jdk_test() did not return 0");
         }
     }
diff --git a/test cases/java/9 jni/src/com/mesonbuild/meson.build b/test cases/java/9 jni/src/com/mesonbuild/meson.build
index 3ee2083..2d88c5e 100644
--- a/test cases/java/9 jni/src/com/mesonbuild/meson.build
+++ b/test cases/java/9 jni/src/com/mesonbuild/meson.build
@@ -1,3 +1,11 @@
+configured = configure_file(
+  input: files('Configured.java.in'),
+  output: 'Configured.java',
+  configuration: configuration_data({'fingerprint': '0xdeadbeef'})
+)
+
+sources += configured
+
 native_headers = javamod.generate_native_headers(
-  'JniTest.java', package: 'com.mesonbuild', classes: ['JdkTest'])
+  sources, package: 'com.mesonbuild', classes: ['JniTest'])
 native_header_includes = include_directories('.')
diff --git a/test cases/java/9 jni/src/meson.build b/test cases/java/9 jni/src/meson.build
index 07a0664..af443b5 100644
--- a/test cases/java/9 jni/src/meson.build
+++ b/test cases/java/9 jni/src/meson.build
@@ -1,17 +1,9 @@
+sources = [files('com/mesonbuild/JniTest.java')]
+
+subdir('com/mesonbuild')
+
 jnijar = jar(
   'jnijar',
-  'com' / 'mesonbuild' / 'JniTest.java',
+  sources,
   main_class : 'com.mesonbuild.JniTest',
 )
-
-test(
-  'jnitest',
-  java,
-  args: [
-    '-Djava.library.path=@0@'.format(fs.parent(jnijava.full_path())),
-    '-jar',
-    jnijar,
-  ],
-  protocol : 'exitcode',
-  depends : [jnijava],
-)