ruby-changes:11853
From: yugui <ko1@a...>
Date: Thu, 21 May 2009 19:02:56 +0900 (JST)
Subject: [ruby-changes:11853] Ruby:r23508 (trunk): * gem_prelude.rb (Gem.default_dir and misc.): use rubylibprefix.
yugui 2009-05-21 19:00:48 +0900 (Thu, 21 May 2009) New Revision: 23508 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23508 Log: * gem_prelude.rb (Gem.default_dir and misc.): use rubylibprefix. follows the chagne in r23368. Modified files: trunk/ChangeLog trunk/gem_prelude.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 23507) +++ ChangeLog (revision 23508) @@ -1,3 +1,8 @@ +Thu May 21 18:55:33 2009 Yuki Sonoda (Yugui) <yugui@y...> + + * gem_prelude.rb (Gem.default_dir and misc.): use rubylibprefix. + follows the chagne in r23368. + Thu May 21 12:07:43 2009 Nobuyoshi Nakada <nobu@r...> * include/ruby/ruby.h (RB_EVENT_HOOKS_HAVE_CALLBACK_DATA): Index: gem_prelude.rb =================================================================== --- gem_prelude.rb (revision 23507) +++ gem_prelude.rb (revision 23508) @@ -24,6 +24,7 @@ ConfigMap = { :sitedir => RbConfig::CONFIG["sitedir"], :ruby_version => RbConfig::CONFIG["ruby_version"], + :rubylibprefix => RbConfig::CONFIG["rubylibprefix"], :libdir => RbConfig::CONFIG["libdir"], :sitelibdir => RbConfig::CONFIG["sitelibdir"], :arch => RbConfig::CONFIG["arch"], @@ -105,12 +106,8 @@ if defined? RUBY_FRAMEWORK_VERSION then File.join File.dirname(ConfigMap[:sitedir]), 'Gems', ConfigMap[:ruby_version] - elsif RUBY_VERSION > '1.9' then - File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems', - ConfigMap[:ruby_version]) else - File.join(ConfigMap[:libdir], ruby_engine, 'gems', - ConfigMap[:ruby_version]) + ConfigMap[:sitelibdir].sub(%r'/site_ruby/(?=[^/]+)', '/gems/') end end @@ -218,8 +215,7 @@ undef_method :gem if method_defined? :gem end - $".delete File.join(Gem::ConfigMap[:libdir], - Gem::ConfigMap[:ruby_install_name], + $".delete File.join(Gem::ConfigMap[:rubylibprefix], Gem::ConfigMap[:ruby_version], 'rubygems.rb') require 'rubygems' @@ -342,7 +338,7 @@ begin Gem.push_all_highest_version_gems_on_load_path - $" << File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name], + $" << File.join(Gem::ConfigMap[:rubylibprefix], Gem::ConfigMap[:ruby_version], "rubygems.rb") rescue Exception => e puts "Error loading gem paths on load path in gem_prelude" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/