Fix release scripts to take into account cross compilation for linux and mac [skip ci]

Author: pomadchin

HOWTORELEASE.txt

@@ -28,6 +28,7 @@ Release Process
             To publish everything in a local repo use command:
               - ./scripts/publish-local.sh (publishes scala 2.11 version)
               - ./scripts/publish-local-212.sh (publishes scala 2.12 version)
+              - ./scripts/publish-local-native.sh (publishes native dependencies)
             To publish everything into sonatype snapshot repo use:
               - ./scripts/publish-all.sh
             Summary:

README.md

@@ -16,7 +16,8 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "io.pdal" %% "pdal" % "1.6.0"
+  "io.pdal" %% "pdal" % "1.7.0-RC1",
+  "io.pdal" %  "pdal-native" % "1.7.0-RC1"
 )
 ```
 
@@ -30,17 +31,19 @@ It's required to have native JNI binary in `java.library.path`:
 javaOptions += "-Djava.library.path=/usr/local/lib"
 ```
 
+You can use `pdal-native` dep in case you don't have installed JNI bindings and to avoid steps described above.
+
 ## PDAL-Scala
 
 Scala API to build pipeline expressions instead of writing a raw JSON.
 
 ```scala
 libraryDependencies ++= Seq(
-  "io.pdal" %% "pdal-scala" % "1.6.0"
+  "io.pdal" %% "pdal-scala" % "1.7.0-RC1"
 )
 ```
 
-Scala API covers PDAL 1.6.0 but is compatible with PDAL >= 1.4, to use any custom DSL
+Scala API covers PDAL 1.7.0 but is compatible with PDAL >= 1.4, to use any custom DSL
 that is not covered by the current Scala API you can use `RawExpr` type to build `Pipeline 
 Expression`.
 
