yugui	2009-01-04 15:16:14 +0900 (Sun, 04 Jan 2009)

  New Revision: 21309

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

  Log:
    merges r21280 from trunk into ruby_1_9_1.
    * common.mk, Makefile.in, win32/Makefile.sub ($(INSNS), node_name.inc,
      known_errors.inc, miniprelude.c, newline.c): move rules from common.mk
      to {Makefile.in,win32/Makefile.sub) for nmake.
      [ruby-core:20993]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/Makefile.in
    branches/ruby_1_9_1/common.mk
    branches/ruby_1_9_1/win32/Makefile.sub

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21308)
+++ ruby_1_9_1/ChangeLog	(revision 21309)
@@ -1,3 +1,10 @@
+Sat Jan  3 03:00:42 2009  NAKAMURA Usaku  <usa@r...>
+
+	* common.mk, Makefile.in, win32/Makefile.sub ($(INSNS), node_name.inc,
+	  known_errors.inc, miniprelude.c, newline.c): move rules from common.mk
+	  to {Makefile.in,win32/Makefile.sub) for nmake.
+	  [ruby-core:20993]
+
 Fri Jan  2 23:51:41 2009  Yusuke Endoh  <mame@t...>
 
 	* test/ruby/test_sleep.rb (test_sleep_5sec): stop gc.
Index: ruby_1_9_1/common.mk
===================================================================
--- ruby_1_9_1/common.mk	(revision 21308)
+++ ruby_1_9_1/common.mk	(revision 21309)
@@ -611,8 +611,6 @@
 INSNS2VMOPT = --srcdir="$(srcdir)"
 
 $(INSNS): $(srcdir)/insns.def {$(VPATH)}vm_opts.h $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def
-	@$(RM) $(PROGRAM)
-	$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
 
 minsns.inc: $(srcdir)/template/minsns.inc.tmpl
 
@@ -640,7 +638,6 @@
 insns: $(INSNS)
 
 node_name.inc: {$(VPATH)}node.h
-	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
 
 encdb.h: $(PREP)
 	$(MINIRUBY) $(srcdir)/enc/make_encdb.rb $@.new $(srcdir)/enc enc
@@ -655,10 +652,8 @@
 # 		$(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h
 
 known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
-	$(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
 
 miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
-	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
 
 prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(PRELUDE_SCRIPTS) $(PREP)
 	$(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
@@ -666,9 +661,6 @@
 golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
 	$(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
 
-newline.c: 
-	$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans
-
 prereq: incs srcs preludes
 
 preludes: {$(VPATH)}miniprelude.c
Index: ruby_1_9_1/win32/Makefile.sub
===================================================================
--- ruby_1_9_1/win32/Makefile.sub	(revision 21308)
+++ ruby_1_9_1/win32/Makefile.sub	(revision 21309)
@@ -757,3 +757,39 @@
 
 ext/extinit.obj: ext/extinit.c $(SETUP)
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
+
+$(INSNS):
+	@if exist $(srcdir:/=\)\insns.inc ( \
+	@for %I in ($(INSNS)) do @copy $(srcdir:/=\)\%~nxI %I \
+	) else ( \
+	@$(RM) $(PROGRAM) \
+	$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ \
+	)
+
+node_name.inc:
+	@if exist $(srcdir:/=\)\$(@F) ( \
+	copy $(srcdir:/=\)\$(@F) $@ \
+	) else ( \
+	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ \
+	)
+
+known_errors.inc:
+	@if exist $(srcdir:/=\)\$(@F) ( \
+	copy $(srcdir:/=\)\$(@F) $@ \
+	) else ( \
+	$(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def \
+	)
+
+miniprelude.c:
+	@if exist $(srcdir:/=\)\$(@F) ( \
+	copy $(srcdir:/=\)\$(@F) $@ \
+	) else ( \
+	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ \
+	)
+
+newline.c: 
+	@if exist $(srcdir:/=\)\$(@F) ( \
+	copy $(srcdir:/=\)\$(@F) $@ \
+	) else ( \
+	$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans \
+	)
Index: ruby_1_9_1/Makefile.in
===================================================================
--- ruby_1_9_1/Makefile.in	(revision 21308)
+++ ruby_1_9_1/Makefile.in	(revision 21309)
@@ -264,3 +264,19 @@
 test-rubyspec:
 	@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
 	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec -B $(srcdir)/spec/default.mspec $(MSPECOPT)
+
+$(INSNS):
+	@$(RM) $(PROGRAM)
+	$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
+
+node_name.inc:
+	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
+
+known_errors.inc:
+	$(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
+
+miniprelude.c:
+	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
+
+newline.c: 
+	$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans

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