mirror of
https://github.com/ruby/ruby.git
synced 2025-09-17 01:23:57 +02:00
merge revision(s) 1150a54afe
:
Use `File::PATH_SEPARATOR` for the portability --- tool/test-bundled-gems.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
This commit is contained in:
parent
830fbb412b
commit
ef7cf5304e
2 changed files with 4 additions and 4 deletions
|
@ -27,7 +27,7 @@ File.foreach("#{gem_dir}/bundled_gems") do |line|
|
|||
if gem == "typeprof"
|
||||
rbs_build_dir = 'ext/-test-/gems/rbs'
|
||||
raise "need to run rbs test suite before typeprof" unless File.readable?("#{rbs_build_dir}/rbs_extension.#{RbConfig::CONFIG['DLEXT']}")
|
||||
ENV["RUBYLIB"] = ["#{gem_dir}/src/rbs/lib", ENV.fetch("RUBYLIB", nil)].compact.join(":")
|
||||
ENV["RUBYLIB"] = ["#{gem_dir}/src/rbs/lib", ENV.fetch("RUBYLIB", nil)].compact.join(File::PATH_SEPARATOR)
|
||||
end
|
||||
|
||||
if gem == "rbs"
|
||||
|
@ -41,7 +41,7 @@ File.foreach("#{gem_dir}/bundled_gems") do |line|
|
|||
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(":")
|
||||
ENV["RUBYLIB"] = [File.expand_path(dummy_rake_compiler_dir), File.expand_path(build_dir), ENV.fetch("RUBYLIB", nil)].compact.join(File::PATH_SEPARATOR)
|
||||
end
|
||||
|
||||
if gem == "minitest"
|
||||
|
@ -56,7 +56,7 @@ File.foreach("#{gem_dir}/bundled_gems") do |line|
|
|||
extconf_path = File.expand_path('../../gems/src/debug/ext/debug/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(build_dir + "/.."), ENV.fetch("RUBYLIB", nil)].compact.join(":")
|
||||
ENV["RUBYLIB"] = [File.expand_path(build_dir + "/.."), ENV.fetch("RUBYLIB", nil)].compact.join(File::PATH_SEPARATOR)
|
||||
end
|
||||
|
||||
print "[command]" if github_actions
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
|
||||
#define RUBY_VERSION_TEENY 3
|
||||
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
|
||||
#define RUBY_PATCHLEVEL 74
|
||||
#define RUBY_PATCHLEVEL 75
|
||||
|
||||
#define RUBY_RELEASE_YEAR 2022
|
||||
#define RUBY_RELEASE_MONTH 10
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue