nobu	2013-05-16 16:54:04 +0900 (Thu, 16 May 2013)

  New Revision: 40784

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

  Log:
    Makefile.in: loadpath from loadpath.c
    
    * Makefile.in (loadpath): $LOAD_PATH in miniruby is empty by default
      now.
    
    * win32/Makefile.sub (loadpath): separate for quirky cmd.exe syntax.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub

Index: common.mk
===================================================================
--- common.mk	(revision 40783)
+++ common.mk	(revision 40784)
@@ -185,9 +185,6 @@ $(MKMAIN_CMD): $(MKFILES) all-incs $(PRE https://github.com/ruby/ruby/blob/trunk/common.mk#L185
 
 prog: program wprogram
 
-loadpath: $(PREP) PHONY
-	$(MINIRUBY) -e 'p $$:'
-
 $(PREP): $(MKFILES)
 
 miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE) $(DTRACE_OBJ)
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 40783)
+++ win32/Makefile.sub	(revision 40784)
@@ -1126,3 +1126,8 @@ INSNS	= opt_sc.inc optinsn.inc optunifs. https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1126
 ! if [del insns_rules.mk > nul]
 ! endif
 !endif
+
+loadpath: verconf.h
+	@$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \
+	sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \
+	    -e '/^^ /!d;s/ *"\\\\0"$$//;s/" *"//g'
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 40783)
+++ Makefile.in	(revision 40784)
@@ -464,3 +464,8 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h https://github.com/ruby/ruby/blob/trunk/Makefile.in#L464
 	  $(srcdir)/tool/instruction.rb $(srcdir)/tool/insns2vm.rb
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) -Ku $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
+
+loadpath: verconf.h
+	@$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \
+	sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \
+	    -e '/^ /!d;s/ *"\\0"$$//;s/" *"//g'

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