[GR-32802] Use bin/jt wrapper for tool/jt.rb, so $SYSTEM_RUBY is used to run jt

PullRequest: truffleruby/2832

Author: eregon

.spin/bin/env

@@ -6,6 +6,9 @@ export JT_ENV=jvm-ce
 
 unset JAVA_HOME
 
+# Use CRuby to run jt
+export SYSTEM_RUBY=$(which ruby)
+
 function jt {
-  ruby "$TRUFFLERUBY_DIR"/tool/jt.rb "$@"
+  "$TRUFFLERUBY_DIR"/bin/jt "$@"
 }

ci.jsonnet

@@ -28,7 +28,7 @@ local common = (import "common.json");
 # All used objects used to compose a build are listed
 # where build is defined, there are no other objects in the middle.
 local part_definitions = {
-  local jt = function(args) [["ruby", "tool/jt.rb"] + args],
+  local jt = function(args) [["bin/jt"] + args],
   local mri_path = function(version) "/cm/shared/apps/ruby/" + version + "/bin/ruby",
   local mri_version = "2.7.2",
 

doc/contributor/workflow.md

@@ -33,14 +33,15 @@ cd truffleruby
 We then use a Ruby script to run most commands.
 
 ```bash
-ruby tool/jt.rb --help
+bin/jt --help
 ```
 
 Most of us add an alias to our shell profile file so that it can be run with
-just `jt`. To allow this to run from any path, add this to your `.bash_profile`:
+just `jt`. To allow this to run from any path, add this to your `~/.bash_profile`:
 
 ```bash
-echo 'alias jt=/path/to/mri/bin/ruby /path/to/truffleruby/tool/jt.rb' >> ~/.bash_profile
+export SYSTEM_RUBY=/path/to/mri/bin/ruby
+alias jt=/path/to/truffleruby/bin/jt
 ```
 
 ```bash

mx.truffleruby/mx_truffleruby.py

@@ -118,7 +118,7 @@ def contents(self, result):
 
 def jt(*args):
     mx.log("\n$ " + ' '.join(['jt'] + list(args)) + "\n")
-    mx.run(['ruby', join(root, 'tool/jt.rb')] + list(args))
+    mx.run([join(root, 'bin/jt')] + list(args))
 
 def build_truffleruby(args):
     mx.command_function('sversions')([])
@@ -159,9 +159,9 @@ def ruby_check_heap_dump(input_args, out=None):
         raise Exception("heap dump check failed")
 
 def ruby_run_ruby(args):
-    """run TruffleRuby (through tool/jt.rb)"""
+    """run TruffleRuby (through bin/jt)"""
 
-    jt = join(root, 'tool/jt.rb')
+    jt = join(root, 'bin/jt')
     os.execlp(jt, jt, "ruby", *args)
 
 def ruby_run_specs(ruby, args):

test/truffle/common.sh.inc

@@ -63,4 +63,4 @@ function test_server {
 
 shopt -s expand_aliases
 # shellcheck disable=SC2139
-alias jt="$repo/tool/jt.rb"
+alias jt="$repo/bin/jt"

tool/bisect.rb

@@ -18,7 +18,7 @@
 
 def jt(cmd)
   puts "jt #{cmd}"
-  cmd = "ruby tool/jt.rb #{cmd}"
+  cmd = "bin/jt #{cmd}"
   output = `#{cmd}`
   raise "#{cmd} failed: #{$?}" unless $?.success?
   output

tool/hooks/lint-check.sh

@@ -11,7 +11,7 @@
 filename=$(basename "${BASH_SOURCE[0]}")
 
 case "$filename" in
-  pre-commit)   exec tool/jt.rb lint fast HEAD ;;
-  post-commit)  exec tool/jt.rb lint fast HEAD^ ;;
-  pre-push)     exec tool/jt.rb lint fast origin/master ;;
+  pre-commit)   exec bin/jt lint fast HEAD ;;
+  post-commit)  exec bin/jt lint fast HEAD^ ;;
+  pre-push)     exec bin/jt lint fast origin/master ;;
 esac

tool/java-coverage/coverage.sh

@@ -12,5 +12,5 @@ JACOCO_AGENT=$(pwd)/jacoco-agent.jar
 JACOCO_LOG=$(pwd)/jacoco.exec
 
 rm -f jacoco.exec
-tool/jt.rb test "--vm.javaagent:$JACOCO_AGENT=destfile=$JACOCO_LOG"
+bin/jt test "--vm.javaagent:$JACOCO_AGENT=destfile=$JACOCO_LOG"
 ant -f tool/java-coverage/build.xml

tool/jt.rb

@@ -19,8 +19,9 @@
 
 if RUBY_ENGINE != 'ruby' && !RUBY_DESCRIPTION.include?('Native')
   STDERR.puts 'WARNING: jt is not running on MRI or TruffleRuby Native, startup is slow'
-  STDERR.puts '  Consider using following bash alias to run on MRI.'
-  STDERR.puts '  `alias jt=/path/to/mri/bin/ruby /path/to/truffleruby/tool/jt.rb`'
+  STDERR.puts '  Consider adding this to your `~/.bash_profile` to run jt on MRI.'
+  STDERR.puts '    export SYSTEM_RUBY=/path/to/mri/bin/ruby'
+  STDERR.puts '    alias jt=/path/to/truffleruby/bin/jt'
 end
 
 abort "ERROR: jt requires Ruby 2.3 and above, was #{RUBY_VERSION}" if (RUBY_VERSION.split('.').map(&:to_i) <=> [2, 3, 0]) < 0

tool/make-standalone-distribution.sh

@@ -10,16 +10,16 @@ set -e
 set -x
 
 # Build
-tool/jt.rb build --env native
+bin/jt build --env native
 
-standalone=$(tool/jt.rb mx --env native standalone-home ruby)
+standalone=$(bin/jt mx --env native standalone-home ruby)
 release_home="$PWD/mxbuild/truffleruby-standalone"
 rm -rf "$release_home"
 cp -R "$standalone" "$release_home"
 # Clean build results to make sure nothing refers to them while testing
-tool/jt.rb mx --env native clean
+bin/jt mx --env native clean
 rm -rf ../graal/sdk/mxbuild
-rm -rf bin lib src
+rm -rf exe lib src
 
 # Test the post-install hook
 TRUFFLERUBY_RECOMPILE_OPENSSL=true "$release_home/lib/truffle/post_install_hook.sh"
@@ -30,5 +30,5 @@ TRUFFLERUBY_RECOMPILE_OPENSSL=true "$release_home/lib/truffle/post_install_hook.
 "$release_home/bin/ruby" -v
 
 # Run all specs
-tool/jt.rb -u "$release_home/bin/truffleruby" test :all
-tool/jt.rb -u "$release_home/bin/truffleruby" test :next
+bin/jt -u "$release_home/bin/truffleruby" test :all
+bin/jt -u "$release_home/bin/truffleruby" test :next