kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* common.mk, Makefile.in, win32/Makefile.sub ($(INSNS), node_name.inc,

Browse source 
known_errors.inc, miniprelude.c, newline.c): move rules from common.mk
	  to {Makefile.in,win32/Makefile.sub) for nmake.
	  [ruby-core:20993]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2009-01-02 18:03:05 +00:00
parent 1e516be711
commit 0d1e85ee4b
4 changed files with 59 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sat Jan 3 03:00:42 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* 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@tsg.ne.jp> Fri Jan 2 23:51:41 2009 Yusuke Endoh <mame@tsg.ne.jp>
* test/ruby/test_sleep.rb (test_sleep_5sec): stop gc. * test/ruby/test_sleep.rb (test_sleep_5sec): stop gc.

16
Makefile.in
View file

@ -269,3 +269,19 @@ update-rubyspec:
test-rubyspec: test-rubyspec:
@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi @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) $(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

8
common.mk
View file

@ -621,8 +621,6 @@ INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
INSNS2VMOPT = --srcdir="$(srcdir)" INSNS2VMOPT = --srcdir="$(srcdir)"
$(INSNS): $(srcdir)/insns.def {$(VPATH)}vm_opts.h $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def $(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 minsns.inc: $(srcdir)/template/minsns.inc.tmpl
@ -650,7 +648,6 @@ incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(
insns: $(INSNS) insns: $(INSNS)
node_name.inc: {$(VPATH)}node.h node_name.inc: {$(VPATH)}node.h
$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
encdb.h: $(PREP) encdb.h: $(PREP)
$(MINIRUBY) $(srcdir)/enc/make_encdb.rb $@.new $(srcdir)/enc enc $(MINIRUBY) $(srcdir)/enc/make_encdb.rb $@.new $(srcdir)/enc enc
@ -665,10 +662,8 @@ transdb.h: $(PREP) srcs-enc
# $(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h # $(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h
known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def 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 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) prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(PRELUDE_SCRIPTS) $(PREP)
$(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@ $(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
@ -676,9 +671,6 @@ prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(PRELUDE_SCRIPTS) $(PR
golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP) golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
$(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@ $(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 prereq: incs srcs preludes
preludes: {$(VPATH)}miniprelude.c preludes: {$(VPATH)}miniprelude.c

36
win32/Makefile.sub
View file

@ -757,3 +757,39 @@ dir.$(OBJEXT) win32.$(OBJEXT): {$(srcdir)}win32/dir.h
ext/extinit.obj: ext/extinit.c $(SETUP) ext/extinit.obj: ext/extinit.c $(SETUP)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c $(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 \
)