nobu	2010-08-03 07:52:25 +0900 (Tue, 03 Aug 2010)

  New Revision: 28840

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28840

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

  Removed files:
    trunk/ext/purelib.rb
  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/ext/extmk.rb
    trunk/lib/mkmf.rb

Index: configure.in
===================================================================
--- configure.in	(revision 28839)
+++ configure.in	(revision 28840)
@@ -2052,7 +2052,7 @@
   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)'
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28839)
+++ ChangeLog	(revision 28840)
@@ -1,3 +1,8 @@
+Tue Aug  3 07:52:20 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* insns.def, vm_core.h: fixed typo.  reported by Rocky Bernstein
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 28839)
+++ lib/mkmf.rb	(revision 28840)
@@ -1480,7 +1480,7 @@
 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"
Index: ext/purelib.rb
===================================================================
--- ext/purelib.rb	(revision 28839)
+++ ext/purelib.rb	(revision 28840)
@@ -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
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 28839)
+++ ext/extmk.rb	(revision 28840)
@@ -351,7 +351,6 @@
 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

Property changes on: ext/extmk.rb
___________________________________________________________________
Added: svn:executable
   + *


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/