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

ruby-changes:73421

From: Nobuyoshi <ko1@a...>
Date: Mon, 5 Sep 2022 13:08:48 +0900 (JST)
Subject: [ruby-changes:73421] 4d469472e2 (master): Debugging snapshot [ci skip]

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

From 4d469472e2fda05cbdef98ce2a1fe945f2355f51 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 5 Sep 2022 13:08:23 +0900
Subject: Debugging snapshot [ci skip]

---
 template/fake.rb.in | 6 +++---
 tool/make-snapshot  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/template/fake.rb.in b/template/fake.rb.in
index aff9bbb375..1ad4943b04 100644
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -21,10 +21,10 @@ end https://github.com/ruby/ruby/blob/trunk/template/fake.rb.in#L21
 arg['versions'] = version = {}
 File.read(File.join(arg['srcdir'], 'version.c')).
   scan(/rb_define_global_const\("(RUBY_\w+)",[^;]*?\bMK(?:INT|(STR))\(([^()]*)\)/m) do |n, s, v|
-  version[n] = arg[v] || src.value(v) || (s ? "" : 0)
+  version[n] = arg[v] || src.value(v) || (s ? v : 0)
 end
-arg['RUBY_DESCRIPTION_WITH_MJIT'] = src.value('description_with_mjit') || version['RUBY_DESCRIPTION']
-arg['RUBY_DESCRIPTION_WITH_YJIT'] = src.value('description_with_yjit') || version['RUBY_DESCRIPTION']
+arg['RUBY_DESCRIPTION_WITH_MJIT'] = src.value('description_with_mjit') || 'description_with_mjit'
+arg['RUBY_DESCRIPTION_WITH_YJIT'] = src.value('description_with_yjit') || 'description_with_yjit'
 %>baseruby="<%=arg['BASERUBY']%>"
 _\
 =begin
diff --git a/tool/make-snapshot b/tool/make-snapshot
index a54f254dc2..b88bcdc297 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -416,6 +416,7 @@ def package(vcs, rev, destdir, tmp = nil) https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L416
       f.puts "Object.__send__(:remove_const, :RUBY_VERSION)"
       f.puts "RUBY_VERSION='#{version}'"
     end
+    warn "cross.rb:", File.read("cross.rb").gsub(/^/, "> "), ""
     unless File.exist?("configure")
       print "creating configure..."
       unless system([ENV["AUTOCONF"]]*2)
-- 
cgit v1.2.1


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

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