mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merges r24328 from trunk into ruby_1_9_1.
-- * gem_prelude.rb (Gem.path): uses Gem.default_path as a default value so that ruby finds gems in ~/.gem/. (Gem.user_home): reduced version of lib/rubygems.rb's. Gem.default_path needs it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
23cc3c2b87
commit
ff17ee0d31
3 changed files with 20 additions and 3 deletions
|
|
@ -1,3 +1,10 @@
|
|||
Thu Jul 30 23:04:32 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
|
||||
|
||||
* gem_prelude.rb (Gem.path): uses Gem.default_path as a default value
|
||||
so that ruby finds gems in ~/.gem/.
|
||||
(Gem.user_home): reduced version of lib/rubygems.rb's.
|
||||
Gem.default_path needs it.
|
||||
|
||||
Thu Jul 30 21:39:42 2009 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* compile.c (iseq_compile_each): fix stack consistency error.
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ if defined?(Gem) then
|
|||
def self.path
|
||||
@gem_path ||= nil
|
||||
unless @gem_path
|
||||
paths = [ENV['GEM_PATH']]
|
||||
paths = [ENV['GEM_PATH'] || default_path]
|
||||
paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME
|
||||
set_paths(paths.compact.join(File::PATH_SEPARATOR))
|
||||
end
|
||||
|
|
@ -84,7 +84,17 @@ if defined?(Gem) then
|
|||
def self.ensure_gem_subdirectories(path)
|
||||
end
|
||||
|
||||
|
||||
def self.user_home
|
||||
@user_home ||= File.expand_path("~")
|
||||
rescue
|
||||
if File::ALT_SEPARATOR then
|
||||
"C:/"
|
||||
else
|
||||
"/"
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@post_install_hooks ||= []
|
||||
@post_uninstall_hooks ||= []
|
||||
@pre_uninstall_hooks ||= []
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#define RUBY_VERSION "1.9.1"
|
||||
#define RUBY_PATCHLEVEL 257
|
||||
#define RUBY_PATCHLEVEL 258
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
#define RUBY_VERSION_MINOR 9
|
||||
#define RUBY_VERSION_TEENY 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue