[前][次][番号順一覧][スレッド一覧]

ruby-changes:74000

From: nagachika <ko1@a...>
Date: Sat, 15 Oct 2022 17:28:30 +0900 (JST)
Subject: [ruby-changes:74000] ef7cf5304e (ruby_3_1): merge revision(s) 1150a54afe98171657869bd2eafd82fda59893b1:

https://git.ruby-lang.org/ruby.git/commit/?id=ef7cf5304e

From ef7cf5304eeb1835d4bf50f0001f7fd889b630a7 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sat, 15 Oct 2022 16:15:49 +0900
Subject: merge revision(s) 1150a54afe98171657869bd2eafd82fda59893b1:

	Use `File::PATH_SEPARATOR` for the portability

	---
	 tool/test-bundled-gems.rb | 6 +++---
	 1 file changed, 3 insertions(+), 3 deletions(-)
---
 tool/test-bundled-gems.rb | 6 +++---
 version.h                 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index f130301ffd..6312e1872d 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -27,7 +27,7 @@ File.foreach("#{gem_dir}/bundled_gems") do |line| https://github.com/ruby/ruby/blob/trunk/tool/test-bundled-gems.rb#L27
   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| https://github.com/ruby/ruby/blob/trunk/tool/test-bundled-gems.rb#L41
     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| https://github.com/ruby/ruby/blob/trunk/tool/test-bundled-gems.rb#L56
     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
diff --git a/version.h b/version.h
index 7580b01561..e24dfabf6d 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11
 # 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
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]