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

ruby-changes:21935

From: usa <ko1@a...>
Date: Thu, 8 Dec 2011 22:34:43 +0900 (JST)
Subject: [ruby-changes:21935] usa:r33984 (trunk): * ext/extmk.rb (extract_makefile): need to sort the array of current

usa	2011-12-08 22:34:33 +0900 (Thu, 08 Dec 2011)

  New Revision: 33984

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

  Log:
    * ext/extmk.rb (extract_makefile): need to sort the array of current
      srcs before comparing to the sorted old srcs.
      fixed the problem that the configuring stage of exts were always
      run, introduced at r33801.

  Modified files:
    trunk/ChangeLog
    trunk/ext/extmk.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33983)
+++ ChangeLog	(revision 33984)
@@ -1,3 +1,10 @@
+Thu Dec  8 22:31:13 2011  NAKAMURA Usaku  <usa@r...>
+
+	* ext/extmk.rb (extract_makefile): need to sort the array of current
+	  srcs before comparing to the sorted old srcs.
+	  fixed the problem that the configuring stage of exts were always
+	  run, introduced at r33801.
+
 Thu Dec  8 13:26:24 2011  NAKAMURA Usaku  <usa@r...>
 
 	* test/rexml/test_order.rb (OrderTester#test_more_ordering): use
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 33983)
+++ ext/extmk.rb	(revision 33984)
@@ -73,7 +73,7 @@
     end
     return false
   end
-  srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")].map {|fn| File.basename(fn)}
+  srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")].sort.map {|fn| File.basename(fn)}
   if !srcs.empty?
     old_srcs = m[/^ORIG_SRCS[ \t]*=[ \t](.*)/, 1] or return false
     old_srcs.split.sort == srcs or return false

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

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