From e4f46eabab70bfcde67f0032a902433d11afc166 Mon Sep 17 00:00:00 2001 From: kazu Date: Fri, 11 Jan 2019 04:58:33 +0000 Subject: Fix make-snapshot for trunk git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/mkconfig.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'tool/mkconfig.rb') diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 74736540cd..edfdda203b 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -201,6 +201,12 @@ IO.foreach(File.join(srcdir, "version.h")) do |l| break if versions.size == 4 next end + m = /^\s*#\s*define\s+RUBY_VERSION_(\w+)\s+(-?\d+)/.match(l) + if m + versions[m[1]] = m[2] + break if versions.size == 4 + next + end m = /^\s*#\s*define\s+RUBY_VERSION\s+\W?([.\d]+)/.match(l) if m versions['MAJOR'], versions['MINOR'], versions['TEENY'] = m[1].split('.') @@ -208,6 +214,16 @@ IO.foreach(File.join(srcdir, "version.h")) do |l| next end end +if versions.size != 4 + IO.foreach(File.join(srcdir, "include/ruby/version.h")) do |l| + m = /^\s*#\s*define\s+RUBY_API_VERSION_(\w+)\s+(-?\d+)/.match(l) + if m + versions[m[1]] ||= m[2] + break if versions.size == 4 + next + end + end +end %w[MAJOR MINOR TEENY PATCHLEVEL].each do |v| print " CONFIG[#{v.dump}] = #{(versions[v]||vars[v]).dump}\n" end -- cgit v1.2.3