diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 01:02:17 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 01:02:17 +0000 |
commit | 9bccfa44bda08a3bb2d1740db439e2628243d737 (patch) | |
tree | fe76bdc268be1ef6343241efee8abe3a1156dcd2 | |
parent | 05c5f21f0e1cda33c4d463c2a0334b91ca8c9937 (diff) | |
download | ruby-9bccfa44bda08a3bb2d1740db439e2628243d737.tar.gz |
extract version from version.h
* tool/mkconfig.rb: extract version numbers from version.h but not
from API version in include/ruby/version.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-x | tool/mkconfig.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index c14d1ef715..63dbecb775 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -198,14 +198,14 @@ IO.foreach(File.join(srcdir, "version.h")) do |l| m = /^\s*#\s*define\s+RUBY_(PATCHLEVEL)\s+(-?\d+)/.match(l) if m versions[m[1]] = m[2] - break + break if versions.size == 4 + next end -end -IO.foreach(File.join(srcdir, "include/ruby/version.h")) do |l| - m = /^\s*#\s*define\s+RUBY_API_VERSION_(MAJOR|MINOR|TEENY)\s+(-?\d+)/.match(l) + m = /^\s*#\s*define\s+RUBY_VERSION\s+\W?([.\d]+)/.match(l) if m - versions[m[1]] = m[2] + versions['MAJOR'], versions['MINOR'], versions['TEENY'] = m[1].split('.') break if versions.size == 4 + next end end %w[MAJOR MINOR TEENY PATCHLEVEL].each do |v| |