jruby-launcher 1.0.3-java → 1.0.4-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/jruby-launcher.rb +1 -1
- data/spec/launcher_spec.rb +10 -0
- data/unixlauncher.cpp +9 -5
- data/version.h +2 -2
- metadata +3 -3
data/lib/jruby-launcher.rb
CHANGED
data/spec/launcher_spec.rb
CHANGED
|
@@ -13,6 +13,16 @@ describe "JRuby native launcher" do
|
|
|
13
13
|
jruby_launcher("-Xhelp 2>&1").should =~ /JRuby Launcher usage/
|
|
14
14
|
end
|
|
15
15
|
|
|
16
|
+
it "should use $JAVACMD when JAVACMD is specified" do
|
|
17
|
+
with_environment "JAVACMD" => File.join("jato") do
|
|
18
|
+
if windows?
|
|
19
|
+
jruby_launcher_args("-v 2>&1").join.should =~ %r{jato}
|
|
20
|
+
else
|
|
21
|
+
jruby_launcher_args("-v").first.should == File.join("jato")
|
|
22
|
+
end
|
|
23
|
+
end
|
|
24
|
+
end
|
|
25
|
+
|
|
16
26
|
it "should use $JAVA_HOME/bin/java when JAVA_HOME is specified" do
|
|
17
27
|
with_environment "JAVA_HOME" => File.join("some", "java", "home") do
|
|
18
28
|
if windows?
|
data/unixlauncher.cpp
CHANGED
|
@@ -38,12 +38,16 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
|
|
|
38
38
|
|
|
39
39
|
string java("");
|
|
40
40
|
|
|
41
|
-
if (
|
|
42
|
-
java =
|
|
43
|
-
} else if (getenv("JAVA_HOME") != NULL) {
|
|
44
|
-
java = string(getenv("JAVA_HOME")) + "/bin/java";
|
|
41
|
+
if (getenv("JAVACMD") != NULL) {
|
|
42
|
+
java = getenv("JAVACMD");
|
|
45
43
|
} else {
|
|
46
|
-
|
|
44
|
+
if (!jdkhome.empty()) {
|
|
45
|
+
java = jdkhome + "/bin/java";
|
|
46
|
+
} else if (getenv("JAVA_HOME") != NULL) {
|
|
47
|
+
java = string(getenv("JAVA_HOME")) + "/bin/java";
|
|
48
|
+
} else {
|
|
49
|
+
java = findOnPath("java");
|
|
50
|
+
}
|
|
47
51
|
}
|
|
48
52
|
|
|
49
53
|
if (java.empty()) {
|
data/version.h
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* Copyright 2009-
|
|
2
|
+
* Copyright 2009-2011 JRuby Team (www.jruby.org).
|
|
3
3
|
*/
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
#ifndef _VERSION_H_
|
|
7
7
|
#define _VERSION_H_
|
|
8
8
|
|
|
9
|
-
#define JRUBY_LAUNCHER_VERSION "1.0.
|
|
9
|
+
#define JRUBY_LAUNCHER_VERSION "1.0.4"
|
|
10
10
|
|
|
11
11
|
#endif // ! _VERSION_H_
|
metadata
CHANGED
|
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
|
5
5
|
segments:
|
|
6
6
|
- 1
|
|
7
7
|
- 0
|
|
8
|
-
-
|
|
9
|
-
version: 1.0.
|
|
8
|
+
- 4
|
|
9
|
+
version: 1.0.4
|
|
10
10
|
platform: java
|
|
11
11
|
authors:
|
|
12
12
|
- Nick Sieger
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date:
|
|
18
|
+
date: 2011-01-10 00:00:00 -06:00
|
|
19
19
|
default_executable:
|
|
20
20
|
dependencies: []
|
|
21
21
|
|