1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,

Browse Source 
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: svn+ssh://ci.ruby-lang.org/ruby/trunk@21591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2009-01-16 03:38:58 +00:00
parent f1e87dd9ac
commit c68fdad473
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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 12:15:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* include/ruby/ruby.h (PRI_PTRDIFF_PREFIX): must define as string.

37
win32/Makefile.sub
View File

@ -771,37 +771,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) $@