jruby-launcher 1.0.3-java → 1.0.4-java

data/lib/jruby-launcher.rb

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

data/spec/launcher_spec.rb

@@ -13,6 +13,16 @@ describe "JRuby native launcher" do
     jruby_launcher("-Xhelp 2>&1").should =~ /JRuby Launcher usage/
   end
 
+  it "should use $JAVACMD when JAVACMD is specified" do
+    with_environment "JAVACMD" => File.join("jato") do
+      if windows?
+        jruby_launcher_args("-v 2>&1").join.should =~ %r{jato}
+      else
+        jruby_launcher_args("-v").first.should == File.join("jato")
+      end
+    end
+  end
+
   it "should use $JAVA_HOME/bin/java when JAVA_HOME is specified" do
     with_environment "JAVA_HOME" => File.join("some", "java", "home") do
       if windows?

data/unixlauncher.cpp

@@ -38,12 +38,16 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
 
     string java("");
 
-    if (!jdkhome.empty()) {
-        java = jdkhome + "/bin/java";
-    } else if (getenv("JAVA_HOME") != NULL) {
-        java = string(getenv("JAVA_HOME")) + "/bin/java";
+    if (getenv("JAVACMD") != NULL) {
+        java = getenv("JAVACMD");
     } else {
-        java = findOnPath("java");
+        if (!jdkhome.empty()) {
+            java = jdkhome + "/bin/java";
+        } else if (getenv("JAVA_HOME") != NULL) {
+            java = string(getenv("JAVA_HOME")) + "/bin/java";
+        } else {
+            java = findOnPath("java");
+        }
     }
 
     if (java.empty()) {

data/version.h

@@ -1,11 +1,11 @@
 /*
- * Copyright 2009-2010 JRuby Team (www.jruby.org).
+ * Copyright 2009-2011 JRuby Team (www.jruby.org).
  */
 
 
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.3"
+#define JRUBY_LAUNCHER_VERSION "1.0.4"
 
 #endif // ! _VERSION_H_

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: java
 authors: 
 - Nick Sieger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -06:00
+date: 2011-01-10 00:00:00 -06:00
 default_executable: 
 dependencies: []