From ec9cc76536c1b545d97f8bce21050985f581e03b Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Sat, 16 May 2020 15:21:24 -0400 Subject: [PATCH] Make PDAL linux JNI binaries conda compatible --- .github/workflows/actions.yml | 2 +- CHANGELOG.md | 7 ++++++- examples/pdal-jni/build.sbt | 2 +- examples/pdal-jni/project/build.properties | 2 +- project/build.properties | 2 +- scripts/crosscompile.sh | 2 +- scripts/docker/2.1.0/ubuntu/Dockerfile | 13 +++++++++++++ 7 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 scripts/docker/2.1.0/ubuntu/Dockerfile diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 9148621..ba65f50 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -12,7 +12,7 @@ jobs: scala: [2.13.2, 2.12.10] container: - image: daunnc/pdal-debian:2.1.0 + image: daunnc/pdal-ubuntu:2.1.0 steps: - name: Checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index f378cfd..418e31c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [2.1.6] - 2020-05-16 +### Changed +- Make prebuilt JNI binaries conda compatible [#42](https://github.com/PDAL/java/issues/42) + ## [2.1.5] - 2020-05-16 ### Changed - Update filter.stats [#39](https://github.com/PDAL/java/pull/39) @@ -106,7 +110,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Moved from the PDAL repo and established own lifecycle. -[Unreleased]: https://github.com/PDAL/java/compare/2.1.5...HEAD +[Unreleased]: https://github.com/PDAL/java/compare/2.1.6...HEAD +[2.1.6]: https://github.com/PDAL/java/compare/2.1.5...2.1.6 [2.1.5]: https://github.com/PDAL/java/compare/2.1.5-RC3...2.1.5 [2.1.5-RC3]: https://github.com/PDAL/java/compare/2.1.5-RC2...2.1.5-RC3 [2.1.5-RC2]: https://github.com/PDAL/java/compare/2.1.5-RC1...2.1.5-RC2 diff --git a/examples/pdal-jni/build.sbt b/examples/pdal-jni/build.sbt index 3e45e32..3be5347 100644 --- a/examples/pdal-jni/build.sbt +++ b/examples/pdal-jni/build.sbt @@ -21,7 +21,7 @@ resolvers ++= Seq( fork := true -val pdalVersion = "2.1.5" +val pdalVersion = "2.1.6" libraryDependencies ++= Seq( "io.pdal" %% "pdal" % pdalVersion, diff --git a/examples/pdal-jni/project/build.properties b/examples/pdal-jni/project/build.properties index e2820dd..d1d2638 100644 --- a/examples/pdal-jni/project/build.properties +++ b/examples/pdal-jni/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.2.8 +sbt.version=1.3.10 diff --git a/project/build.properties b/project/build.properties index a919a9b..797e7cc 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.8 +sbt.version=1.3.10 diff --git a/scripts/crosscompile.sh b/scripts/crosscompile.sh index 9906836..cdc3f8d 100755 --- a/scripts/crosscompile.sh +++ b/scripts/crosscompile.sh @@ -22,7 +22,7 @@ docker run -it --rm \ -v $HOME/.ivy2:/root/.ivy2 \ -v $HOME/.sbt:/root/.sbt \ -v $HOME/.coursier/cache:/root/.cache/coursier \ - daunnc/pdal-debian:2.1.0 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}" + daunnc/pdal-ubuntu:2.1.0 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}" # docker run -it --rm \ # -v $PWD:/workdir \ diff --git a/scripts/docker/2.1.0/ubuntu/Dockerfile b/scripts/docker/2.1.0/ubuntu/Dockerfile new file mode 100644 index 0000000..507020b --- /dev/null +++ b/scripts/docker/2.1.0/ubuntu/Dockerfile @@ -0,0 +1,13 @@ +FROM pdal/pdal:2.1 +MAINTAINER Grigory Pomadchin + +RUN set -ex && \ + apt update -y && \ + apt install \ + openjdk-8-jdk \ + ca-certificates-java -y + +ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-amd6 +RUN update-alternatives --set java `update-alternatives --list java | grep java-8` + +RUN apt-get -y install bash gcc g++ cmake wget