From efe7e6e949cc6137f2c918522f866cf6b99309ce Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 28 Oct 2021 15:49:55 +0900 Subject: [PATCH] Bundle rbs 1.7.0.beta.5 --- gems/bundled_gems | 2 +- tool/dummy-rake-compiler/rake/extensiontask.rb | 9 +++++++++ tool/test-bundled-gems.rb | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 tool/dummy-rake-compiler/rake/extensiontask.rb diff --git a/gems/bundled_gems b/gems/bundled_gems index 2a0fba615d..4be5e27141 100644 --- a/gems/bundled_gems +++ b/gems/bundled_gems @@ -11,6 +11,6 @@ net-pop 0.1.1 https://github.com/ruby/net-pop net-smtp 0.3.0 https://github.com/ruby/net-smtp matrix 0.4.2 https://github.com/ruby/matrix prime 0.1.2 https://github.com/ruby/prime -rbs 1.6.2 https://github.com/ruby/rbs +rbs 1.7.0.beta.5 https://github.com/ruby/rbs typeprof 0.20.2 https://github.com/ruby/typeprof debug 1.3.4 https://github.com/ruby/debug diff --git a/tool/dummy-rake-compiler/rake/extensiontask.rb b/tool/dummy-rake-compiler/rake/extensiontask.rb new file mode 100644 index 0000000000..62b7ff8018 --- /dev/null +++ b/tool/dummy-rake-compiler/rake/extensiontask.rb @@ -0,0 +1,9 @@ +module Rake + class ExtensionTask < TaskLib + def initialize(...) + task :compile do + puts "Dummy `compile` task defined in #{__FILE__}" + end + end + end +end diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb index ef491f9db4..d9192f1bb9 100644 --- a/tool/test-bundled-gems.rb +++ b/tool/test-bundled-gems.rb @@ -9,6 +9,7 @@ allowed_failures = allowed_failures.split(',').reject(&:empty?) rake = File.realpath("../../.bundle/bin/rake", __FILE__) gem_dir = File.realpath('../../gems', __FILE__) +dummy_rake_compiler_dir = File.realpath('../dummy-rake-compiler', __FILE__) exit_code = 0 ruby = ENV['RUBY'] || RbConfig.ruby failed = [] @@ -33,6 +34,14 @@ File.foreach("#{gem_dir}/bundled_gems") do |line| test_command << " stdlib_test validate" first_timeout *= 3 + + # copied from debug gem + build_dir = 'ext/-test-/gems/rbs' + FileUtils.mkdir_p(build_dir) + extconf_path = File.expand_path('../../gems/src/rbs/ext/rbs_extension/extconf.rb', __FILE__) + system("#{ruby} -C #{build_dir} #{extconf_path}") or raise + system("cd #{build_dir} && make extout=../../../../.ext libdir=../../../..") or raise + ENV["RUBYLIB"] = [File.expand_path(dummy_rake_compiler_dir), File.expand_path(build_dir), ENV.fetch("RUBYLIB", nil)].compact.join(":") end if gem == "minitest"