jruby-launcher 1.0.7-java → 1.0.8-java
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +5 -3
- data/argparser.cpp +4 -5
- data/lib/jruby-launcher.rb +1 -1
- data/spec/launcher_spec.rb +7 -0
- data/spec/spec_helper.rb +2 -2
- data/version.h +1 -1
- metadata +51 -57
data/Rakefile
CHANGED
@@ -2,12 +2,14 @@ require 'rake/gempackagetask'
|
|
2
2
|
require 'date'
|
3
3
|
|
4
4
|
begin
|
5
|
-
|
6
|
-
|
5
|
+
gem 'rspec'
|
6
|
+
require 'rspec/core/rake_task'
|
7
|
+
desc "Runs Java Integration Specs"
|
8
|
+
RSpec::Core::RakeTask.new
|
7
9
|
task :default => :spec
|
8
10
|
rescue LoadError
|
9
11
|
task :default do
|
10
|
-
puts "rspec
|
12
|
+
puts "rspec 2.0.0 or higher is not installed; skipping jruby-launcher specs"
|
11
13
|
end
|
12
14
|
end
|
13
15
|
|
data/argparser.cpp
CHANGED
@@ -226,6 +226,9 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
|
|
226
226
|
javaOptions.push_back("-Dfile.encoding=UTF-8");
|
227
227
|
}
|
228
228
|
#endif
|
229
|
+
if (getenv("VERIFY_JRUBY") != NULL) {
|
230
|
+
noBootClassPath = true;
|
231
|
+
}
|
229
232
|
|
230
233
|
addToArgList(args, argc, argv);
|
231
234
|
|
@@ -356,11 +359,7 @@ void ArgParser::prepareOptions() {
|
|
356
359
|
#ifdef WIN32
|
357
360
|
option += "cmd.exe";
|
358
361
|
#else
|
359
|
-
|
360
|
-
if (shell == NULL) {
|
361
|
-
shell = "/bin/sh";
|
362
|
-
}
|
363
|
-
option += shell;
|
362
|
+
option += "/bin/sh";
|
364
363
|
#endif
|
365
364
|
javaOptions.push_back(option);
|
366
365
|
|
data/lib/jruby-launcher.rb
CHANGED
data/spec/launcher_spec.rb
CHANGED
@@ -179,6 +179,13 @@ describe "JRuby native launcher" do
|
|
179
179
|
args.grep(/Xbootclasspath/).should be_empty
|
180
180
|
end
|
181
181
|
|
182
|
+
it "should put JRuby on regular classpath when VERIFY_JRUBY is set" do
|
183
|
+
with_environment "VERIFY_JRUBY" => "true" do
|
184
|
+
args = jruby_launcher_args("-e true")
|
185
|
+
args.grep(/Xbootclasspath/).should be_empty
|
186
|
+
end
|
187
|
+
end
|
188
|
+
|
182
189
|
# JRUBY-4709
|
183
190
|
it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
|
184
191
|
jruby_launcher_args("-Xnobootclasspath -e true").grep(/java\.class\.path/).first.should =~
|
data/spec/spec_helper.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
require '
|
1
|
+
require 'rspec'
|
2
2
|
require 'rbconfig'
|
3
3
|
require 'fileutils'
|
4
4
|
|
@@ -60,7 +60,7 @@ module JRubyLauncherHelper
|
|
60
60
|
end
|
61
61
|
end
|
62
62
|
|
63
|
-
|
63
|
+
RSpec.configure do |config|
|
64
64
|
config.before(:all) do
|
65
65
|
JRubyLauncherHelper.check_executable_built
|
66
66
|
# clear environment for better control
|
data/version.h
CHANGED
metadata
CHANGED
@@ -1,68 +1,64 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jruby-launcher
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
prerelease:
|
5
|
-
|
6
|
-
- 1
|
7
|
-
- 0
|
8
|
-
- 7
|
9
|
-
version: 1.0.7
|
4
|
+
prerelease:
|
5
|
+
version: 1.0.8
|
10
6
|
platform: java
|
11
7
|
authors:
|
12
|
-
- Nick Sieger
|
13
|
-
- Vladimir Sizikov
|
8
|
+
- Nick Sieger
|
9
|
+
- Vladimir Sizikov
|
14
10
|
autorequire:
|
15
11
|
bindir: bin
|
16
12
|
cert_chain: []
|
17
13
|
|
18
|
-
date: 2011-
|
14
|
+
date: 2011-08-15 00:00:00 -05:00
|
19
15
|
default_executable:
|
20
16
|
dependencies: []
|
21
17
|
|
22
18
|
description: Builds and installs a native launcher for JRuby on your system
|
23
19
|
email:
|
24
|
-
- nick@nicksieger.com
|
25
|
-
- vsizikov@gmail.com
|
20
|
+
- nick@nicksieger.com
|
21
|
+
- vsizikov@gmail.com
|
26
22
|
executables: []
|
27
23
|
|
28
24
|
extensions:
|
29
|
-
- extconf.rb
|
25
|
+
- extconf.rb
|
30
26
|
extra_rdoc_files: []
|
31
27
|
|
32
28
|
files:
|
33
|
-
- COPYING
|
34
|
-
- README.txt
|
35
|
-
- Makefile
|
36
|
-
- Rakefile
|
37
|
-
- ng.c
|
38
|
-
- strlcpy.c
|
39
|
-
- argparser.cpp
|
40
|
-
- jruby.cpp
|
41
|
-
- jrubyexe.cpp
|
42
|
-
- jvmlauncher.cpp
|
43
|
-
- platformlauncher.cpp
|
44
|
-
- unixlauncher.cpp
|
45
|
-
- utilsfuncs.cpp
|
46
|
-
- utilsfuncswin.cpp
|
47
|
-
- argnames.h
|
48
|
-
- argparser.h
|
49
|
-
- jvmlauncher.h
|
50
|
-
- nbexecloader.h
|
51
|
-
- platformlauncher.h
|
52
|
-
- rb_w32_cmdvector.h
|
53
|
-
- unixlauncher.h
|
54
|
-
- utilsfuncs.h
|
55
|
-
- version.h
|
56
|
-
- inc/Makefile-conf.mk
|
57
|
-
- inc/Makefile-impl.mk
|
58
|
-
- inc/Makefile-rules.mk
|
59
|
-
- extconf.rb
|
60
|
-
- lib/jruby-launcher.rb
|
61
|
-
- lib/rubygems/defaults/jruby_native.rb
|
62
|
-
- spec/launcher_spec.rb
|
63
|
-
- spec/spec_helper.rb
|
64
|
-
- resources/jruby.ico
|
65
|
-
- resources/jruby.rc
|
29
|
+
- COPYING
|
30
|
+
- README.txt
|
31
|
+
- Makefile
|
32
|
+
- Rakefile
|
33
|
+
- ng.c
|
34
|
+
- strlcpy.c
|
35
|
+
- argparser.cpp
|
36
|
+
- jruby.cpp
|
37
|
+
- jrubyexe.cpp
|
38
|
+
- jvmlauncher.cpp
|
39
|
+
- platformlauncher.cpp
|
40
|
+
- unixlauncher.cpp
|
41
|
+
- utilsfuncs.cpp
|
42
|
+
- utilsfuncswin.cpp
|
43
|
+
- argnames.h
|
44
|
+
- argparser.h
|
45
|
+
- jvmlauncher.h
|
46
|
+
- nbexecloader.h
|
47
|
+
- platformlauncher.h
|
48
|
+
- rb_w32_cmdvector.h
|
49
|
+
- unixlauncher.h
|
50
|
+
- utilsfuncs.h
|
51
|
+
- version.h
|
52
|
+
- inc/Makefile-conf.mk
|
53
|
+
- inc/Makefile-impl.mk
|
54
|
+
- inc/Makefile-rules.mk
|
55
|
+
- extconf.rb
|
56
|
+
- lib/jruby-launcher.rb
|
57
|
+
- lib/rubygems/defaults/jruby_native.rb
|
58
|
+
- spec/launcher_spec.rb
|
59
|
+
- spec/spec_helper.rb
|
60
|
+
- resources/jruby.ico
|
61
|
+
- resources/jruby.rc
|
66
62
|
has_rdoc: true
|
67
63
|
homepage: http://jruby.org
|
68
64
|
licenses: []
|
@@ -71,25 +67,23 @@ post_install_message:
|
|
71
67
|
rdoc_options: []
|
72
68
|
|
73
69
|
require_paths:
|
74
|
-
- lib
|
70
|
+
- lib
|
75
71
|
required_ruby_version: !ruby/object:Gem::Requirement
|
72
|
+
none: false
|
76
73
|
requirements:
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
- 0
|
81
|
-
version: "0"
|
74
|
+
- - ">="
|
75
|
+
- !ruby/object:Gem::Version
|
76
|
+
version: "0"
|
82
77
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
78
|
+
none: false
|
83
79
|
requirements:
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
- 0
|
88
|
-
version: "0"
|
80
|
+
- - ">="
|
81
|
+
- !ruby/object:Gem::Version
|
82
|
+
version: "0"
|
89
83
|
requirements: []
|
90
84
|
|
91
85
|
rubyforge_project: jruby-extras
|
92
|
-
rubygems_version: 1.
|
86
|
+
rubygems_version: 1.5.1
|
93
87
|
signing_key:
|
94
88
|
specification_version: 3
|
95
89
|
summary: Native launcher for JRuby
|