Merge branch 'master' of github.com:jruby/jruby-launcher

Author: BanzaiMan

Makefile

@@ -27,10 +27,10 @@ jruby.res: resources/jruby.rc
 	windres $^ -O coff -o $@
 
 jruby.exe: jrubyexe.cpp nbexecloader.h utilsfuncs.cpp utilsfuncswin.cpp jruby.res
-	g++ $(CXXFLAGS) $^ -s -o $@ $(LDLIBSOPTIONS)
+	g++ $(CXXFLAGS) $^ -s -o $@ $(LDLIBSOPTIONS) -static
 
 jrubyw.exe: jrubyexe.cpp nbexecloader.h utilsfuncs.cpp utilsfuncswin.cpp jruby.res
-	g++ $(CXXFLAGS) -DJRUBYW -mwindows $^ -s -o $@ $(LDLIBSOPTIONS)
+	g++ $(CXXFLAGS) -DJRUBYW -mwindows $^ -s -o $@ $(LDLIBSOPTIONS) -static
 
 install:
 	@if [ ! -f ./jruby ]; then echo "Please run 'make' first."; exit 1; fi

argparser.cpp

@@ -391,12 +391,14 @@ void ArgParser::prepareOptions() {
 
     option = OPT_JFFI_PATH;
 #ifdef WIN32
-    option += (platformDir + "\\lib\\native\\i386-Windows;"
+    option += (platformDir + "\\lib\\native;"
+            + platformDir + "\\lib\\native\\i386-Windows;"
             + platformDir + "\\lib\\native\\x86_64-Windows");
 #else
     struct utsname name;
     if (uname(&name) == 0) {
-        string ffiPath, ffiBase(platformDir + "/lib/native");
+        string ffiBase(platformDir + "/lib/native");
+        string ffiPath = ffiBase;
         DIR* dir = opendir(ffiBase.c_str());
         struct dirent* ent;
         if (dir != NULL) {
@@ -496,6 +498,14 @@ void ArgParser::constructBootClassPath() {
         addToBootClassPath(jruby_complete_jar.c_str());
     }
 
+#ifdef DISTRO_BOOT_CLASS_PATH
+// hack converting macro to string
+#define STR_HACK2(x) #x
+#define STR_HACK(x) STR_HACK2(x)
+    addToBootClassPath(STR_HACK(DISTRO_BOOT_CLASS_PATH));
+#endif
+
+
     logMsg("BootclassPath: %s", bootClassPath.c_str());
 }
 

inc/Makefile-conf.mk

@@ -64,7 +64,7 @@ WINDRES = windres
 LDLIBSOPTIONS = -lstdc++
 
 ifdef MINGW
-LDLIBSOPTIONS += -lws2_32 -static-libgcc -Wl,--enable-auto-import -Wl,-Bstatic -Wl,-Bdynamic
+LDLIBSOPTIONS += -lws2_32 -static-libgcc -Wl,--enable-auto-import -Wl,-Bstatic -Wl,-Bdynamic -static
 PROGRAM = jruby.dll
 else
 PROGRAM = jruby

jvmlauncher.cpp

@@ -78,33 +78,30 @@ void JvmLauncher::setJavaCmd(const string cmdPath) {
     javaServerDllPath = javaPath;
 }
 
-bool JvmLauncher::checkJava(const char *path, const char *prefix) {
-    assert(path);
+bool JvmLauncher::checkJava(std::string &path, const char *prefix) {
     assert(prefix);
-    logMsg("checkJava('%s', '%s')", path, prefix);
+    logMsg("checkJava('%s', '%s')", path.c_str(), prefix);
 
-    std::string tmp(path);
-    
-    if (*tmp.rbegin() == '\\') {
-        tmp.erase(tmp.length() - 1, 1);
+    if (*path.rbegin() == '\\') {
+        path.erase(path.length() - 1, 1);
     }
-    javaExePath = tmp + prefix + JAVA_EXE_FILE;
-    javawExePath = tmp + prefix + JAVAW_EXE_FILE;
-    javaClientDllPath = tmp + prefix + JAVA_CLIENT_DLL_FILE;
-    javaServerDllPath = tmp + prefix + JAVA_SERVER_DLL_FILE;
+    javaExePath = path + prefix + JAVA_EXE_FILE;
+    javawExePath = path + prefix + JAVAW_EXE_FILE;
+    javaClientDllPath = path + prefix + JAVA_CLIENT_DLL_FILE;
+    javaServerDllPath = path + prefix + JAVA_SERVER_DLL_FILE;
     if (!fileExists(javaClientDllPath.c_str())) {
         javaClientDllPath = "";
     }
     if (!fileExists(javaServerDllPath.c_str())) {
         javaServerDllPath = "";
     }
-    javaBinPath = tmp + prefix + JAVA_BIN_DIR;
+    javaBinPath = path + prefix + JAVA_BIN_DIR;
     if (fileExists(javaExePath.c_str()) || !javaClientDllPath.empty() || !javaServerDllPath.empty()) {
         if (!fileExists(javawExePath.c_str())) {
             logMsg("javaw.exe not exists, forcing java.exe");
             javawExePath = javaExePath;
         }
-        javaPath = tmp;
+        javaPath = path;
         return true;
     }
 
@@ -119,10 +116,13 @@ bool JvmLauncher::checkJava(const char *path, const char *prefix) {
 bool JvmLauncher::initialize(const char *javaPathOrMinVersion) {
     logMsg("JvmLauncher::initialize()\n\tjavaPathOrMinVersion: %s", javaPathOrMinVersion);
     assert(javaPathOrMinVersion);
+    
+    std::string pathOrVersion(javaPathOrMinVersion);
+    
     if (isVersionString(javaPathOrMinVersion)) {
         return findJava(javaPathOrMinVersion);
     } else {
-        return (checkJava(javaPathOrMinVersion, JAVA_JRE_PREFIX) || checkJava(javaPathOrMinVersion, ""));
+        return (checkJava(pathOrVersion, JAVA_JRE_PREFIX) || checkJava(pathOrVersion, ""));
     }
 }
 
@@ -446,7 +446,7 @@ bool JvmLauncher::findJava(const char *javaKey, const char *prefix, const char *
                 if (*path.rbegin() == '\\') {
                     path.erase(path.length() - 1, 1);
                 }
-                return checkJava(path.c_str(), prefix);
+                return checkJava(path, prefix);
             }
         }
     }

jvmlauncher.h

@@ -82,7 +82,7 @@ class JvmLauncher {
 private:
     JvmLauncher(const JvmLauncher& orig);
 
-    bool checkJava(const char *javaPath, const char *prefix);
+    bool checkJava(std::string &javaPath, const char *version);
     bool findJava(const char *minJavaVersion);
     bool findJava(const char *javaKey, const char *prefix, const char *minJavaVersion);
     bool startOutProcJvm(const char *mainClassName, std::list<std::string> args, std::list<std::string> options, DWORD *retCode);

lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.16"
+  VERSION = "1.0.17.dev"
 end

platformlauncher.cpp

@@ -220,10 +220,10 @@ bool PlatformLauncher::checkJDKHome() {
         logMsg("-Xjdkhome is not set, checking for %%JAVA_HOME%%...");
         char *origJavaHome = getenv("JAVA_HOME");
         if (origJavaHome) {
-            const char *javaHome = trimTrailingBackslashes(origJavaHome).c_str();
-            logMsg("%%JAVA_HOME%% is set: %s", javaHome);
-            if (!jvmLauncher.initialize(javaHome)) {
-                logMsg("ERROR: Cannot locate java installation, specified by JAVA_HOME: %s", javaHome);
+            string javaHome = trimTrailingBackslashes(origJavaHome);
+            logMsg("%%JAVA_HOME%% is set: %s", javaHome.c_str());
+            if (!jvmLauncher.initialize(javaHome.c_str())) {
+                logMsg("ERROR: Cannot locate java installation, specified by JAVA_HOME: %s", javaHome.c_str());
                 string errMsg = "Cannot locate Java installation, specified by JAVA_HOME:\n";
                 errMsg += javaHome;
                 string errMsgFull = errMsg + "\nDo you want to try to use default version?";