Merge pull request #99 from bzz/crosscompile-test-fix

HOTFIX for release profile on CI

Author: bzz

.travis.yml

@@ -34,29 +34,32 @@ jobs:
         - docker run --privileged -d -p 9432:9432 --name bblfsh bblfsh/bblfshd
         - docker exec -it bblfsh bblfshctl driver install --recommended
         - sudo apt-get update
-        - sudo apt-get install -y --no-install-recommends clang g++ gcc gcc-multilib libc6-dev libc6-dev-i386 mingw-w64 patch xz-utils
+        - sudo apt-get install -y --no-install-recommends g++ gcc gcc-multilib libc6-dev libc6-dev-i386 patch xz-utils
       script:
         - ./sbt assembly test
       after_failure: &failure_logs_anchor
         - docker logs bblfsh
 
-    - name: 'Cross-compile, release & publish to Sonatype'
+    - &release
+      name: 'Cross-compile, release & publish to Sonatype'
       stage: release
       env:
          - OSXCROSS_PATH="$HOME/osxcross"
       before_install:
+        - sudo apt-get install -y --no-install-recommends clang mingw-w64
+      install:
         - mkdir -p /tmp/osxcross
         - cd /tmp/osxcross
-        - curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" | tar -C /tmp/osxcross --strip=1 -xzf -
-        - curl -s -S -L -o tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz ${OSXCROSS_SDK_URL}
+        - curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" | tar -C "${PWD}" --strip=1 -xzf -
+        - curl -sSL -o tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz ${OSXCROSS_SDK_URL}
         - UNATTENDED=yes ./build.sh >/dev/null
         - mv target "${OSXCROSS_PATH}"
-        - curl -S -L "https://github.com/karalabe/xgo/blob/647f256c447ee20f9bf13ebc42e612d55994a383/docker/base/patch.tar.xz?raw=true" | xz -dc - | tar -xf -
+        - curl -sSL "https://github.com/karalabe/xgo/blob/647f256c447ee20f9bf13ebc42e612d55994a383/docker/base/patch.tar.xz?raw=true" | xz -dc - | tar -xf -
         - mv v1 "${OSXCROSS_PATH}/SDK/MacOSX${SDK_VERSION}.sdk/usr/include/c++/v1"
         - rm -rf /tmp/osxcross "${OSXCROSS_PATH}/SDK/MacOSX${SDK_VERSION}.sdk/usr/share/man"
       script:
         - cd $TRAVIS_BUILD_DIR
-        - ./sbt assembly
+        - ./sbt assembly || travis_terminate 1
         - ./sbt publishLocal
         - openssl aes-256-cbc -K $encrypted_97aef7f4ae04_key -iv $encrypted_97aef7f4ae04_iv -in key.asc.enc -out key.asc -d
         - gpg --no-default-keyring --primary-keyring ./project/.gnupg/pubring.gpg --secret-keyring ./project/.gnupg/secring.gpg --keyring ./project/.gnupg/pubring.gpg --fingerprint --import key.asc

build.sbt

@@ -111,10 +111,15 @@ getProtoFiles := {
 
 val getLibuast = TaskKey[Unit]("getLibuast", "Retrieve libuast")
 getLibuast := {
+    val os = if (System.getProperty("os.name").toLowerCase.contains("mac os x")) "darwin" else "linux"
+
+    downloadUnpackLibuast(os)
+}
+
+def downloadUnpackLibuast(os: String) = {
     import sys.process._
 
     val ghUrl = "https://github.com/bblfsh/libuast"
-    val os = if (System.getProperty("os.name").toLowerCase.contains("mac os x")) "darwin" else "linux"
     val binaryReleaseUrl = s"${ghUrl}/releases/download/v${libuastVersion}/libuast-${os}-amd64.tar.gz"
     println(s"Downloading libuast binary from ${binaryReleaseUrl}")
 
@@ -124,7 +129,8 @@ getLibuast := {
     "mkdir -p src/main/resources" #&&
     "rm -rf src/main/resources/libuast" #&&
     "mv libuast src/main/resources" #&&
-    "rm src/main/resources/libuast/libuast.so" #&& // always a static build
+    "rm -f src/main/resources/libuast/libuast.so" #&& // always a static build
+    "rm -f src/main/resources/libuast/libuast.dylib" #&&
     "rm libuast-bin.tar.gz" !
 
     "find src/main/resources"!
@@ -133,7 +139,7 @@ getLibuast := {
 
     "nm src/main/resources/libuast/libuast.a" #| "wc -l"!
 
-    println("Done unpacking libuast")
+    println(s"Done unpacking libuast for ${os}")
 }
 
 val compileScalaLibuast = TaskKey[Unit]("compileScalaLibuast", "Compile libScalaUast JNI library")
@@ -200,11 +206,13 @@ def crossCompileMacOS(sourceFiles: String): Unit = {
     return
   }
 
-  val cmd = osxHome + "/bin/o64-clang++-libc++ -shared -Wall -fPIC -O2 -lxml2 -std=c++11 " +
+  downloadUnpackLibuast("darwin")
+
+  val cmd = osxHome + "/bin/o64-clang++-libc++ -shared -Wall -fPIC -O2 -std=c++11 " +
       "-I" + osxHome + "/SDK/MacOSX10.11.sdk/usr/include/ " +
       "-I/usr/lib/jvm/java-8-openjdk-amd64/include " +
       "-I/usr/lib/jvm/java-8-openjdk-amd64/include/linux " +
-      "-Isrc/libuast-native/ " +
+      "-Isrc/main/resources/libuast " +
       "-o src/main/resources/lib/libscalauast.dylib " +
       sourceFiles +
       "src/main/resources/libuast/libuast.a "