diff options
| author | Tristan Partin <tristan@partin.io> | 2022-01-26 02:01:52 -0600 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2022-03-01 13:18:50 -0800 |
| commit | 18147b91ff33d0ec03bfb04205d54316070c3fc8 (patch) | |
| tree | 4cf7562e30c6ef898c21cd6564ace2986a4371f7 /test cases/java | |
| parent | 7702d46dd1fa1c57b1d16f407e80061191cbdfa0 (diff) | |
| download | meson-18147b91ff33d0ec03bfb04205d54316070c3fc8.zip meson-18147b91ff33d0ec03bfb04205d54316070c3fc8.tar.gz meson-18147b91ff33d0ec03bfb04205d54316070c3fc8.tar.bz2 | |
Deprecate java.generate_native_header() in favor of java.generate_native_headers()
After implementing a much more extensive Java native module than what
currently exists in the tests, I found shortcomings.
1. You need to be able to pass multiple Java files.
2. Meson needs more information to better track the generated native
headers.
3. Meson wasn't tracking the header files generated from inner classes.
This new function should fix all the issues the old function had with
room to grow should more functionality need to be added. What I
implemented here in this new function is essentially what I have done in
the Heterogeneous-Memory Storage Engine's Java bindings.
Diffstat (limited to 'test cases/java')
| -rw-r--r-- | test cases/java/9 jdk/lib/meson.build | 2 | ||||
| -rw-r--r-- | test cases/java/9 jdk/src/com/mesonbuild/meson.build | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test cases/java/9 jdk/lib/meson.build b/test cases/java/9 jdk/lib/meson.build index edffc1c..08407cf 100644 --- a/test cases/java/9 jdk/lib/meson.build +++ b/test cases/java/9 jdk/lib/meson.build @@ -3,7 +3,7 @@ sources = [ 'native.c', 'com_mesonbuild_JdkTest.c', ), - native_header + native_headers ] jdkjava = shared_module( diff --git a/test cases/java/9 jdk/src/com/mesonbuild/meson.build b/test cases/java/9 jdk/src/com/mesonbuild/meson.build index 07daf51..0cce7f0 100644 --- a/test cases/java/9 jdk/src/com/mesonbuild/meson.build +++ b/test cases/java/9 jdk/src/com/mesonbuild/meson.build @@ -1,2 +1,3 @@ -native_header = javamod.generate_native_header('JdkTest.java', package: 'com.mesonbuild') +native_headers = javamod.generate_native_headers( + 'JdkTest.java', package: 'com.mesonbuild', classes: ['JdkTest']) native_header_includes = include_directories('.') |