Merge branch 'master' of [email protected]:jruby/jruby-launcher

Author: nicksieger

jvmlauncher.cpp

@@ -1,6 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
+ * Copyright 2009-2011 JRuby Team (www.jruby.org).
  * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
@@ -69,6 +70,14 @@ JvmLauncher::JvmLauncher(const JvmLauncher& orig) {
 JvmLauncher::~JvmLauncher() {
 }
 
+void JvmLauncher::setJavaCmd(const string cmdPath) {
+    javaExePath = cmdPath;
+    javaPath = "";
+    javawExePath = javaPath;
+    javaClientDllPath = javaPath;
+    javaServerDllPath = javaPath;
+}
+
 bool JvmLauncher::checkJava(const char *path, const char *prefix) {
     assert(path);
     assert(prefix);

jvmlauncher.h

@@ -1,7 +1,8 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 1997-2008, 2010 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009-2011 JRuby Team (www.jruby.org).
+ * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common
@@ -76,6 +77,7 @@ class JvmLauncher {
     void setSuppressConsole(bool val) {
         suppressConsole = val;
     }
+    void setJavaCmd(const std::string cmdPath);
 
 private:
     JvmLauncher(const JvmLauncher& orig);

lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

platformlauncher.cpp

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2009-2010 JRuby Team (www.jruby.org).
+ * Copyright 2009-2011 JRuby Team (www.jruby.org).
  * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
@@ -137,20 +137,30 @@ bool PlatformLauncher::start(char* argv[], int argc, DWORD *retCode, const char*
         }
     }
 
-    if (jdkhome.empty()) {
-        if (!jvmLauncher.initialize(REQ_JAVA_VERSION)) {
-            logErr(false, true, "Cannot find Java %s or higher.", REQ_JAVA_VERSION);
-            return false;
-        }
-    }
+    prepareOptions();
 
-    jvmLauncher.getJavaPath(jdkhome);
+    string java("");
 
-    prepareOptions();
+    if (getenv("JAVACMD") != NULL) {
+        java = getenv("JAVACMD");
+        jvmLauncher.setJavaCmd(java);
+        separateProcess = true;
+        suppressConsole = false;
+    } else {
+        if (jdkhome.empty()) {
+            if (!jvmLauncher.initialize(REQ_JAVA_VERSION)) {
+                logErr(false, true, "Cannot find Java %s or higher.", REQ_JAVA_VERSION);
+                return false;
+            }
+        }
+
+        jvmLauncher.getJavaPath(jdkhome);
+        java = jdkhome + "\\bin\\java";
+    }
 
     if (printCommandLine) {
         list<string> commandLine;
-        commandLine.push_back(jdkhome + "\\bin\\java");
+        commandLine.push_back(java);
         addOptionsToCommandLine(commandLine);
         for (list<string>::iterator it = commandLine.begin(); it != commandLine.end(); it++) {
             printf("%s\n", it->c_str());
@@ -179,6 +189,7 @@ bool PlatformLauncher::run(DWORD *retCode) {
     logMsg("Starting application...");
 
     jvmLauncher.setSuppressConsole(suppressConsole);
+
     bool rc = jvmLauncher.start(bootclass.c_str(), progArgs, javaOptions, separateProcess, retCode);
     if (!separateProcess) {
         exit(0);

platformlauncher.h

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2009-2010 JRuby Team (www.jruby.org).
+ * Copyright 2009-2011 JRuby Team (www.jruby.org).
  * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU

version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.4"
+#define JRUBY_LAUNCHER_VERSION "1.0.5"
 
 #endif // ! _VERSION_H_