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

* gem_prelude.rb: considers --program-suffix and prefix configure

Browse source 
options.

* lib/rubygems/defaults.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@19975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-10-28 01:43:55 +00:00
parent d9f21245ad
commit c2511c5f76
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Tue Oct 28 10:42:50 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* gem_prelude.rb: considers --program-suffix and prefix configure
options.
* lib/rubygems/defaults.rb: ditto.
Tue Oct 28 09:51:48 2008 NAKAMURA Usaku <usa@ruby-lang.org> Tue Oct 28 09:51:48 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* bootstraptest/test_thread.rb: ignore some exceptions. * bootstraptest/test_thread.rb: ignore some exceptions.

4
gem_prelude.rb
View file

@ -113,7 +113,7 @@ if defined?(Gem) then
undef_method :gem if method_defined? :gem undef_method :gem if method_defined? :gem
end end
$".delete File.join(Gem::ConfigMap[:libdir], 'ruby', $".delete File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name],
Gem::ConfigMap[:ruby_version], 'rubygems.rb') Gem::ConfigMap[:ruby_version], 'rubygems.rb')
require 'rubygems' require 'rubygems'
@ -230,7 +230,7 @@ if defined?(Gem) then
begin begin
Gem.push_all_highest_version_gems_on_load_path Gem.push_all_highest_version_gems_on_load_path
$" << File.join(Gem::ConfigMap[:libdir], "ruby", $" << File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name],
Gem::ConfigMap[:ruby_version], "rubygems.rb") Gem::ConfigMap[:ruby_version], "rubygems.rb")
rescue Exception => e rescue Exception => e
puts "Error loading gem paths on load path in gem_prelude" puts "Error loading gem paths on load path in gem_prelude"

2
lib/rubygems/defaults.rb
View file

@ -21,7 +21,7 @@ module Gem
File.join File.dirname(ConfigMap[:sitedir]), 'Gems', File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
ConfigMap[:ruby_version] ConfigMap[:ruby_version]
else else
File.join(ConfigMap[:libdir], ruby_engine, 'gems', File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
ConfigMap[:ruby_version]) ConfigMap[:ruby_version])
end end
end end