1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert r40194 "mkmf.rb: timestamp directory"

Browse Source 
It breaks build.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-04-08 20:51:52 +00:00
parent 3b0faabbb5
commit fc7c2faab3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mkmf.rb
View File

@ -1922,7 +1922,7 @@ preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''}
def timestamp_file(name) def timestamp_file(name)
name = name.gsub(/(\$[({]|[})])|(\/+)|[^-.\w]+/) {$1 ? "" : $2 ? ".-." : "_"} name = name.gsub(/(\$[({]|[})])|(\/+)|[^-.\w]+/) {$1 ? "" : $2 ? ".-." : "_"}
"$(TIMESTAMP_DIR)/.#{name}.time" "./.#{name}.time"
end end
# :startdoc: # :startdoc:
@ -2174,7 +2174,6 @@ DLLIB = #{dllib}
EXTSTATIC = #{$static || ""} EXTSTATIC = #{$static || ""}
STATIC_LIB = #{staticlib unless $static.nil?} STATIC_LIB = #{staticlib unless $static.nil?}
#{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""} #{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""}
TIMESTAMP_DIR = #{$extout ? '$(extout)/.timestamp' : '.'}
" #" " #"
# TODO: fixme # TODO: fixme
install_dirs.each {|d| mfile.print("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]} install_dirs.each {|d| mfile.print("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]}
@ -2268,7 +2267,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
dirs.unshift(sodir) if target and !dirs.include?(sodir) dirs.unshift(sodir) if target and !dirs.include?(sodir)
dirs.each do |d| dirs.each do |d|
t = timestamp_file(d) t = timestamp_file(d)
mfile.print "#{t}:\n\t$(Q) $(MAKEDIRS) $(@D) #{d}\n\t$(Q) $(TOUCH) $@\n" mfile.print "#{t}:\n\t$(Q) $(MAKEDIRS) #{d}\n\t$(Q) $(TOUCH) $@\n"
end end
mfile.print <<-SITEINSTALL mfile.print <<-SITEINSTALL