jruby-launcher 1.0.1-java → 1.0.2-java
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +9 -4
- data/argnames.h +0 -1
- data/argparser.cpp +0 -8
- data/lib/jruby-launcher.rb +1 -1
- data/spec/launcher_spec.rb +1 -1
- metadata +3 -3
data/Rakefile
CHANGED
@@ -1,10 +1,15 @@
|
|
1
|
-
require 'spec/rake/spectask'
|
2
1
|
require 'rake/gempackagetask'
|
3
2
|
require 'date'
|
4
3
|
|
5
|
-
|
6
|
-
|
7
|
-
|
4
|
+
begin
|
5
|
+
require 'spec/rake/spectask'
|
6
|
+
Spec::Rake::SpecTask.new
|
7
|
+
task :default => :spec
|
8
|
+
rescue LoadError
|
9
|
+
task :default do
|
10
|
+
puts "rspec 1.3.0 or higher is not installed; skipping jruby-launcher specs"
|
11
|
+
end
|
12
|
+
end
|
8
13
|
|
9
14
|
file './lib/jruby-launcher.rb' => 'version.h' do |t|
|
10
15
|
version = nil
|
data/argnames.h
CHANGED
data/argparser.cpp
CHANGED
@@ -293,14 +293,6 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
|
|
293
293
|
javaOptions.push_back("-Djruby.management.enabled=true");
|
294
294
|
} else if (it->compare(ARG_NAME_HEADLESS) == 0) {
|
295
295
|
javaOptions.push_back("-Djava.awt.headless=true");
|
296
|
-
} else if (it->compare(ARG_NAME_PROFILE) == 0 ||
|
297
|
-
it->compare(ARG_NAME_PROFILE "-all") == 0) {
|
298
|
-
std::string filterType = it->length() == strlen(ARG_NAME_PROFILE) ? "ruby" : "all";
|
299
|
-
javaOptions.push_front("-Dprofile.properties=" + platformDir + "/lib/profile-" + filterType + ".properties");
|
300
|
-
javaOptions.push_front("-javaagent:" + platformDir + "/lib/profile.jar");
|
301
|
-
progArgs.push_back("-X+C");
|
302
|
-
noBootClassPath = true;
|
303
|
-
printToConsole("Running with instrumented profiler\n");
|
304
296
|
} else if (it->compare(ARG_NAME_NG) == 0) {
|
305
297
|
nailgunClient = true;
|
306
298
|
} else if (it->compare(ARG_NAME_NG_SERVER) == 0) {
|
data/lib/jruby-launcher.rb
CHANGED
data/spec/launcher_spec.rb
CHANGED
@@ -129,7 +129,7 @@ describe "JRuby native launcher" do
|
|
129
129
|
|
130
130
|
# JRUBY-4611
|
131
131
|
it "stops argument processing on first non-option argument" do
|
132
|
-
jruby_launcher_args("foo.rb --
|
132
|
+
jruby_launcher_args("foo.rb --sample")[-2..-1].should == ["foo.rb", "--sample"]
|
133
133
|
end
|
134
134
|
|
135
135
|
# JRUBY-4608
|
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
|
+
- 2
|
9
|
+
version: 1.0.2
|
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: 2010-
|
18
|
+
date: 2010-11-11 00:00:00 -06:00
|
19
19
|
default_executable:
|
20
20
|
dependencies: []
|
21
21
|
|