Skip to content

Commit e742011

Browse files
committed
JT: Remove 'jt build cexts', use 'jt build' instead
* It didn't work since we moved to building a GraalVM. * 'jt build' will take of recompiling it if needed, and will copy the files as needed to the built GraalVM. * Keep 'jt clean cexts' as that can be useful and still works.
1 parent 316217d commit e742011

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

tool/jt.rb

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,6 @@ def help
449449
--no-sforceimports do not run sforceimports before building
450450
parser build the parser
451451
options build the options
452-
cexts build only the C extensions (part of "jt build")
453452
graalvm build a minimal JVM-only GraalVM containing only TruffleRuby,
454453
available by default in mxbuild/truffleruby-jvm,
455454
the Ruby is symlinked into rbenv or chruby if available
@@ -562,8 +561,6 @@ def build(*options)
562561
File.write(yytables, File.read(yytables).gsub('package org.jruby.parser;', 'package org.truffleruby.parser.parser;'))
563562
when 'options'
564563
sh 'tool/generate-options.rb'
565-
when "cexts" # Included in 'mx build' but useful to recompile just that part
566-
mx 'build', '--dependencies', 'org.truffleruby.cext'
567564
when 'graalvm'
568565
build_graalvm(*options)
569566
when 'native'
@@ -744,9 +741,6 @@ def compile_cext(name, ext_dir, target, clang_opts, env: {})
744741
extconf = "#{ext_dir}/extconf.rb"
745742
raise "#{extconf} does not exist" unless File.exist?(extconf)
746743

747-
# Make sure ruby.su is built
748-
build("cexts")
749-
750744
chdir(ext_dir) do
751745
run_ruby(env, '-rmkmf', "#{ext_dir}/extconf.rb") # -rmkmf is required for C ext tests
752746
if File.exists?('Makefile')
@@ -1250,7 +1244,6 @@ def mspec(*args)
12501244
def test_specs(command, *args)
12511245
env_vars = {}
12521246
options = []
1253-
running_local_build = false
12541247

12551248
case command
12561249
when 'run'
@@ -1286,7 +1279,6 @@ def test_specs(command, *args)
12861279
options << '-t' << find_launcher(true)
12871280
options << '-T--native'
12881281
else
1289-
running_local_build = true
12901282
options += %w[-T--vm.ea -T--vm.esa -T--vm.Xmx2G]
12911283
options << "-T--core-load-path=#{TRUFFLERUBY_DIR}/src/main/ruby/truffleruby"
12921284
options << "-T--polyglot" # For Truffle::Interop.export specs
@@ -1315,12 +1307,6 @@ def test_specs(command, *args)
13151307
options += %w[--format specdoc]
13161308
end
13171309

1318-
if running_local_build && (
1319-
args.any? { |arg| arg.include? 'optional/capi' } ||
1320-
!(args & %w[:capi :truffle_capi :library_cext]).empty?)
1321-
build("cexts")
1322-
end
1323-
13241310
run_mspec env_vars, command, *options, *args
13251311
end
13261312
private :test_specs

0 commit comments

Comments
 (0)