[Truffle] make j+tr part of the distribution

jruby · Oct 23, 2015 · dad7f08 · dad7f08
1 parent 4356b8e
commit dad7f08
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 39 deletions.
diff --git a/bin/jruby+truffle b/bin/jruby+truffle
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+begin
+  require 'jruby+truffle/runner'
+rescue LoadError
+  require_relative '../lib/ruby/stdlib/jruby+truffle/runner'
+end
+
+JRubyTruffleRunner.new
diff --git a/bin/jruby+truffle.bat b/bin/jruby+truffle.bat
@@ -0,0 +1 @@
+echo Windows is not yet supported by jruby+truffle.
diff --git a/tool/truffle/jruby_truffle_runner/README.md → lib/ruby/stdlib/jruby+truffle/README.md b/tool/truffle/jruby_truffle_runner/README.md → lib/ruby/stdlib/jruby+truffle/README.md
diff --git a/...ner/gem_configurations/activesupport.yaml → ...fle/gem_configurations/activesupport.yaml b/...ner/gem_configurations/activesupport.yaml → ...fle/gem_configurations/activesupport.yaml
diff --git a/...r/gem_configurations/concurrent-ruby.yaml → ...e/gem_configurations/concurrent-ruby.yaml b/...r/gem_configurations/concurrent-ruby.yaml → ...e/gem_configurations/concurrent-ruby.yaml
diff --git a/...ruffle_runner/gem_configurations/psd.yaml → ...jruby+truffle/gem_configurations/psd.yaml b/...ruffle_runner/gem_configurations/psd.yaml → ...jruby+truffle/gem_configurations/psd.yaml
diff --git a/...ruffle_runner/lib/jruby+truffle_runner.rb → lib/ruby/stdlib/jruby+truffle/runner.rb b/...ruffle_runner/lib/jruby+truffle_runner.rb → lib/ruby/stdlib/jruby+truffle/runner.rb
@@ -206,7 +206,7 @@ def load_local_yaml_configuration
       if candidates.size == 1
         gem_name, _ = candidates.first.split('.')
 
-        default_configuration_file_path = File.dirname(__FILE__) + "/../gem_configurations/#{gem_name}.yaml"
+        default_configuration_file_path = File.dirname(__FILE__) + "gem_configurations/#{gem_name}.yaml"
         if File.exist?(default_configuration_file_path)
           puts "Copying default #{LOCAL_CONFIG_FILE} for #{gem_name}."
           FileUtils.cp default_configuration_file_path, LOCAL_CONFIG_FILE
@@ -358,7 +358,7 @@ def subcommand_clean(vm_options, rest)
   end
 
   def subcommand_readme(vm_options, rest)
-    readme_path = File.join File.dirname(__FILE__), '..', 'README.md'
+    readme_path = File.join File.dirname(__FILE__), 'README.md'
     puts File.read(readme_path)
   end
 

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -207,7 +207,6 @@ def help
     puts 'jt findbugs                                    run findbugs'
     puts 'jt findbugs report                             run findbugs and generate an HTML report'
     puts 'jt install ..../graal/mx/suite.py              install a JRuby distribution into an mx suite'
-    puts 'jt install-tool                                install the jruby+truffle tool for working with Ruby gems'
     puts
     puts 'you can also put build or rebuild in front of any command'
     puts
@@ -491,21 +490,6 @@ def install(arg)
     end
   end
 
-  def install_tool
-    Dir.chdir(JRUBY_DIR) do
-      Dir.chdir('tool/truffle/jruby_truffle_runner') do
-        raw_sh('gem', 'build', 'jruby+truffle_runner.gemspec')
-        raw_sh('gem', 'install', 'jruby+truffle_runner-0.0.1.gem')
-
-        begin
-          system('rbenv', 'rehash')
-        rescue
-        end
-      end
-    end
-  end
-
-  alias_method :"install-tool", :install_tool
 end
 
 class JT

diff --git a/tool/truffle/jruby_truffle_runner/bin/jruby+truffle b/tool/truffle/jruby_truffle_runner/bin/jruby+truffle
diff --git a/tool/truffle/jruby_truffle_runner/jruby+truffle_runner.gemspec b/tool/truffle/jruby_truffle_runner/jruby+truffle_runner.gemspec