build JNI as workspace member (#88)

* put foo-jni at the same level as foo-ffi

* create jni output directory

* don't generate the rust JNI sources in the ci-script, just use the cargo build invocation to do it

* refactor CI script traits to remove some complexity

* allow certain things in the generated jni

* add comment about the lints

* merge the classes module

* merge the enums

* merge structs

* merge interfaces

* merge exceptions

* merge primitives

* get everything down to a single JNI module file

* emit the jni code into OUT_DIR and use include!

* build JNI library in cross matrix

* remove bindings-aarch64 job and use cross matrix now that it can build Java

* use cross for x64 linux

* depend on documentation

* swap 32-bit Linux for 64-bit

* map the ARM_UNKNOWN_LINUX_GNUABIHF Rust triple to 'linux-arm' by default for .NET

* support apple x64 in JNI

* don't copy over libs that we won't attempt to load

* use the existing platform definitions instead of strings

* move this list of platforms to the ci-script since this is the only place it's used

* run tests on macos

Author: jadamcrain

.github/workflows/ci.yml

@@ -44,14 +44,15 @@ jobs:
           path: |
             oo-bindgen/dependencies.json
             oo-bindgen/dependencies.txt
-  # Run the unit tests on Windows and Linux
+  # Run the unit tests on Windows, Linux, and MacOS
   test:
     strategy:
       fail-fast: false
       matrix:
         os:
           - ubuntu-latest
           - windows-latest
+          - macos-latest
         rust:
           - stable
           - beta
@@ -104,8 +105,8 @@ jobs:
         with:
           command: clippy
           args: -- -D warnings
-  # Build bindings on Linux x64 [64-bit Linux (kernel 2.6.32+, glibc 2.11+) (x86_64-unknown-linux-gnu)]
-  bindings-linux:
+  # Build documentation
+  documentation:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -148,21 +149,6 @@ jobs:
           cp -a tests/bindings/dotnet/foo/doc ~/doc/dotnet
           cp -a tests/bindings/java/foo/target/apidocs ~/doc/java
           rm tests/bindings/c/generated/logo.png tests/bindings/c/generated/doxygen-awesome.css
-      - name: Upload compiled FFI modules
-        uses: actions/upload-artifact@v2
-        with:
-          name: ffi-modules
-          path: tests/bindings/c/generated/x86_64-unknown-linux-gnu/lib
-      - name: Upload C bindings
-        uses: actions/upload-artifact@v2
-        with:
-          name: c-bindings
-          path: tests/bindings/c/generated
-      - name: Upload compiled Java bindings
-        uses: actions/upload-artifact@v2
-        with:
-          name: ffi-modules
-          path: tests/bindings/java/foo/src/main/resources
       - name: Upload documentation
         uses: actions/upload-artifact@v2
         with:
@@ -278,60 +264,6 @@ jobs:
         with:
           name: ffi-modules
           path: tests/bindings/java/foo/src/main/resources
-  # Build bindings on Linux AArch64
-  bindings-aarch64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          target: aarch64-unknown-linux-gnu
-          override: true
-      - name: Caching
-        uses: Swatinem/rust-cache@v1
-      - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: true
-          command: build
-          args: --release --target aarch64-unknown-linux-gnu
-      - name: C bindings
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: true
-          command: run
-          args: --release --target aarch64-unknown-linux-gnu --bin foo-bindings -- --c --no-tests
-      - name: .NET bindings
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: true
-          command: run
-          args: --release --target aarch64-unknown-linux-gnu --bin foo-bindings -- --dotnet --no-tests
-      - name: Java bindings
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: true
-          command: run
-          args: --release --target aarch64-unknown-linux-gnu --bin foo-bindings -- --java --no-tests
-      - name: Upload compiled FFI modules
-        uses: actions/upload-artifact@v2
-        with:
-          name: ffi-modules
-          path: tests/bindings/c/generated/aarch64-unknown-linux-gnu/lib
-      - name: Upload C bindings
-        uses: actions/upload-artifact@v2
-        with:
-          name: c-bindings
-          path: tests/bindings/c/generated
-      - name: Upload compiled Java bindings
-        uses: actions/upload-artifact@v2
-        with:
-          name: ffi-modules
-          path: tests/bindings/java/foo/src/main/resources
   # Cross-compilation for ARM devices and produce C bindings
   cross:
     strategy:
@@ -341,6 +273,8 @@ jobs:
           - arm-unknown-linux-gnueabi # ARMv6 Linux (kernel 3.2, glibc 2.17)
           - arm-unknown-linux-gnueabihf # ARMv6 Linux, hardfloat (kernel 3.2, glibc 2.17)
           - armv7-unknown-linux-gnueabihf # ARMv7 Linux, hardfloat (kernel 3.2, glibc 2.17)
+          - aarch64-unknown-linux-gnu # ARM64 Linux (kernel 4.2, glibc 2.17+)
+          - x86_64-unknown-linux-gnu # 64-bit Linux (kernel 2.6.32+, glibc 2.11+)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -364,19 +298,30 @@ jobs:
           use-cross: true
           command: run
           args: --release --target ${{ matrix.target }} --bin foo-bindings -- --c --no-tests
+      - name: Java bindings
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: true
+          command: run
+          args: --release --target ${{ matrix.target }} --bin foo-bindings -- --java --no-tests
       - name: Upload compiled FFI modules
         uses: actions/upload-artifact@v2
         with:
           name: ffi-modules
           path: tests/bindings/c/generated/${{ matrix.target }}/lib
+      - name: Upload compiled Java bindings
+        uses: actions/upload-artifact@v2
+        with:
+          name: ffi-modules
+          path: tests/bindings/java/foo/src/main/resources
       - name: Upload C bindings
         uses: actions/upload-artifact@v2
         with:
           name: c-bindings
           path: tests/bindings/c/generated
   # Package all the generated bindings
   packaging:
-    needs: [dependencies, bindings-linux, bindings-windows, bindings-macos, bindings-aarch64, cross]
+    needs: [dependencies, documentation, bindings-windows, bindings-macos, cross]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.gitignore

@@ -24,6 +24,8 @@ tests/bindings/dotnet/nupkg
 # Generated Java lib
 tests/bindings/java/.idea
 tests/bindings/java/foo
-tests/bindings/java/foo-jni
 tests/bindings/java/*/target
 tests/bindings/java/**/*.iml
+
+# generated jni code
+tests/foo-ffi-java/src/generated

Cargo.lock

@@ -12,4 +12,5 @@ members = [
     "tests/foo-schema",
     "tests/foo-ffi",
     "tests/foo-bindings",
+    "tests/foo-ffi-java",
 ]