diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-25 09:34:35 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-25 09:34:35 +0000 |
| commit | 4937c6c7dade8eaad7924028a9b0f4f41dceabc7 (patch) | |
| tree | d271b740056a095b27b910dded31481b6447eb15 /tool | |
| parent | 83515c6c32ce02f6360107e4be1c558c8586b425 (diff) | |
Keep RUBY_RELEASE_DATE's definition
if it uses Y/M/D macros.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/merger.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index 6fedb0a936..3362eafd7a 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -91,12 +91,13 @@ def version_up(inc=nil) end str = open 'version.h', 'rb' do |f| f.read end + ruby_release_date = str[/RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR/] || d.strftime('"%Y-%m-%d"') [%W[RUBY_VERSION "#{v.join '.'}"], %W[RUBY_VERSION_CODE #{v.join ''}], %W[RUBY_VERSION_MAJOR #{v[0]}], %W[RUBY_VERSION_MINOR #{v[1]}], %W[RUBY_VERSION_TEENY #{v[2]}], - %W[RUBY_RELEASE_DATE "#{d.strftime '%Y-%m-%d'}"], + %W[RUBY_RELEASE_DATE #{ruby_release_date}], %W[RUBY_RELEASE_CODE #{d.strftime '%Y%m%d'}], %W[RUBY_PATCHLEVEL #{pl}], %W[RUBY_RELEASE_YEAR #{d.year}], |