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

* tool/update-deps: Use $(hdrdir) if possible.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-12-19 13:34:37 +00:00
parent 4935c13054
commit 7317392a38
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Dec 19 22:33:13 2014 Tanaka Akira <akr@fsij.org>
* tool/update-deps: Use $(hdrdir) if possible.
Fri Dec 19 22:10:00 2014 Kenta Murata <mrkn@cookpad.com>
* ext/bigdecimal/depend: Fix dependencies to make bigdecimal

23
tool/update-deps
View file

@ -154,13 +154,21 @@ FILES_NEED_VPATH = %w[
# Multiple files with same filename.
# It is not good idea to refer them using VPATH.
FILES_SAME_NAME = %w[
include/ruby.h
# Files in FILES_SAME_NAME_INC is referenced using $(hdrdir).
# Files in FILES_SAME_NAME_TOP is referenced using $(top_srcdir).
# include/ruby.h is referenced using $(top_srcdir) because mkmf.rb replaces
# $(hdrdir)/ruby.h to $(hdrdir)/ruby/ruby.h
FILES_SAME_NAME_INC = %w[
include/ruby/ruby.h
version.h
include/ruby/version.h
]
FILES_SAME_NAME_TOP = %w[
include/ruby.h
version.h
]
# Other source files exist in the source directory.
def in_makefile(target, source)
@ -173,7 +181,8 @@ def in_makefile(target, source)
when *FILES_IN_SOURCE_DIRECTORY then source2 = "$(top_srcdir)/#{source}"
when *FILES_IN_BUILD_DIRECTORY then source2 = "{$(VPATH)}#{source}" # VPATH is not used now but it may changed in future.
when *FILES_NEED_VPATH then source2 = "{$(VPATH)}#{source}"
when *FILES_SAME_NAME then source2 = "$(top_srcdir)/#{source}"
when *FILES_SAME_NAME_INC then source2 = "$(hdrdir)/#{source.sub(%r{\Ainclude/},'')}"
when *FILES_SAME_NAME_TOP then source2 = "$(top_srcdir)/#{source}"
when 'thread_pthread.c' then source2 = '{$(VPATH)}thread_$(THREAD_MODEL).c'
when 'thread_pthread.h' then source2 = '{$(VPATH)}thread_$(THREAD_MODEL).h'
when %r{\A[^/]*\z} then source2 = "{$(VPATH)}#{File.basename source}"
@ -192,7 +201,8 @@ def in_makefile(target, source)
when *FILES_IN_SOURCE_DIRECTORY then source2 = "$(top_srcdir)/#{source}"
when *FILES_IN_BUILD_DIRECTORY then source2 = source
when *FILES_NEED_VPATH then source2 = source
when *FILES_SAME_NAME then source2 = "$(top_srcdir)/#{source}"
when *FILES_SAME_NAME_INC then source2 = "$(hdrdir)/#{source.sub(%r{\Ainclude/},'')}"
when *FILES_SAME_NAME_TOP then source2 = "$(top_srcdir)/#{source}"
when %r{\A\.ext/include/[^/]+/ruby/} then source2 = $'
when %r{\Ainclude/ruby/} then source2 = $'
when %r{\Aenc/} then source2 = source
@ -209,7 +219,8 @@ def in_makefile(target, source)
when *FILES_IN_SOURCE_DIRECTORY then source2 = "$(top_srcdir)/#{source}"
when *FILES_IN_BUILD_DIRECTORY then source2 = relpath
when *FILES_NEED_VPATH then source2 = "{$(VPATH)}#{File.basename source}"
when *FILES_SAME_NAME then source2 = "$(top_srcdir)/#{source}"
when *FILES_SAME_NAME_INC then source2 = "$(hdrdir)/#{source.sub(%r{\Ainclude/},'')}"
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)"