@@ -75,6 +78,11 @@ val pc: PipelineConstructor = LasRead("/path/to/las") ~ CropFilter() ~ LasWrite(
 val pcWithRawExpr = LasRead("/path/to/las") ~ RawExpr(Map("type" -> "filters.crop").asJson) ~ LasWrite("/path/to/new/las") 
 ```
 
+### Demo project example
+
+SBT projects with examples how to add dependencies, and with some working basic example can
+be found [here](./examples)
+
 ## How to compile
 
 Development purposes (including binaries):
@@ -93,13 +101,11 @@ Finally the possible command to launch and build PDAL JNI bindings could be:
 
 ```bash
 # Including binaries build
-# WARN: PDAL should be built without `-DWITH_PDAL_JNI=ON` flag
 ./sbt
 ```
 
 ```bash
 # Java side development without binaries build
-# WARN: PDAL should be built with `-DWITH_PDAL_JNI=ON` flag
 PDAL_DEPEND_ON_NATIVE=false ./sbt -Djava.library.path=<path>
 ```
 

build.sbt

@@ -46,7 +46,9 @@ lazy val commonSettings = Seq(
           <url>http://github.com/pomadchin/</url>
         </developer>
       </developers>
-    )
+    ),
+  PgpKeys.useGpg in Global := true,
+  PgpKeys.gpgCommand in Global := "gpg"
 )
 
 lazy val root = (project in file("."))
@@ -81,4 +83,7 @@ lazy val native = project
   .settings(crossPaths := false)
   .settings(name := "pdal-native")
   .settings(sourceDirectory in nativeCompile := sourceDirectory.value)
+  .settings(artifactName := { (sv: ScalaVersion, module: ModuleID, artifact: Artifact) =>
+    artifact.name + "-" + nativePlatform.value + "-" + module.revision + "." + artifact.extension
+  })
   .enablePlugins(JniNative, JniPackage)

scripts/crosscompile-mac.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+## Script to run cross compilation on Mac OS host machine
+## The result of this script would be an jar of a proper version
+## Which contains native bindings for Linux (64 bit) and Mac Os (64 bit)
+
+# --suffix: sets the suffix you want to publish lib with
+
+for i in "$@"
+do
+    case $i in
+        --suffix=*)
+            PDAL_VERSION_SUFFIX="${i#*=}"
+            shift
+            ;;
+        *)
+            ;;
+    esac
+done
+
+export PDAL_VERSION_SUFFIX=${PDAL_VERSION_SUFFIX-"-SNAPSHOT"}
+
+./scripts/crosscompile.sh "$@"
+./scripts/pack-native.sh "$@"
+./scripts/merge-native.sh "$@"

scripts/crosscompile.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+# --suffix: sets the suffix you want to publish lib with
+
+for i in "$@"
+do
+    case $i in
+        --suffix=*)
+            PDAL_VERSION_SUFFIX="${i#*=}"
+            shift
+            ;;
+        *)
+            ;;
+    esac
+done
+
+export PDAL_VERSION_SUFFIX=${PDAL_VERSION_SUFFIX-"-SNAPSHOT"}
+
+# Linux 
+docker run -it --rm \
+  -v $PWD:/workdir \
+  -v $HOME/.ivy2:/root/.ivy2 \
+  -v $HOME/.sbt:/root/.sbt \
+  daunnc/crossbuild-pdal:latest bash -c "./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"
+
+# Apple cross compilation
+# docker run -it --rm -v $PWD:/workdir -e CROSS_TRIPLE=x86_64-apple-darwin daunnc/crossbuild-pdal:latest ./sbt "project native" nativeCompile
+
+# Windows cross compilation
+# docker run -it --rm -v $PWD:/workdir -e CROSS_TRIPLE=win64 daunnc/crossbuild-pdal:latest ./sbt "project native" nativeCompile

scripts/docker/1.7.1/crossbuild/Dockerfile

@@ -15,4 +15,5 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-amd64
 
 RUN echo 'deb http://ftp.us.debian.org/debian/ unstable main contrib non-free' > /etc/apt/sources.list.d/debian-unstable.list
 
-RUN apt-get update && apt-get -y install pdal bash
+# https://tracker.debian.org/pkg/pdal
+RUN apt-get update && apt-get -y install pdal libpdal-dev bash

scripts/merge-native.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# --suffix: sets the suffix you want to publish lib with
+
+for i in "$@"
+do
+    case $i in
+        --suffix=*)
+            PDAL_VERSION_SUFFIX="${i#*=}"
+            shift
+            ;;
+        *)
+            ;;
+    esac
+done
+
+export PDAL_VERSION_SUFFIX=${PDAL_VERSION_SUFFIX-"-SNAPSHOT"}
+
+cd ./native/target
+rm -f ./pdal-native-1.7.0-SNAPSHOT.jar
+rm -rf ./tmp; mkdir -p ./tmp
+
+cd tmp; jar -xf ../pdal-native-x86_64-darwin-1.7.0-SNAPSHOT.jar; cd ~-
+cd tmp; jar -xf ../pdal-native-x86_64-linux-1.7.0-SNAPSHOT.jar; cd ~-
+
+jar -cvf pdal-native-1.7.0${PDAL_VERSION_SUFFIX}.jar -C tmp .
+
+cd ./tmp
+

scripts/pack-native.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# --suffix: sets the suffix you want to publish lib with
+
+for i in "$@"
+do
+    case $i in
+        --suffix=*)
+            PDAL_VERSION_SUFFIX="${i#*=}"
+            shift
+            ;;
+        *)
+            ;;
+    esac
+done
+
+export PDAL_VERSION_SUFFIX=${PDAL_VERSION_SUFFIX-"-SNAPSHOT"}
+
+echo $PDAL_VERSION_SUFFIX
+
+rm -rf ./native/target/native
+./sbt -J-Xmx2G "project native" package
+rm -rf ./native/target/native

scripts/publish-212.sh

@@ -30,4 +30,3 @@ fi
 
 PDAL_DEPEND_ON_NATIVE=false ./sbt "-212" "project core" ${COMMAND}
 PDAL_DEPEND_ON_NATIVE=false ./sbt "-212" "project core-scala" ${COMMAND}
-./sbt "-212" "project native" ${COMMAND}

scripts/publish-all.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
-./scripts/publish.sh "$@"
-./scripts/publish-212.sh "$@"
-./scripts/publish-javastyle.sh "$@"
+# ./scripts/publish.sh "$@"
+# ./scripts/publish-212.sh "$@"
+# ./scripts/publish-javastyle.sh "$@"
+./scripts/publish-native.sh "$@"