From: Nobuyoshi Nakada Date: Wed, 2 Oct 2024 16:02:18 +0000 (+0900) Subject: fake.rb: Copy options in RUBY_DESCRIPTION to the fake string X-Git-Tag: v3_4_0_preview2~95 X-Git-Url: https://repo.or.cz/ruby.git/commitdiff_plain/99620b98ba5a9e24a4996794441e1806af66908e fake.rb: Copy options in RUBY_DESCRIPTION to the fake string The `RUBY_DESCRIPTION_WITH` macro has been removed already, so there are no more descriptions strings with rjit/yjit enabled. --- diff --git a/template/fake.rb.in b/template/fake.rb.in index 5e52d95594..c4bd21af53 100644 --- a/template/fake.rb.in +++ b/template/fake.rb.in @@ -24,9 +24,8 @@ 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 ? v : 0) end -arg['RUBY_DESCRIPTION_WITH_RJIT'] = src.value('description_with_rjit') || 'description_with_rjit' -arg['RUBY_DESCRIPTION_WITH_YJIT'] = src.value('description_with_yjit') || 'description_with_yjit' -%>baseruby="<%=arg['BASERUBY']%>" +-%> +baseruby="<%=arg['BASERUBY']%>" _\ =begin _= @@ -39,16 +38,14 @@ exec $ruby "$r" "$@" class Object remove_const :CROSS_COMPILING if defined?(CROSS_COMPILING) CROSS_COMPILING = RUBY_PLATFORM + options = remove_const(:RUBY_DESCRIPTION)[/( \+[^\[\]\+]+)*(?= \[\S+\]\z)/] constants.grep(/^RUBY_/) {|n| remove_const n} % arg['versions'].each {|n, v| - <%=n%> = <%if n=='RUBY_DESCRIPTION' %>case - when RubyVM.const_defined?(:RJIT) && RubyVM::RJIT.enabled? - <%=arg['RUBY_DESCRIPTION_WITH_RJIT'].inspect%> - when RubyVM.const_defined?(:YJIT) && RubyVM::YJIT.enabled? - <%=arg['RUBY_DESCRIPTION_WITH_YJIT'].inspect%> - else - <%=v.inspect%> - end<%else%><%=v.inspect%><%end%> + <%=n%> = <%if n=='RUBY_DESCRIPTION' + v1, v2 = v.split(/(?= \[\S+\]\z)/) + %><%=v1.dump.chomp('"')%>#{options}<%= + v2.dump[1..-1]%>.freeze<% + else%><%=v.inspect%><%end%> % } end builddir = File.dirname(File.expand_path(__FILE__))