ruby-changes:17655
From: yugui <ko1@a...>
Date: Tue, 2 Nov 2010 00:04:04 +0900 (JST)
Subject: [ruby-changes:17655] Ruby:r29663 (ruby_1_9_2): merges r29200 from trunk into ruby_1_9_2, but also leaves the old
yugui 2010-11-02 00:03:48 +0900 (Tue, 02 Nov 2010) New Revision: 29663 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29663 Log: merges r29200 from trunk into ruby_1_9_2, but also leaves the old files without suffixed. -- * tool/rbinstall.rb (install?): gemspec filename should include its version. patched by Luis Lavena [ruby-core:32165] Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/tool/rbinstall.rb branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 29662) +++ ruby_1_9_2/ChangeLog (revision 29663) @@ -1,3 +1,8 @@ +Thu Sep 9 09:02:01 2010 NARUSE, Yui <naruse@r...> + + * tool/rbinstall.rb (install?): gemspec filename should include + its version. patched by Luis Lavena [ruby-core:32165] + Mon Sep 6 11:03:13 2010 NAKAMURA, Hiroshi <nahi@r...> * Fixed wrong check of missing functions. Patch by Adrian Quark. Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 29662) +++ ruby_1_9_2/version.h (revision 29663) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 32 +#define RUBY_PATCHLEVEL 33 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 Index: ruby_1_9_2/tool/rbinstall.rb =================================================================== --- ruby_1_9_2/tool/rbinstall.rb (revision 29662) +++ ruby_1_9_2/tool/rbinstall.rb (revision 29663) @@ -513,15 +513,22 @@ version = open(src) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next version = version.split(%r"=\s*", 2)[1].strip[/\A([\'\"])(.*?)\1/, 2] puts "#{" "*30}#{name} #{version}" - open_for_install(File.join(destdir, "#{name}.gemspec"), $data_mode) do - <<-GEMSPEC + gemspec = <<-GEMSPEC Gem::Specification.new do |s| s.name = #{name.dump} s.version = #{version.dump} s.summary = "This #{name} is bundled with Ruby" end - GEMSPEC - end + GEMSPEC + open_for_install(File.join(destdir, "#{name}-#{version}.gemspec"), $data_mode) { gemspec } + open_for_install(File.join(destdir, "#{name}.gemspec"), $data_mode) { + <<-WARNING + gemspec +# #{name}.gemspec remains just for compatibility with installation +# before Ruby 1.9.2-p32. +# This file will no longer exist in Ruby 1.9.3. +# Refer #{name}-#{version}.gemspec instead. + WARNING + } end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/