add apple silicon .dylib to release jar

Author: DimitrisStaratzis

.github/workflows/github_actions.yml

@@ -40,7 +40,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-11, macos-13-xlarge ]
+        os: [ macos-11, macos-13-xlarge ]
 
     steps:
       - name: checkout
@@ -65,6 +65,11 @@ jobs:
         shell: bash
         name: assemble
 
+      - run: |
+          brew install tree; tree;
+        shell: bash
+        name: tree
+
       - run: |
           unset SYSTEM
           ./gradlew test
@@ -160,7 +165,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macos-11, ubuntu-latest ]
+        os: [ macos-11, ubuntu-latest, macos-13-xlarge]
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -175,10 +180,17 @@ jobs:
             docker run -e "CFLAGS=$CFLAGS" -e "CPPFLAGS=$CPPFLAGS" -v $(pwd):/TileDB-Java -t lib_builder_2010 /TileDB-Java/ci/build.sh
             cp ./build/tiledb_jni/*.so ./build/install/lib/*.so ./build/install/lib64/*.so binaries_$RUNNER_OS/
           fi
-
-          if [[ ( "$RUNNER_OS" == "macOS" ) ]]; then
-            ./gradlew -PTILEDB_AZURE=ON assemble
-            cp ./build/tiledb_jni/*.dylib ./build/install/lib/*.dylib binaries_$RUNNER_OS/
+          
+          if [[ "$RUNNER_OS" == "macOS" ]]; then
+            if [[ "$(uname -m)" == "arm64" ]]; then
+              echo "ARM Mac";
+              mkdir binaries_$RUNNER_OS/arm
+              ./gradlew -PTILEDB_AZURE=ON assemble
+              cp ./build/tiledb_jni/arm/*.dylib ./build/install/lib/arm/*.dylib binaries_$RUNNER_OS/arm
+            else
+              ./gradlew -PTILEDB_AZURE=ON assemble
+              cp ./build/tiledb_jni/*.dylib ./build/install/lib/*.dylib binaries_$RUNNER_OS/
+            fi
           fi
 
         name: 'Build and Upload (Ubuntu and OSX)'
@@ -242,8 +254,10 @@ jobs:
           mv Upload-*/* .
 
           mkdir -p ./build/install/lib
+          mkdir .build/install/lib/arm
           mkdir ./build/install/lib64
           mkdir ./build/tiledb_jni/
+          mkdir ./build/tiledb_jni/arm
           mkdir ./build/tiledb_jni/Release
           mkdir ./build/install/bin
 
@@ -258,6 +272,8 @@ jobs:
           # OSX
           mv libtiledb.dylib ./build/install/lib
           mv libtiledbjni.dylib ./build/tiledb_jni
+          mv arm/libtiledb.dylib .build/install/lib/arm
+          mv arm/libtiledbjni.dylib .build/tiledb_jni/arm
 
           # Linux
           cp libtiledb.so ./build/install/lib

CMakeLists.txt

@@ -152,5 +152,15 @@ include(GNUInstallDirs)
 
 install(
   TARGETS tiledbjni
-  LIBRARY DESTINATION "${RESOURCE_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}"
+  # Path to install everything to, for embedding in the jar.
+  if (APPLE) # macOS
+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+        LIBRARY DESTINATION "${RESOURCE_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}"
+    else()
+        LIBRARY DESTINATION "${RESOURCE_INSTALL_DIR}/arm/${CMAKE_INSTALL_LIBDIR}"
+    endif()
+  else()
+        LIBRARY DESTINATION "${RESOURCE_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}"
+  endif()
+
 )

build.gradle

