diff --git a/build.gradle b/build.gradle index 07447da6..a574b711 100644 --- a/build.gradle +++ b/build.gradle @@ -67,6 +67,7 @@ task cmakeTask(type: Exec) { "TILEDB_GIT_TAG", "TILEDB_VERBOSE", "TILEDB_S3", + "TILEDB_AZURE", "TILEDB_HDFS", "TILEDB_SERIALIZATION" ].each { v -> diff --git a/ci/Dockerfile2010 b/ci/Dockerfile2010 new file mode 100644 index 00000000..5e1383d5 --- /dev/null +++ b/ci/Dockerfile2010 @@ -0,0 +1,10 @@ +# Dockerfile for lowest common denominator Linux native artifact build +# -------------------------------------------------------------------- +# Cribbed from TileDB-Py/misc/pypi_linux/Dockerfile2010 +FROM quay.io/pypa/manylinux2010_x86_64 + +RUN yum install -y java-1.8.0-openjdk-devel +RUN yum remove -y cmake + +ENV PATH /opt/python/cp38-cp38/bin:${PATH} +RUN pip install cmake==3.17.3 diff --git a/ci/build.sh b/ci/build.sh new file mode 100755 index 00000000..bdeb3540 --- /dev/null +++ b/ci/build.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +set -ex + +cd /TileDB-Java +./gradlew -PTILEDB_AZURE=ON build diff --git a/ci/tiledb-java-linux_osx-release.yml b/ci/tiledb-java-linux_osx-release.yml index 56d78ea6..84a28efe 100644 --- a/ci/tiledb-java-linux_osx-release.yml +++ b/ci/tiledb-java-linux_osx-release.yml @@ -12,14 +12,15 @@ steps: BUILD_BINARIESDIRECTORY=${BUILD_BINARIESDIRECTORY:-$BUILD_REPOSITORY_LOCALPATH/} - ./gradlew assemble - if [[ ( "$AGENT_OS" == "Linux" ) ]]; then - cp ./build/tiledb_jni/*.so ./build/install/lib/*.so $BUILD_BINARIESDIRECTORY + docker build -f ci/Dockerfile2010 . -t lib_builder_2010 + docker run -v $(pwd):/TileDB-Java -t lib_builder_2010 /TileDB-Java/ci/build.sh + cp ./build/tiledb_jni/*.so ./build/install/lib/*.so $BUILD_BINARIESDIRECTORY fi if [[ ( "$AGENT_OS" == "Darwin" ) ]]; then - cp ./build/tiledb_jni/*.dylib ./build/install/lib/*.dylib $BUILD_BINARIESDIRECTORY + ./gradlew -PTILEDB_AZURE=ON assemble + cp ./build/tiledb_jni/*.dylib ./build/install/lib/*.dylib $BUILD_BINARIESDIRECTORY fi echo "Native Libs" @@ -65,4 +66,4 @@ steps: inputs: pathtoPublish: $(Build.ArtifactStagingDirectory)/tiledb-$(Agent.OS)-$(Build.SourceBranchName)-$(commitHash).tar.gz artifactName: libraries - condition: succeeded() \ No newline at end of file + condition: succeeded() diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index 0133ba19..63fbf4c9 100644 --- a/cmake/Modules/FindTileDB_EP.cmake +++ b/cmake/Modules/FindTileDB_EP.cmake @@ -48,6 +48,7 @@ if (NOT TILEDB_FOUND) -DCMAKE_PREFIX_PATH=${TILEDB_JNI_EP_INSTALL_PREFIX} -DTILEDB_VERBOSE=${TILEDB_VERBOSE} -DTILEDB_S3=${TILEDB_S3} + -DTILEDB_AZURE=${TILEDB_AZURE} -DTILEDB_HDFS=${TILEDB_HDFS} -DTILEDB_SERIALIZATION=${TILEDB_SERIALIZATION} -DTILEDB_FORCE_ALL_DEPS=ON diff --git a/gradle.properties b/gradle.properties index 0a9fa64c..1064a75a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,6 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB TILEDB_GIT_TAG=2.0.8 TILEDB_VERBOSE=OFF TILEDB_S3=ON +TILEDB_AZURE=OFF TILEDB_HDFS=OFF TILEDB_SERIALIZATION=OFF