Skip to content

Commit c96bd09

Browse files
authored
Make PDAL linux JNI binaries conda compatible (#45)
1 parent ad757fd commit c96bd09

File tree

7 files changed

+24
-6
lines changed

7 files changed

+24
-6
lines changed

.github/workflows/actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
scala: [2.13.2, 2.12.10]
1313

1414
container:
15-
image: daunnc/pdal-debian:2.1.0
15+
image: daunnc/pdal-ubuntu:2.1.0
1616

1717
steps:
1818
- name: Checkout

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [2.1.6] - 2020-05-16
10+
### Changed
11+
- Make prebuilt JNI binaries conda compatible [#42](https://github.com/PDAL/java/issues/42)
12+
913
## [2.1.5] - 2020-05-16
1014
### Changed
1115
- 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
106110
### Changed
107111
- Moved from the PDAL repo and established own lifecycle.
108112

109-
[Unreleased]: https://github.com/PDAL/java/compare/2.1.5...HEAD
113+
[Unreleased]: https://github.com/PDAL/java/compare/2.1.6...HEAD
114+
[2.1.6]: https://github.com/PDAL/java/compare/2.1.5...2.1.6
110115
[2.1.5]: https://github.com/PDAL/java/compare/2.1.5-RC3...2.1.5
111116
[2.1.5-RC3]: https://github.com/PDAL/java/compare/2.1.5-RC2...2.1.5-RC3
112117
[2.1.5-RC2]: https://github.com/PDAL/java/compare/2.1.5-RC1...2.1.5-RC2

examples/pdal-jni/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ resolvers ++= Seq(
2121

2222
fork := true
2323

24-
val pdalVersion = "2.1.5"
24+
val pdalVersion = "2.1.6"
2525

2626
libraryDependencies ++= Seq(
2727
"io.pdal" %% "pdal" % pdalVersion,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sbt.version=1.2.8
1+
sbt.version=1.3.10
22

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.8
1+
sbt.version=1.3.10

scripts/crosscompile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ docker run -it --rm \
2222
-v $HOME/.ivy2:/root/.ivy2 \
2323
-v $HOME/.sbt:/root/.sbt \
2424
-v $HOME/.coursier/cache:/root/.cache/coursier \
25-
daunnc/pdal-debian:2.1.0 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"
25+
daunnc/pdal-ubuntu:2.1.0 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"
2626

2727
# docker run -it --rm \
2828
# -v $PWD:/workdir \
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM pdal/pdal:2.1
2+
MAINTAINER Grigory Pomadchin <[email protected]>
3+
4+
RUN set -ex && \
5+
apt update -y && \
6+
apt install \
7+
openjdk-8-jdk \
8+
ca-certificates-java -y
9+
10+
ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-amd6
11+
RUN update-alternatives --set java `update-alternatives --list java | grep java-8`
12+
13+
RUN apt-get -y install bash gcc g++ cmake wget

0 commit comments

Comments
 (0)