diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-16 04:07:23 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-16 04:07:23 +0000 |
| commit | e6c0123a599aaf1b591a95c63b620caa659bc13c (patch) | |
| tree | bcffe0d89a0903905b06ca1ccedeeb09c6210b96 | |
| parent | 8c02f3f0ef703b05a74f4622101305fe17b9bd77 (diff) | |
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).
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | win32/Makefile.sub | 37 |
2 files changed, 20 insertions, 26 deletions
@@ -1,3 +1,12 @@ +Fri Jan 16 12:27:50 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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@ruby-lang.org> * parse.y (rb_parse_in_main): fixed typo. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index f76e2a7e4..d7691cd8b 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -767,37 +767,22 @@ ext/extinit.obj: ext/extinit.c $(SETUP) $(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) $@ |