Give up on using JIP to profile and pass --profile argument through to JRuby for new instrumented profiler.

Author: headius

Rakefile

@@ -1,10 +1,15 @@
-require 'spec/rake/spectask'
 require 'rake/gempackagetask'
 require 'date'
 
-Spec::Rake::SpecTask.new
-
-task :default => :spec
+begin
+  require 'spec/rake/spectask'
+  Spec::Rake::SpecTask.new
+  task :default => :spec
+rescue LoadError
+  task :default do
+    puts "rspec 1.3.0 or higher is not installed; skipping jruby-launcher specs"
+  end
+end
 
 file './lib/jruby-launcher.rb' => 'version.h' do |t|
   version = nil

argnames.h

@@ -27,7 +27,6 @@
 #define ARG_NAME_SAMPLE "--sample"
 #define ARG_NAME_MANAGE "--manage"
 #define ARG_NAME_HEADLESS "--headless"
-#define ARG_NAME_PROFILE "--profile"
 #define ARG_NAME_NG_SERVER "--ng-server"
 #define ARG_NAME_NG "--ng"
 

argparser.cpp

@@ -293,14 +293,6 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
             javaOptions.push_back("-Djruby.management.enabled=true");
         } else if (it->compare(ARG_NAME_HEADLESS) == 0) {
             javaOptions.push_back("-Djava.awt.headless=true");
-        } else if (it->compare(ARG_NAME_PROFILE) == 0 ||
-                it->compare(ARG_NAME_PROFILE "-all") == 0) {
-            std::string filterType = it->length() == strlen(ARG_NAME_PROFILE) ? "ruby" : "all";
-            javaOptions.push_front("-Dprofile.properties=" + platformDir + "/lib/profile-" + filterType + ".properties");
-            javaOptions.push_front("-javaagent:" + platformDir + "/lib/profile.jar");
-            progArgs.push_back("-X+C");
-            noBootClassPath = true;
-            printToConsole("Running with instrumented profiler\n");
         } else if (it->compare(ARG_NAME_NG) == 0) {
             nailgunClient = true;
         } else if (it->compare(ARG_NAME_NG_SERVER) == 0) {

lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

spec/launcher_spec.rb

@@ -129,7 +129,7 @@
 
   # JRUBY-4611
   it "stops argument processing on first non-option argument" do
-    jruby_launcher_args("foo.rb --profile")[-2..-1].should == ["foo.rb", "--profile"]
+    jruby_launcher_args("foo.rb --sample")[-2..-1].should == ["foo.rb", "--sample"]
   end
 
   # JRUBY-4608