Merge pull request #3648 from jruby/truffle-tool-launcher

[Truffle] New tool launcher.
jruby · Feb 5, 2016 · a68de33 · a68de33
2 parents 6566953 + 8fd2998
commit a68de33
Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/bin/jruby+truffle b/bin/jruby+truffle
@@ -1,6 +1,3 @@
 #!/usr/bin/env bash
-"exec" "`dirname $BASH_SOURCE[0]`/jruby" "$0" "$@"
 
-require File.join(JRuby.runtime.instance_config.jruby_home, 'lib/ruby/truffle/jruby+truffle/runner')
-
-JRubyTruffleRunner.new
+exec `dirname $BASH_SOURCE[0]`/jruby `dirname $BASH_SOURCE[0]`/../lib/ruby/truffle/jruby+truffle/bin/jruby+truffle "$@"
diff --git a/lib/ruby/truffle/jruby+truffle/bin/jruby+truffle b/lib/ruby/truffle/jruby+truffle/bin/jruby+truffle
@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/runner.rb'
+
+JRubyTruffleRunner.new
diff --git a/lib/ruby/truffle/jruby+truffle/runner.rb → lib/ruby/truffle/jruby+truffle/lib/runner.rb b/lib/ruby/truffle/jruby+truffle/runner.rb → lib/ruby/truffle/jruby+truffle/lib/runner.rb