Skip to content

Commit

Permalink
* ext/extmk.rb (extract_makefile): need to sort the array of current
Browse files Browse the repository at this point in the history
  srcs before comparing to the sorted old srcs.
  fixed the problem that the configuring stage of exts were always
  run, introduced at r33801.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
unak committed Dec 8, 2011
1 parent 518a340 commit d9d841e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Thu Dec 8 22:31:13 2011 NAKAMURA Usaku <usa@ruby-lang.org>

* 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@ruby-lang.org>

* test/rexml/test_order.rb (OrderTester#test_more_ordering): use
Expand Down
2 changes: 1 addition & 1 deletion ext/extmk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def extract_makefile(makefile, keep = true)
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
Expand Down

0 comments on commit d9d841e

Please sign in to comment.