diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-09 04:20:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-09 04:20:48 +0000 |
commit | 90d65afc92ab6e90e4a8fd3e5e4bf9039e931e37 (patch) | |
tree | 622480430259ee60d78e4a74237cfd0dae2a1ecf /tool | |
parent | ac9219e010a7215159eec056d7aab291280d9d90 (diff) |
make-snapshot: generate ChangeLog iff not exist
* tool/make-snapshot (package): ChangeLog had existed in pre-2.4
revisions, but not doc/ChangeLog-YYYY. fix for 2..3.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/make-snapshot | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot index 96d8c1e950..3063f52deb 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -229,14 +229,16 @@ def package(vcs, rev, destdir, tmp = nil) v = v[0] end - # get last revision from previous ChangeLog archive - last_ChangeLog = Dir["#{v}/doc/ChangeLog-*"].grep(/-(\d+)\z/) {|n| [$1.to_i, n]}.max[1] - open(last_ChangeLog) do |f| - f.readline - unless /\Ar(\d+) / =~ f.readline - abort "#{File.basename $0}: Cannot find revision from '#{last_ChangeLog}'" + unless File.exist?("#{v}/ChangeLog") + # get last revision from previous ChangeLog archive + last_ChangeLog = Dir["#{v}/doc/ChangeLog-*"].grep(/-(\d+)\z/) {|n| [$1.to_i, n]}.max[1] + open(last_ChangeLog) do |f| + f.readline + unless /\Ar(\d+) / =~ f.readline + abort "#{File.basename $0}: Cannot find revision from '#{last_ChangeLog}'" + end + vcs.export_changelog(url, $1.to_i, revision.to_i, "#{v}/ChangeLog") end - vcs.export_changelog(url, $1.to_i, revision.to_i, "#{v}/ChangeLog") end open("#{v}/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision}"} |