ruby-changes:30867
From: nagachika <ko1@a...>
Date: Sun, 15 Sep 2013 22:59:54 +0900 (JST)
Subject: [ruby-changes:30867] nagachika:r42946 (ruby_2_0_0): merge revision(s) 42890: [Backport #8878]
nagachika 2013-09-15 22:59:44 +0900 (Sun, 15 Sep 2013) New Revision: 42946 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42946 Log: merge revision(s) 42890: [Backport #8878] * tool/rbinstall.rb (Gem::Specification#initialize): default date to RUBY_RELEASE_DATE. [ruby-core:57072] [Bug #8878] * tool/rbinstall.rb (Gem::Specification#to_ruby): add date. Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/ChangeLog branches/ruby_2_0_0/tool/rbinstall.rb branches/ruby_2_0_0/version.h Index: ruby_2_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 42945) +++ ruby_2_0_0/ChangeLog (revision 42946) @@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Sun Sep 15 22:59:04 2013 Nobuyoshi Nakada <nobu@r...> + + * tool/rbinstall.rb (Gem::Specification#initialize): default date to + RUBY_RELEASE_DATE. [ruby-core:57072] [Bug #8878] + + * tool/rbinstall.rb (Gem::Specification#to_ruby): add date. + Sun Sep 15 22:55:44 2013 Zachary Scott <e@z...> * hash.c (rb_hash_aset): [DOC] Document key dup patch by @kachick Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 42945) +++ ruby_2_0_0/version.h (revision 42946) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-09-15" -#define RUBY_PATCHLEVEL 315 +#define RUBY_PATCHLEVEL 316 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 9 Index: ruby_2_0_0/tool/rbinstall.rb =================================================================== --- ruby_2_0_0/tool/rbinstall.rb (revision 42945) +++ ruby_2_0_0/tool/rbinstall.rb (revision 42946) @@ -555,6 +555,7 @@ module Gem https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/rbinstall.rb#L555 super yield(self) if defined?(yield) self.executables ||= [] + self.date ||= RUBY_RELEASE_DATE end def self.load(path) @@ -568,6 +569,7 @@ module Gem https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/rbinstall.rb#L569 Gem::Specification.new do |s| s.name = #{name.dump} s.version = #{version.dump} + s.date = #{date.dump} s.summary = #{summary.dump} s.description = #{description.dump} s.homepage = #{homepage.dump} Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r42890 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/