ruby-changes:10052
From: yugui <ko1@a...>
Date: Fri, 16 Jan 2009 13:07:41 +0900 (JST)
Subject: [ruby-changes:10052] Ruby:r21596 (ruby_1_9_1): merges r21591 from trunk into ruby_1_9_1.
yugui 2009-01-16 13:07:23 +0900 (Fri, 16 Jan 2009) New Revision: 21596 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21596 Log: merges r21591 from trunk into ruby_1_9_1. * win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc, miniprelude.c, newline.c): if dependencies is newer than targets or targets don't exist, try to create targets with BASERUBY. no need to detect errors there because the absence of BASERUBY is not abnormal. after the try, if the targets still don't exist, copy them from $(srcdir). Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/win32/Makefile.sub Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 21595) +++ ruby_1_9_1/ChangeLog (revision 21596) @@ -1,3 +1,12 @@ +Fri Jan 16 12:27:50 2009 NAKAMURA Usaku <usa@r...> + + * win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc, + miniprelude.c, newline.c): if dependencies is newer than targets or + targets don't exist, try to create targets with BASERUBY. no need to + detect errors there because the absence of BASERUBY is not abnormal. + after the try, if the targets still don't exist, copy them from + $(srcdir). + Fri Jan 16 11:47:56 2009 Nobuyoshi Nakada <nobu@r...> * parse.y (rb_parse_in_main): fixed typo. Index: ruby_1_9_1/win32/Makefile.sub =================================================================== --- ruby_1_9_1/win32/Makefile.sub (revision 21595) +++ ruby_1_9_1/win32/Makefile.sub (revision 21596) @@ -767,37 +767,22 @@ $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c $(INSNS): - @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ - ) else ( \ - @$(RM) $(PROGRAM) & \ - $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ \ - ) + @$(RM) $(PROGRAM) + -$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ + if not exist $@ copy $(srcdir:/=\)\$(@F) $@ node_name.inc: - @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ - ) else ( \ - $(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ \ - ) + -$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ + if not exist $@ copy $(srcdir:/=\)\$(@F) $@ known_errors.inc: - @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ - ) else ( \ - $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(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 + if not exist $@ copy $(srcdir:/=\)\$(@F) $@ miniprelude.c: - @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ - ) else ( \ - $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ \ - ) + -$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ + if not exist $@ copy $(srcdir:/=\)\$(@F) $@ newline.c: - @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ - ) else ( \ - $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans \ - ) + -$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans + if not exist $@ copy $(srcdir:/=\)\$(@F) $@ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/