summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2022-09-05 11:25:42 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2022-09-05 11:25:42 +0900
commit1420333455ba335f46887ee7a06c4ee95faa37ad (patch)
treee5e02596178f8e950f6027d37f3b690b02cc239a /template
parent85a483169f8381bec08ff2c9a9fc66167fc8a84a (diff)
downloadruby-1420333455ba335f46887ee7a06c4ee95faa37ad.tar.gz
Fix fake.rb expansion from preprocessed version.h
Diffstat (limited to 'template')
-rw-r--r--template/fake.rb.in9
1 files changed, 4 insertions, 5 deletions
diff --git a/template/fake.rb.in b/template/fake.rb.in
index 67eb6dcec0..aff9bbb375 100644
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -18,14 +18,13 @@ def src.value(name)
end
eval(val.gsub(/#/, '\\#').gsub(/((?:\G|[^\\])(?:\\\\)*)\n/, '\1'))
end
-version = Hash.new {|h, v| h[v] || src.value(v)}
-arg['versions'] = version
+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] || (s ? "" : 0)
+ version[n] = arg[v] || src.value(v) || (s ? "" : 0)
end
-arg['RUBY_DESCRIPTION_WITH_MJIT'] = arg['description_with_mjit'] || ""
-arg['RUBY_DESCRIPTION_WITH_YJIT'] = arg['description_with_yjit'] || ""
+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']
%>baseruby="<%=arg['BASERUBY']%>"
_\
=begin