[前][次][番号順一覧][スレッド一覧]

ruby-changes:28147

From: naruse <ko1@a...>
Date: Tue, 9 Apr 2013 05:52:14 +0900 (JST)
Subject: [ruby-changes:28147] naruse:r40199 (trunk): Revert r40194 "mkmf.rb: timestamp directory"

naruse	2013-04-09 05:51:52 +0900 (Tue, 09 Apr 2013)

  New Revision: 40199

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40199

  Log:
    Revert r40194 "mkmf.rb: timestamp directory"
    
    It breaks build.

  Modified files:
    trunk/lib/mkmf.rb

Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 40198)
+++ lib/mkmf.rb	(revision 40199)
@@ -1922,7 +1922,7 @@ preload = #{defined?($preload) && $prelo https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1922
 
   def timestamp_file(name)
     name = name.gsub(/(\$[({]|[})])|(\/+)|[^-.\w]+/) {$1 ? "" : $2 ? ".-." : "_"}
-    "$(TIMESTAMP_DIR)/.#{name}.time"
+    "./.#{name}.time"
   end
   # :startdoc:
 
@@ -2174,7 +2174,6 @@ DLLIB = #{dllib} https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2174
 EXTSTATIC = #{$static || ""}
 STATIC_LIB = #{staticlib unless $static.nil?}
 #{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""}
-TIMESTAMP_DIR = #{$extout ? '$(extout)/.timestamp' : '.'}
 " #"
     # TODO: fixme
     install_dirs.each {|d| mfile.print("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]}
@@ -2268,7 +2267,7 @@ static: $(STATIC_LIB)#{$extout ? " insta https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2267
     dirs.unshift(sodir) if target and !dirs.include?(sodir)
     dirs.each do |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
 
     mfile.print <<-SITEINSTALL

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

[前][次][番号順一覧][スレッド一覧]