nobu	2016-07-06 14:03:14 +0900 (Wed, 06 Jul 2016)

  New Revision: 55584

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55584

  Log:
    probes.dmyh: remove preprocessor directives
    
    * tool/gen_dummy_probes.rb: remove include and conditional
      directives from probes.dmyh which are removed by preprocessing.
    
    * common.mk: remove unnecessary dependencies on vm_opts.h via
      probes.dmyh.

  Modified files:
    trunk/common.mk
    trunk/ext/ripper/depend
    trunk/tool/gen_dummy_probes.rb
Index: tool/gen_dummy_probes.rb
===================================================================
--- tool/gen_dummy_probes.rb	(revision 55583)
+++ tool/gen_dummy_probes.rb	(revision 55584)
@@ -9,8 +9,8 @@ text = ARGF.read https://github.com/ruby/ruby/blob/trunk/tool/gen_dummy_probes.rb#L9
 # remove comments
 text.gsub!(%r'(?:^ *)?/\*.*?\*/\n?'m, '')
 
-# remove the pragma declarations
-text.gsub!(/^#pragma.*\n/, '')
+# remove the pragma declarations and ifdefs
+text.gsub!(/^#(?:pragma|include|if|endif).*\n/, '')
 
 # replace the provider section with the start of the header file
 text.gsub!(/provider ruby \{/, "#ifndef\t_PROBES_H\n#define\t_PROBES_H\n#define DTRACE_PROBES_DISABLED 1\n")
Index: ext/ripper/depend
===================================================================
--- ext/ripper/depend	(revision 55583)
+++ ext/ripper/depend	(revision 55584)
@@ -66,7 +66,6 @@ ripper.o: $(top_srcdir)/internal.h https://github.com/ruby/ruby/blob/trunk/ext/ripper/depend#L66
 ripper.o: $(top_srcdir)/node.h
 ripper.o: $(top_srcdir)/regenc.h
 ripper.o: $(top_srcdir)/symbol.h
-ripper.o: $(top_srcdir)/vm_opts.h
 ripper.o: ../../probes.h
 ripper.o: eventids2.c
 ripper.o: ripper.y
Index: common.mk
===================================================================
--- common.mk	(revision 55583)
+++ common.mk	(revision 55584)
@@ -1182,7 +1182,6 @@ array.$(OBJEXT): {$(VPATH)}ruby_assert.h https://github.com/ruby/ruby/blob/trunk/common.mk#L1182
 array.$(OBJEXT): {$(VPATH)}st.h
 array.$(OBJEXT): {$(VPATH)}subst.h
 array.$(OBJEXT): {$(VPATH)}util.h
-array.$(OBJEXT): {$(VPATH)}vm_opts.h
 bignum.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 bignum.$(OBJEXT): $(top_srcdir)/include/ruby.h
 bignum.$(OBJEXT): {$(VPATH)}bignum.c
@@ -1657,7 +1656,6 @@ hash.$(OBJEXT): {$(VPATH)}st.h https://github.com/ruby/ruby/blob/trunk/common.mk#L1656
 hash.$(OBJEXT): {$(VPATH)}subst.h
 hash.$(OBJEXT): {$(VPATH)}symbol.h
 hash.$(OBJEXT): {$(VPATH)}util.h
-hash.$(OBJEXT): {$(VPATH)}vm_opts.h
 inits.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 inits.$(OBJEXT): $(top_srcdir)/include/ruby.h
 inits.$(OBJEXT): {$(VPATH)}config.h
@@ -1896,7 +1894,6 @@ object.$(OBJEXT): {$(VPATH)}probes.h https://github.com/ruby/ruby/blob/trunk/common.mk#L1894
 object.$(OBJEXT): {$(VPATH)}st.h
 object.$(OBJEXT): {$(VPATH)}subst.h
 object.$(OBJEXT): {$(VPATH)}util.h
-object.$(OBJEXT): {$(VPATH)}vm_opts.h
 pack.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 pack.$(OBJEXT): $(top_srcdir)/include/ruby.h
 pack.$(OBJEXT): {$(VPATH)}config.h
@@ -1935,7 +1932,6 @@ parse.$(OBJEXT): {$(VPATH)}st.h https://github.com/ruby/ruby/blob/trunk/common.mk#L1932
 parse.$(OBJEXT): {$(VPATH)}subst.h
 parse.$(OBJEXT): {$(VPATH)}symbol.h
 parse.$(OBJEXT): {$(VPATH)}util.h
-parse.$(OBJEXT): {$(VPATH)}vm_opts.h
 prelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 prelude.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h
@@ -2323,7 +2319,6 @@ string.$(OBJEXT): {$(VPATH)}ruby_assert. https://github.com/ruby/ruby/blob/trunk/common.mk#L2319
 string.$(OBJEXT): {$(VPATH)}st.h
 string.$(OBJEXT): {$(VPATH)}string.c
 string.$(OBJEXT): {$(VPATH)}subst.h
-string.$(OBJEXT): {$(VPATH)}vm_opts.h
 strlcat.$(OBJEXT): {$(VPATH)}config.h
 strlcat.$(OBJEXT): {$(VPATH)}missing.h
 strlcat.$(OBJEXT): {$(VPATH)}strlcat.c
@@ -2379,7 +2374,6 @@ symbol.$(OBJEXT): {$(VPATH)}st.h https://github.com/ruby/ruby/blob/trunk/common.mk#L2374
 symbol.$(OBJEXT): {$(VPATH)}subst.h
 symbol.$(OBJEXT): {$(VPATH)}symbol.c
 symbol.$(OBJEXT): {$(VPATH)}symbol.h
-symbol.$(OBJEXT): {$(VPATH)}vm_opts.h
 thread.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 thread.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 thread.$(OBJEXT): $(CCAN_DIR)/list/list.h

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/