Fix JNI path to work with old and new location, bump to 1.0.18.

Author: headius

argparser.cpp

@@ -12,6 +12,7 @@
 #include "argparser.h"
 #include "argnames.h"
 #include "version.h"
+#include "sys/stat.h"
 
 #ifndef WIN32
 #include <sys/types.h>
@@ -394,14 +395,31 @@ void ArgParser::prepareOptions() {
     javaOptions.push_back(option);
 
     option = OPT_JFFI_PATH;
+
+    string jniDir;
+#ifdef WIN32
+    string newJniDir = platformDir + "\\lib\\jni";
+    string oldJniDir = platformDir + "\\lib\\native";
+#else
+    string newJniDir = platformDir + "/lib/jni";
+    string oldJniDir = platformDir + "/lib/native";
+#endif
+
+    struct stat jniDirStat;
+    if (stat(newJniDir.c_str(), &jniDirStat) == 0) {
+        jniDir = newJniDir;
+    } else {
+        jniDir = oldJniDir;
+    }
+
 #ifdef WIN32
-    option += (platformDir + "\\lib\\jni;"
-            + platformDir + "\\lib\\jni\\i386-Windows;"
-            + platformDir + "\\lib\\jni\\x86_64-Windows");
+    option += (jniDir + ";"
+            + jniDir + "\\i386-Windows;"
+            + jniDir + "\\x86_64-Windows");
 #else
     struct utsname name;
     if (uname(&name) == 0) {
-        string ffiBase(platformDir + "/lib/jni");
+        string ffiBase(jniDir);
         string ffiPath = ffiBase;
         DIR* dir = opendir(ffiBase.c_str());
         struct dirent* ent;

lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.18.pre1"
+  VERSION = "1.0.18"
 end

version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.18.pre1"
+#define JRUBY_LAUNCHER_VERSION "1.0.18"
 
 #endif // ! _VERSION_H_