kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 58078:

Browse source 
export_changelog must specify the branch's url

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@58079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2017-03-24 14:06:24 +00:00
parent 7e811007e2
commit 333345469d
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tool/make-snapshot
View file

@ -225,7 +225,7 @@ def package(vcs, rev, destdir, tmp = nil)
unless /\Ar(\d+) / =~ f.readline unless /\Ar(\d+) / =~ f.readline
abort "#{File.basename $0}: Cannot find revision from '#{last_ChangeLog}'" abort "#{File.basename $0}: Cannot find revision from '#{last_ChangeLog}'"
end end
vcs.export_changelog($1.to_i, revision.to_i, "#{v}/ChangeLog") vcs.export_changelog(url, $1.to_i, revision.to_i, "#{v}/ChangeLog")
end end
open("#{v}/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision}"} open("#{v}/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision}"}

4
tool/vcs.rb
View file

@ -307,7 +307,7 @@ class VCS
FileUtils.rm_rf(dir+"/.svn") FileUtils.rm_rf(dir+"/.svn")
end end
def export_changelog(from, to, path) def export_changelog(url, from, to, path)
range = [to, (from+1 if from)].compact.join(':') range = [to, (from+1 if from)].compact.join(':')
IO.popen({'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'}, IO.popen({'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'},
%W"svn log -r#{range} #{url}") do |r| %W"svn log -r#{range} #{url}") do |r|
@ -424,7 +424,7 @@ class VCS
FileUtils.rm_rf("#{dir}/.git") FileUtils.rm_rf("#{dir}/.git")
end end
def export_changelog(from, to, path) def export_changelog(url, from, to, path)
range = [from, to].map do |rev| range = [from, to].map do |rev|
rev or next rev or next
rev = cmd_read({'LANG' => 'C', 'LC_ALL' => 'C'}, rev = cmd_read({'LANG' => 'C', 'LC_ALL' => 'C'},

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.4.1" #define RUBY_VERSION "2.4.1"
#define RUBY_RELEASE_DATE "2017-03-22" #define RUBY_RELEASE_DATE "2017-03-24"
#define RUBY_PATCHLEVEL 111 #define RUBY_PATCHLEVEL 112
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 22 #define RUBY_RELEASE_DAY 24
#include "ruby/version.h" #include "ruby/version.h"