@@ -46,8 +46,26 @@ dependencies {
 }
 
 task cmakeTask(type: Exec) {
-    File jniLibs = new File(buildDir.path + "/tiledb_jni")
-    File tiledbLibs = new File(buildDir.path + "/install/lib")
+    def osName = System.getProperty('os.name').toLowerCase()
+    def arch = System.getProperty('os.arch').toLowerCase()
+
+    println "arch: "
+    println arch;
+    println osName;
+
+    File jniLibs;
+    File tiledbLibs;
+
+    if (osName.contains("mac") && arch.equals("aarch64")) {
+        println "mac arm building2";
+        jniLibs = new File(buildDir.path + "/tiledb_jni/arm")
+        tiledbLibs = new File(buildDir.path + "/install/lib/arm")
+    }else{
+        println " building2";
+
+        jniLibs = new File(buildDir.path + "/tiledb_jni")
+        tiledbLibs = new File(buildDir.path + "/install/lib")
+    }
 
     onlyIf { !buildDir.exists() || !jniLibs.exists() || !tiledbLibs.exists() }
     doFirst {
@@ -83,8 +101,26 @@ task cmakeTask(type: Exec) {
 }
 
 task cmakeBuildTask(type: Exec) {
-    File jniLibs = new File(buildDir.path + "/tiledb_jni")
-    File tiledbLibs = new File(buildDir.path + "/install/lib")
+    def osName = System.getProperty('os.name').toLowerCase()
+    def arch = System.getProperty('os.arch').toLowerCase()
+
+    println "arch: "
+    println arch;
+    println osName;
+
+    File jniLibs;
+    File tiledbLibs;
+
+    if (osName.contains("mac") && arch.equals("aarch64")) {
+        println "mac arm building";
+        jniLibs = new File(buildDir.path + "/tiledb_jni/arm")
+        tiledbLibs = new File(buildDir.path + "/install/lib/arm")
+    }else{
+        println " building";
+
+        jniLibs = new File(buildDir.path + "/tiledb_jni")
+        tiledbLibs = new File(buildDir.path + "/install/lib")
+    }
 
     onlyIf { !buildDir.exists() || !jniLibs.exists() || !tiledbLibs.exists() }
     doFirst {
@@ -116,7 +152,7 @@ test {
     if (Os.isFamily(Os.FAMILY_WINDOWS)) {
         systemProperty "java.library.path", "$buildDir\\install\\bin;$buildDir\\tiledb_jni\\Release"
     } else {
-        systemProperty "java.library.path", "$buildDir/install/lib:$buildDir/install/lib64:$buildDir/tiledb_jni"
+        systemProperty "java.library.path", "$buildDir/install/lib:$buildDir/install/lib64:$buildDir/tiledb_jni:$buildDir/install/lib/arm"
     }
 
     testLogging {
@@ -125,12 +161,19 @@ test {
 }
 
 jar {
+    // macOS arm
+    into(new File('lib/arm').toString()) {
+        from file("$buildDir/install/lib/arm/libtiledb.dylib")
+        from file("$buildDir/tiledb_jni/arm/libtiledbjni.dylib")
+    }
+
     into(new File('lib').toString()) {
-        // Linux and macOS
+        // Linux
         from file("$buildDir/install/lib/libtiledb.so")
         from file("$buildDir/install/lib64/libtiledb.so")
         from file("$buildDir/tiledb_jni/libtiledbjni.so")
 
+        // macOS intel
         from file("$buildDir/install/lib/libtiledb.dylib")
         from file("$buildDir/install/lib64/libtiledb.dylib")
         from file("$buildDir/tiledb_jni/libtiledbjni.dylib")
@@ -141,6 +184,7 @@ jar {
         from file("$buildDir/tiledb_jni/Release/tiledbjni.dll")
     }
 
+
     manifest {
         attributes("Implementation-Title": "Gradle",
                 "Implementation-Version": archiveVersion)

cmake/TileDB-JNI-Superbuild.cmake

@@ -60,12 +60,37 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindTileDB_EP.cmake)
 # Set up the regular build (i.e. non-superbuild).
 ############################################################
 
-ExternalProject_Add(tiledb_jni
-  SOURCE_DIR ${PROJECT_SOURCE_DIR}
-  CMAKE_ARGS
-    -DTILEDB_JNI_SUPERBUILD=OFF
-    ${INHERITED_CMAKE_ARGS}
-  INSTALL_COMMAND ""
-  BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/tiledb_jni
-  DEPENDS ${TILEDB_JNI_EXTERNAL_PROJECTS}
-)
+if (APPLE) # macOS
+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+        ExternalProject_Add(tiledb_jni
+            SOURCE_DIR ${PROJECT_SOURCE_DIR}
+            CMAKE_ARGS
+                -DTILEDB_JNI_SUPERBUILD=OFF
+                ${INHERITED_CMAKE_ARGS}
+            INSTALL_COMMAND ""
+            BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/tiledb_jni/
+            DEPENDS ${TILEDB_JNI_EXTERNAL_PROJECTS}
+        )
+    else()
+        ExternalProject_Add(tiledb_jni
+            SOURCE_DIR ${PROJECT_SOURCE_DIR}
+            CMAKE_ARGS
+                -DTILEDB_JNI_SUPERBUILD=OFF
+                ${INHERITED_CMAKE_ARGS}
+            INSTALL_COMMAND ""
+            BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/tiledb_jni/arm
+            DEPENDS ${TILEDB_JNI_EXTERNAL_PROJECTS}
+        )
+    endif()
+else()
+    ExternalProject_Add(tiledb_jni
+        SOURCE_DIR ${PROJECT_SOURCE_DIR}
+        CMAKE_ARGS
+            -DTILEDB_JNI_SUPERBUILD=OFF
+            ${INHERITED_CMAKE_ARGS}
+        INSTALL_COMMAND ""
+        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/tiledb_jni/
+        DEPENDS ${TILEDB_JNI_EXTERNAL_PROJECTS}
+    )
+endif()
+

gradle.properties

@@ -5,6 +5,6 @@ TILEDB_S3=ON
 TILEDB_AZURE=OFF
 TILEDB_HDFS=OFF
 TILEDB_SERIALIZATION=OFF
-FORCE_BUILD_TILEDB=OFF
+FORCE_BUILD_TILEDB=ON
 DOWNLOAD_TILEDB_PREBUILT=ON
 TILEDB_SKIP_S3AWSSDK_DIR_LENGTH_CHECK=ON

src/main/java/io/tiledb/libtiledb/NativeLibLoader.java

@@ -322,6 +322,12 @@ private static Path extractLibraryFile(
   private static Path findNativeLibrary(String libraryName, boolean mapLibraryName) {
     String mappedLibraryName = mapLibraryName ? System.mapLibraryName(libraryName) : libraryName;
     String libDir = LIB_RESOURCE_DIR;
+
+    if (System.getProperty("os.name").contains("mac")
+        && System.getProperty("os.arch").equals("aarch64")) {
+      libDir += "/arm";
+    }
+
     String libPath = libDir + "/" + mappedLibraryName;
 
     boolean hasNativeLib = hasResource(libPath);

swig/customCode/NativeLibLoader.java

@@ -322,6 +322,12 @@ private static Path extractLibraryFile(
   private static Path findNativeLibrary(String libraryName, boolean mapLibraryName) {
     String mappedLibraryName = mapLibraryName ? System.mapLibraryName(libraryName) : libraryName;
     String libDir = LIB_RESOURCE_DIR;
+
+    if (System.getProperty("os.name").contains("mac")
+        && System.getProperty("os.arch").equals("aarch64")) {
+      libDir += "/arm";
+    }
+
     String libPath = libDir + "/" + mappedLibraryName;
 
     boolean hasNativeLib = hasResource(libPath);