nobu	2016-01-09 12:32:43 +0900 (Sat, 09 Jan 2016)

  New Revision: 53481

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53481

  Log:
    probes.h including dummy header
    
    * Makefile.in, win32/Makefile.sub (probes.h): include dummy header
      instead of copying.
    
    * common.mk (probes.dmyh): add nmake VPATH prefix.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub
Index: common.mk
===================================================================
--- common.mk	(revision 53480)
+++ common.mk	(revision 53481)
@@ -852,7 +852,7 @@ $(PRELUDE_C): $(COMPILE_PRELUDE) \ https://github.com/ruby/ruby/blob/trunk/common.mk#L852
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
 		$(srcdir)/template/prelude.c.tmpl golf_prelude.rb
 
-probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
+{$(VPATH)}probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
 	$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@
 
 probes.h: {$(VPATH)}probes.$(DTRACE_EXT)
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 53480)
+++ win32/Makefile.sub	(revision 53481)
@@ -1148,12 +1148,9 @@ ext/extinit.obj: ext/extinit.c $(SETUP) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1148
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
 
 probes.h: {$(VPATH)}probes.dmyh
-	@$(ECHO) copying dummy $(DEST_FILE)
-	@if exist probes.dmyh (\
-	  $(Q) $(CP) probes.dmyh $(OS_DEST_FILE)\
-	) else (\
-	  $(Q) $(CP) $(srcdir:/=\)\probes.dmyh $(OS_DEST_FILE)\
-	)
+	@$(ECHO) making dummy <<$(DEST_FILE)
+#include "$(*F).dmyh"
+<<KEEP
 
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 53480)
+++ Makefile.in	(revision 53481)
@@ -400,8 +400,8 @@ enc/jis/props.h: enc/jis/props.kwd https://github.com/ruby/ruby/blob/trunk/Makefile.in#L400
 	$(Q) $(RM) $@.tmp
 
 .dmyh.h:
-	@$(ECHO) copying dummy $(DEST_FILE)
-	$(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE)
+	@$(ECHO) making dummy $(DEST_FILE)
+	$(Q)echo '#include "$(*F).dmyh"' > $@
 
 probes.stamp: $(DTRACE_REBUILD_OBJS)
 	$(Q) if test -f $@ -o -f probes.$(OBJEXT); then \

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