ruby-changes:11173
From: nobu <ko1@a...>
Date: Thu, 5 Mar 2009 11:52:34 +0900 (JST)
Subject: [ruby-changes:11173] Ruby:r22778 (trunk): * win32/Makefile.sub (make_insns_rules): rule to make rules for insns.
nobu 2009-03-05 11:52:21 +0900 (Thu, 05 Mar 2009) New Revision: 22778 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22778 Log: * win32/Makefile.sub (make_insns_rules): rule to make rules for insns. Modified files: trunk/ChangeLog trunk/Makefile.in trunk/common.mk trunk/win32/Makefile.sub Index: ChangeLog =================================================================== --- ChangeLog (revision 22777) +++ ChangeLog (revision 22778) @@ -1,3 +1,7 @@ +Thu Mar 5 11:52:16 2009 Nobuyoshi Nakada <nobu@r...> + + * win32/Makefile.sub (make_insns_rules): rule to make rules for insns. + Thu Mar 5 11:27:16 2009 Nobuyoshi Nakada <nobu@r...> * win32/Makefile.sub (miniruby.exe): workaround for a failure of Index: common.mk =================================================================== --- common.mk (revision 22777) +++ common.mk (revision 22778) @@ -637,26 +637,22 @@ INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ vmtc.inc vm.inc -$(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) $@ +{$(VPATH)}minsns.inc: $(srcdir)/template/minsns.inc.tmpl -minsns.inc: $(srcdir)/template/minsns.inc.tmpl +{$(VPATH)}opt_sc.inc: $(srcdir)/template/opt_sc.inc.tmpl -opt_sc.inc: $(srcdir)/template/opt_sc.inc.tmpl +{$(VPATH)}optinsn.inc: $(srcdir)/template/optinsn.inc.tmpl -optinsn.inc: $(srcdir)/template/optinsn.inc.tmpl +{$(VPATH)}optunifs.inc: $(srcdir)/template/optunifs.inc.tmpl -optunifs.inc: $(srcdir)/template/optunifs.inc.tmpl +{$(VPATH)}insns.inc: $(srcdir)/template/insns.inc.tmpl -insns.inc: $(srcdir)/template/insns.inc.tmpl +{$(VPATH)}insns_info.inc: $(srcdir)/template/insns_info.inc.tmpl -insns_info.inc: $(srcdir)/template/insns_info.inc.tmpl +{$(VPATH)}vmtc.inc: $(srcdir)/template/vmtc.inc.tmpl -vmtc.inc: $(srcdir)/template/vmtc.inc.tmpl +{$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl -vm.inc: $(srcdir)/template/vm.inc.tmpl - srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c $(srcdir)/ext/ripper/ripper.c srcs-enc srcs-enc: $(ENC_MK) Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 22777) +++ win32/Makefile.sub (revision 22778) @@ -810,3 +810,19 @@ ext/extinit.obj: ext/extinit.c $(SETUP) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c + +!ifdef insns +make_insns_rules: + @type << +$(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) $(insns) + +<< +!else if [exit > insns_rules.mk] +!else if [for %I in ($(INSNS)) do @$(MAKE) -l insns=%I make_insns_rules >> insns_rules.mk] +!else +! include insns_rules.mk +! if [del insns_rules.mk > nul] +! endif +!endif Index: Makefile.in =================================================================== --- Makefile.in (revision 22777) +++ Makefile.in (revision 22778) @@ -271,3 +271,6 @@ 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): $(srcdir)/insns.def vm_opts.h $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def + $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/