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, win32/Makefile.sub (probes.dmyh): now be made in current

Browse source 
(=build) directory if build from the repository.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-11-22 12:49:59 +00:00
parent b4f25e30df
commit f317a1562e
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Nov 22 21:48:48 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* common.mk, win32/Makefile.sub (probes.dmyh): now be made in current
(=build) directory if build from the repository.
Thu Nov 22 21:34:51 2012 Tadayoshi Funaba <tadf@dotrb.org> Thu Nov 22 21:34:51 2012 Tadayoshi Funaba <tadf@dotrb.org>
* test/ruby/test_rubyoptions.rb: added a test. * test/ruby/test_rubyoptions.rb: added a test.

6
common.mk
View file

@ -855,7 +855,7 @@ srcs-enc: $(ENC_MK)
all-incs: incs all-incs: incs
incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \ incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \
$(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h {$(VPATH)}id.h $(srcdir)/probes.dmyh $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h {$(VPATH)}id.h {$(VPATH)}probes.dmyh
insns: $(INSNS) insns: $(INSNS)
@ -896,10 +896,10 @@ golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@ $(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
$(srcdir)/probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@ $(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@
probes.h: $(srcdir)/probes.$(DTRACE_EXT) probes.h: {$(VPATH)}probes.$(DTRACE_EXT)
prereq: incs srcs preludes PHONY prereq: incs srcs preludes PHONY

9
win32/Makefile.sub
View file

@ -1067,9 +1067,14 @@ ext/extinit.obj: ext/extinit.c $(SETUP)
$(ECHO) compiling ext/extinit.c $(ECHO) compiling ext/extinit.c
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
probes.h: {$(srcdir)}probes.dmyh probes.h: {$(VPATH)}probes.dmyh
@$(ECHO) copying dummy $(DEST_FILE) @$(ECHO) copying dummy $(DEST_FILE)
$(Q) $(CP) $(srcdir:/=\)\probes.dmyh $(OS_DEST_FILE) @if exist probes.dmyh (\
$(Q) $(CP) probes.dmyh $(OS_DEST_FILE)\
) else (\
$(Q) $(CP) $(srcdir:/=\)\probes.dmyh $(OS_DEST_FILE)\
)
INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
vmtc.inc vm.inc vmtc.inc vm.inc