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

* ext/purelib.rb: no longer used since the default load path of

Browse source 
miniruby is empty.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-08-02 22:52:25 +00:00
parent cefa9413d2
commit 45992b4b25
5 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Aug 3 07:52:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/purelib.rb: no longer used since the default load path of
miniruby is empty.
Tue Aug 3 00:53:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* insns.def, vm_core.h: fixed typo. reported by Rocky Bernstein

2
configure.in
View file

@ -2052,7 +2052,7 @@ if test x"$cross_compiling" = xyes; then
TEST_RUNNABLE=no
else
MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common'
PREP='miniruby$(EXEEXT)'
RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)'
XRUBY='$(RUNRUBY)'

1
ext/extmk.rb Normal file → Executable file
View file

@ -351,7 +351,6 @@ $ruby << " -I'$(topdir)'"
unless CROSS_COMPILING
$ruby << " -I'$(top_srcdir)/lib'"
$ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
$ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
ENV["RUBYLIB"] = "-"
ENV["RUBYOPT"] = "-r#{File.expand_path('ext/purelib.rb', $top_srcdir)}"
end

17
ext/purelib.rb
View file

@ -1,17 +0,0 @@
nul = nil
$:.each_with_index {|path, index|
if /\A(?:\.\/)*-\z/ =~ path
nul = index
break
end
}
if nul
removed, $:[nul..-1] = $:[nul..-1], []
if defined?(Gem::QuickLoader)
removed.each do |path|
# replaces a fake rubygems by gem_prelude.rb with an alternative path
index = $".index(File.join(path, 'rubygems.rb'))
$"[index] = Gem::QuickLoader.path_to_full_rubygems_library if index
end
end
end

2
lib/mkmf.rb
View file

@ -1480,7 +1480,7 @@ arch_hdrdir = #{$arch_hdrdir}
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
}
if $extmk
mk << "RUBYLIB = -\nRUBYOPT = -r$(top_srcdir)/ext/purelib.rb\n"
mk << "RUBYLIB =\n""RUBYOPT = -\n"
end
if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1]
mk << "\nDESTDIR = #{destdir}\n"