ruby-changes:54868
From: nobu <ko1@a...>
Date: Thu, 14 Feb 2019 14:42:18 +0900 (JST)
Subject: [ruby-changes:54868] nobu:r67073 (trunk): Prefer relative directory from srcdir to top_srcdir
nobu 2019-02-14 14:42:14 +0900 (Thu, 14 Feb 2019) New Revision: 67073 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=67073 Log: Prefer relative directory from srcdir to top_srcdir Modified files: trunk/ext/digest/bubblebabble/depend trunk/ext/digest/md5/depend trunk/ext/digest/rmd160/depend trunk/ext/digest/sha1/depend trunk/ext/digest/sha2/depend trunk/ext/json/generator/depend trunk/ext/json/parser/depend trunk/tool/update-deps Index: tool/update-deps =================================================================== --- tool/update-deps (revision 67072) +++ tool/update-deps (revision 67073) @@ -211,8 +211,9 @@ def in_makefile(target, source) https://github.com/ruby/ruby/blob/trunk/tool/update-deps#L211 end ["enc/depend", target2, source2] when %r{\Aext/} - unless File.exist?("#{File.dirname(target)}/extconf.rb") - warn "warning: not found: #{File.dirname(target)}/extconf.rb" + targetdir = File.dirname(target) + unless File.exist?("#{targetdir}/extconf.rb") + warn "warning: not found: #{targetdir}/extconf.rb" end target2 = File.basename(target) relpath = Pathname(source).relative_path_from(Pathname(target).dirname).to_s @@ -224,8 +225,9 @@ def in_makefile(target, source) https://github.com/ruby/ruby/blob/trunk/tool/update-deps#L225 when *FILES_SAME_NAME_TOP then source2 = "$(top_srcdir)/#{source}" when %r{\A\.ext/include/[^/]+/ruby/} then source2 = "$(arch_hdrdir)/ruby/#{$'}" when %r{\Ainclude/} then source2 = "$(hdrdir)/#{$'}" - when %r{\A#{Regexp.escape File.dirname(target)}/extconf\.h\z} then source2 = "$(RUBY_EXTCONF_H)" - when %r{\A#{Regexp.escape File.dirname(target)}/} then source2 = $' + when %r{\A#{Regexp.escape targetdir}/extconf\.h\z} then source2 = "$(RUBY_EXTCONF_H)" + when %r{\A#{Regexp.escape targetdir}/} then source2 = $' + when %r{\A#{Regexp.escape File.dirname(targetdir)}/} then source2 = "$(srcdir)/../#{$'}" else source2 = "$(top_srcdir)/#{source}" end ["#{File.dirname(target)}/depend", target2, source2] Index: ext/digest/bubblebabble/depend =================================================================== --- ext/digest/bubblebabble/depend (revision 67072) +++ ext/digest/bubblebabble/depend (revision 67073) @@ -9,6 +9,6 @@ bubblebabble.o: $(hdrdir)/ruby/missing.h https://github.com/ruby/ruby/blob/trunk/ext/digest/bubblebabble/depend#L9 bubblebabble.o: $(hdrdir)/ruby/ruby.h bubblebabble.o: $(hdrdir)/ruby/st.h bubblebabble.o: $(hdrdir)/ruby/subst.h -bubblebabble.o: $(top_srcdir)/ext/digest/digest.h +bubblebabble.o: $(srcdir)/../digest.h bubblebabble.o: bubblebabble.c # AUTOGENERATED DEPENDENCIES END Index: ext/digest/md5/depend =================================================================== --- ext/digest/md5/depend (revision 67072) +++ ext/digest/md5/depend (revision 67073) @@ -12,7 +12,7 @@ md5init.o: $(hdrdir)/ruby/missing.h https://github.com/ruby/ruby/blob/trunk/ext/digest/md5/depend#L12 md5init.o: $(hdrdir)/ruby/ruby.h md5init.o: $(hdrdir)/ruby/st.h md5init.o: $(hdrdir)/ruby/subst.h -md5init.o: $(top_srcdir)/ext/digest/digest.h +md5init.o: $(srcdir)/../digest.h md5init.o: md5init.c md5init.o: md5ossl.h # AUTOGENERATED DEPENDENCIES END Index: ext/digest/rmd160/depend =================================================================== --- ext/digest/rmd160/depend (revision 67072) +++ ext/digest/rmd160/depend (revision 67073) @@ -12,7 +12,7 @@ rmd160init.o: $(hdrdir)/ruby/missing.h https://github.com/ruby/ruby/blob/trunk/ext/digest/rmd160/depend#L12 rmd160init.o: $(hdrdir)/ruby/ruby.h rmd160init.o: $(hdrdir)/ruby/st.h rmd160init.o: $(hdrdir)/ruby/subst.h -rmd160init.o: $(top_srcdir)/ext/digest/digest.h +rmd160init.o: $(srcdir)/../digest.h rmd160init.o: rmd160init.c rmd160init.o: rmd160ossl.h # AUTOGENERATED DEPENDENCIES END Index: ext/digest/sha1/depend =================================================================== --- ext/digest/sha1/depend (revision 67072) +++ ext/digest/sha1/depend (revision 67073) @@ -12,7 +12,7 @@ sha1init.o: $(hdrdir)/ruby/missing.h https://github.com/ruby/ruby/blob/trunk/ext/digest/sha1/depend#L12 sha1init.o: $(hdrdir)/ruby/ruby.h sha1init.o: $(hdrdir)/ruby/st.h sha1init.o: $(hdrdir)/ruby/subst.h -sha1init.o: $(top_srcdir)/ext/digest/digest.h +sha1init.o: $(srcdir)/../digest.h sha1init.o: sha1init.c sha1init.o: sha1ossl.h # AUTOGENERATED DEPENDENCIES END Index: ext/digest/sha2/depend =================================================================== --- ext/digest/sha2/depend (revision 67072) +++ ext/digest/sha2/depend (revision 67073) @@ -12,7 +12,7 @@ sha2init.o: $(hdrdir)/ruby/missing.h https://github.com/ruby/ruby/blob/trunk/ext/digest/sha2/depend#L12 sha2init.o: $(hdrdir)/ruby/ruby.h sha2init.o: $(hdrdir)/ruby/st.h sha2init.o: $(hdrdir)/ruby/subst.h -sha2init.o: $(top_srcdir)/ext/digest/digest.h +sha2init.o: $(srcdir)/../digest.h sha2init.o: sha2init.c sha2init.o: sha2ossl.h # AUTOGENERATED DEPENDENCIES END Index: ext/json/parser/depend =================================================================== --- ext/json/parser/depend (revision 67072) +++ ext/json/parser/depend (revision 67073) @@ -15,7 +15,7 @@ parser.o: $(hdrdir)/ruby/oniguruma.h https://github.com/ruby/ruby/blob/trunk/ext/json/parser/depend#L15 parser.o: $(hdrdir)/ruby/ruby.h parser.o: $(hdrdir)/ruby/st.h parser.o: $(hdrdir)/ruby/subst.h -parser.o: $(top_srcdir)/ext/json/fbuffer/fbuffer.h +parser.o: $(srcdir)/../fbuffer/fbuffer.h parser.o: parser.c parser.o: parser.h parser.o: parser.rl Index: ext/json/generator/depend =================================================================== --- ext/json/generator/depend (revision 67072) +++ ext/json/generator/depend (revision 67073) @@ -17,7 +17,7 @@ generator.o: $(hdrdir)/ruby/regex.h https://github.com/ruby/ruby/blob/trunk/ext/json/generator/depend#L17 generator.o: $(hdrdir)/ruby/ruby.h generator.o: $(hdrdir)/ruby/st.h generator.o: $(hdrdir)/ruby/subst.h -generator.o: $(top_srcdir)/ext/json/fbuffer/fbuffer.h +generator.o: $(srcdir)/../fbuffer/fbuffer.h generator.o: generator.c generator.o: generator.h # AUTOGENERATED DEPENDENCIES END -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/