v2: first round of code review addressed

Signed-off-by: Alexander Bezzubov <[email protected]>

Author: bzz

build.sbt

@@ -93,7 +93,7 @@ getProtoFiles := {
     println(s"Downloading and installing SDK$sdkMajor protocol buffer files...")
 
     val bblfshProto = s"${protoDir}/github.com/bblfsh"
-    val sdkProto = s"${bblfshProto}/sdk.${sdkMajor}"
+    val sdkProto = s"${bblfshProto}/sdk/${sdkMajor}"
 
     s"mkdir -p ${sdkProto}/protocol" !
 
@@ -121,7 +121,7 @@ getLibuast := {
     s"mv ${os}-amd64 libuast" #&&
     "rm -rf src/main/resources/libuast" #&&
     "mv libuast src/main/resources" #&&
-    "rm src/main/resources/libuast.so" #&&
+    "rm src/main/resources/libuast/libuast.so" #&& // always a static build
     "rm -rf libuast" #&&
     "rm libuast-bin.tar.gz" !
 }
@@ -156,7 +156,7 @@ def compileUnix(sourceFiles: String) = {
       "-I" + javaHome + "/include/ " +
       "-I" + javaHome + "/include/darwin " +
       "-Isrc/main/resources/libuast " +
-      "-Lsrc/main/resources/libuast " +
+      "-Lsrc/main/resources/libuast " + // sic, must be in the classpath for the test
       "-l uast " +
       "-o src/main/resources/lib/libscalauast.dylib " +
       sourceFiles + " "
@@ -191,8 +191,6 @@ def crossCompileMacOS(sourceFiles: String): Unit = {
   }
 
   val cmd = osxHome + "/bin/o64-clang++-libc++ -shared -Wall -fPIC -O2 -lxml2 -std=c++11 " +
-      "-I" + osxHome + "/SDK/MacOSX10.11.sdk/usr/include/libxml2/ " +
-      "-I" + osxHome + "/SDK/src/libuast-native/roles.c " +
       "-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 " +

src/main/native/org_bblfsh_client_v2_libuast_Libuast.cc

@@ -6,7 +6,9 @@
 #include "libuast.h"
 #include "libuast.hpp"
 
-JavaVM *jvm;  // FIXME(bzz): double-check and document
+// TODO(bzz): double-check and document. Suggestion and more context at
+// https://github.com/bblfsh/client-scala/pull/84#discussion_r288347756
+JavaVM *jvm;
 
 jobject asJvmBuffer(uast::Buffer buf) {
   JNIEnv *env = getJNIEnv();

src/main/scala/org/bblfsh/client/v2/BblfshClient.scala

@@ -100,7 +100,7 @@ class BblfshClient(host: String, port: Int, maxMsgSize: Int) {
 }
 
 object BblfshClient {
-  val DEFAULT_MAX_MSG_SIZE = 100 * 1024 * 1024
+  val DEFAULT_MAX_MSG_SIZE = 100 * 1024 * 1024 // bytes
 
   val PreOrder      = 0
   val PostOrder     = 1