Skip to content

Commit 8a019dd

Browse files
committed
Added more scripts to pack native libraries into jar
1 parent d861d3d commit 8a019dd

File tree

9 files changed

+10
-4
lines changed

9 files changed

+10
-4
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ cache:
4949
directories:
5050
- $HOME/.ivy2
5151
- $HOME/.sbt
52+
- $HOME/Library/Caches/Homebrew
5253

5354
script:
5455
- .travis/run.sh

.travis/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
if [[ $TRAVIS_OS_NAME == "osx" ]]; then
3+
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
44
.travis/test-all.sh
55
else
66
docker run -it --net=host \

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
Java bindings to use PDAL on JVM (supports PDAL >= 1.4).
66

7-
The repository for PDAL's JNI bindings and PDAL Scala is available at https://github.com/PDAL/java
8-
97
It is released independently from PDAL itself as of PDAL 1.7.
108

119
## Using PDAL JNI with SBT

build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ lazy val core = project
7777
.dependsOn(Environment.dependOnNative(native % Runtime): _*)
7878

7979
lazy val native = project
80-
.settings(commonSettings.head)
80+
.settings(commonSettings: _*)
81+
.settings(crossPaths := false)
82+
.settings(name := "pdal-native")
8183
.settings(sourceDirectory in nativeCompile := sourceDirectory.value)
8284
.enablePlugins(JniNative, JniPackage)

scripts/publish-212.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ fi
3030

3131
PDAL_DEPEND_ON_NATIVE=false ./sbt "-212" "project core" ${COMMAND}
3232
PDAL_DEPEND_ON_NATIVE=false ./sbt "-212" "project core-scala" ${COMMAND}
33+
./sbt "-212" "project native" ${COMMAND}

scripts/publish-javastyle.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ if ${SIGNED}; then
2929
fi
3030

3131
PDAL_DEPEND_ON_NATIVE=false ./sbt "-212" "project core" ${COMMAND}Javastyle
32+
./sbt "-212" "project native" ${COMMAND}

scripts/publish-local-212.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ export PDAL_VERSION_SUFFIX=${PDAL_VERSION_SUFFIX-"-SNAPSHOT"}
1818

1919
PDAL_DEPEND_ON_NATIVE=false ./sbt "-212" "project core" publishLocal
2020
PDAL_DEPEND_ON_NATIVE=false ./sbt "-212" "project core-scala" publishLocal
21+
./sbt "-212" "project native" publishLocal

scripts/publish-local.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ export PDAL_VERSION_SUFFIX=${PDAL_VERSION_SUFFIX-"-SNAPSHOT"}
1818

1919
PDAL_DEPEND_ON_NATIVE=false ./sbt "project core" publishLocal
2020
PDAL_DEPEND_ON_NATIVE=false ./sbt "project core-scala" publishLocal
21+
./sbt "project native" publishLocal

scripts/publish.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ fi
3030

3131
PDAL_DEPEND_ON_NATIVE=false ./sbt "project core" ${COMMAND}
3232
PDAL_DEPEND_ON_NATIVE=false ./sbt "project core-scala" ${COMMAND}
33+
./sbt "project native" ${COMMAND}

0 commit comments

Comments
 (0)