nobu	2008-05-08 16:41:23 +0900 (Thu, 08 May 2008)

  New Revision: 16331

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/configure.in
    trunk/ext/extmk.rb
    trunk/ext/purelib.rb

  Log:
    * configure.in (MINIRUBY), common.mk (RUBYOPT): add purelib.rb.
      [ruby-core:16642]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/Makefile.in?r1=16331&r2=16330&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16331&r2=16330&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/purelib.rb?r1=16331&r2=16330&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/extmk.rb?r1=16331&r2=16330&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=16331&r2=16330&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=16331&r2=16330&diff_format=u

Index: configure.in
===================================================================
--- configure.in	(revision 16330)
+++ configure.in	(revision 16331)
@@ -1488,6 +1488,8 @@
   RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
 else
   MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
+  MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/$(arch) -I$(EXTOUT)/common'
+  MINIRUBY="$MINIRUBY"' -I./- -I$(srcdir)/ext -rpurelib.rb'
   PREP='miniruby$(EXEEXT)'
   RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
 fi
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16330)
+++ ChangeLog	(revision 16331)
@@ -1,3 +1,8 @@
+Thu May  8 16:41:20 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (MINIRUBY), common.mk (RUBYOPT): add purelib.rb.
+	  [ruby-core:16642]
+
 Thu May  8 16:00:41 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* parse.y (parser_yylex): ! and ? at the bottom are no longer part
Index: common.mk
===================================================================
--- common.mk	(revision 16330)
+++ common.mk	(revision 16331)
@@ -4,7 +4,8 @@
 
 .SUFFIXES: .inc
 
-RUBYOPT       =
+RUBYLIB       = -
+RUBYOPT       = -rpurelib.rb
 
 STATIC_RUBY   = static-ruby
 
@@ -114,6 +115,9 @@
 	@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS)
 prog: $(PROGRAM) $(WPROGRAM)
 
+loadpath: $(PREP)
+	$(MINIRUBY) -e 'p $$:'
+
 $(PREP): $(MKFILES)
 
 miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE)
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 16330)
+++ Makefile.in	(revision 16331)
@@ -39,6 +39,9 @@
 OUTFLAG = @OUTFLAG@$(empty)
 COUTFLAG = @COUTFLAG@$(empty)
 CFLAGS = @CFLAGS@ @ARCH_FLAG@
+cflags = @cflags@
+optflags = @optflags@
+debugflags = @debugflags@
 XCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 16330)
+++ ext/extmk.rb	(revision 16331)
@@ -348,7 +348,7 @@
 unless CROSS_COMPILING
   $ruby << " -I'$(top_srcdir)/lib'"
   $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
-  $ruby << " -I'$(top_srcdir)/ext' -rpurelib.rb"
+  $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
   ENV["RUBYLIB"] = "-"
   ENV["RUBYOPT"] = "-rpurelib.rb"
 end
Index: ext/purelib.rb
===================================================================
--- ext/purelib.rb	(revision 16330)
+++ ext/purelib.rb	(revision 16331)
@@ -1,3 +1,3 @@
-if nul = $:.index("-")
+if nul = $:.find_index {|path| /\A(?:\.\/)*-\z/ =~ path}
   $:[nul..-1] = ["."]
 end

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