Skip to content

[GR-17457] Fix Maven description of org.graalvm.ruby:ruby-language #3896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2025
Merged

[GR-17457] Fix Maven description of org.graalvm.ruby:ruby-language #3896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cf7b9f
Fix Maven description of org.graalvm.ruby:ruby-language
eregon Jun 10, 2025
ebee4e6
jt: set @mx_env and @ruby_name early so they are always set
eregon Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mx.truffleruby/suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
"truffle:TRUFFLE_NFI_PANAMA",
"sulong:SULONG_NATIVE",
],
"description": "Core module of Ruby on Truffle",
"description": "TruffleRuby, a high-performance embeddable Ruby implementation. This artifact includes the core language runtime without standard libraries. It is not recommended to depend on this artifact directly. Instead, use \'org.graalvm.polyglot:ruby\' to ensure all dependencies are pulled in correctly.", # pylint: disable=line-too-long
"license": [
"EPL-2.0", # JRuby (we choose EPL out of EPL,GPL,LGPL)
"BSD-new", # Rubinius
Expand Down
33 changes: 16 additions & 17 deletions tool/jt.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def get_truffle_version(from: :suite)
end

def ee?
(@mx_env || @ruby_name || '').include?('ee')
@mx_env.include?('ee') || @ruby_name.include?('ee')
end

def ee_jdk?
Expand Down Expand Up @@ -259,14 +259,12 @@ def env_path(env)
end

def used_ruby_is_mx_env_name?
ruby_launcher # to set @ruby_name
File.file?(env_path(@ruby_name))
end

def ruby_launcher
return @ruby_launcher if defined? @ruby_launcher

@ruby_name ||= ENV['RUBY_BIN'] || ENV['JT_ENV'] || 'jvm'
ruby_launcher = if @ruby_name == 'ruby'
ENV['RBENV_ROOT'] ? `rbenv which ruby`.chomp : which('ruby')
elsif @ruby_name.start_with?('/')
Expand Down Expand Up @@ -2615,21 +2613,20 @@ def sforceimports
FileUtils.touch(build_information_path)
end

env = if (i = options.index('--env') || options.index('-e'))
options.delete_at i
options.delete_at i
else
ENV['JT_ENV'] || 'jvm'
end
@mx_env = env
raise 'Cannot use both --use and --env' if defined?(@ruby_name)
# Override @mx_env if --env is passed
if (i = options.index('--env') || options.index('-e'))
options.delete_at i
@mx_env = options.delete_at i
end
env = @mx_env

@ruby_name = if (i = options.index('--name') || options.index('-n'))
options.delete_at i
options.delete_at i
else
env
end
# Override @ruby_name from --name or --env
if (i = options.index('--name') || options.index('-n'))
options.delete_at i
@ruby_name = options.delete_at i
else
@ruby_name = env
end

name = "truffleruby-#{@ruby_name}"
mx_base_args = ['--env', env]
Expand Down Expand Up @@ -3309,6 +3306,8 @@ def process_pre_args(args)
@silent = false
@verbose = false
@jdk_version = ENV['JT_JDK'] || DEFAULT_JDK_VERSION
@ruby_name = ENV['RUBY_BIN'] || ENV['JT_ENV'] || 'jvm'
@mx_env = ENV['JT_ENV'] || 'jvm'

until args.empty?
arg = args.shift
Expand Down