From ffdb70a696725aa89df70d7bffb72d59b943bc78 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 20 Feb 2013 12:06:10 +0000 Subject: extmk.rb: rename variables * ext/extmk.rb: rename working variables as more descriptive so no shadowing local variable warnings, and remove unused variables. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/extmk.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'ext/extmk.rb') diff --git a/ext/extmk.rb b/ext/extmk.rb index 4e5f64d4f6..8997892dc6 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -550,17 +550,18 @@ unless $extlist.empty? list = $extlist.dup built = [] while e = list.shift - s,t,i,r,os = e - if r and !(r -= built).empty? + _, target, feature, required = e + if required and !(required -= built).empty? l = list.size - if (while l > 0; break true if r.include?(list[l-=1][1]) end) + if (while l > 0; break true if required.include?(list[l-=1][1]) end) list.insert(l + 1, e) end next end - $extinit << " init(Init_#{File.basename i}, \"#{i}.so\");\n" - $extobjs << format("ext/%s/%s.%s", t, File.basename(i), $LIBEXT) - built << t + base = File.basename(feature) + $extinit << " init(Init_#{base}, \"#{feature}.so\");\n" + $extobjs << format("ext/%s/%s.%s", target, base, $LIBEXT) + built << target end src = %{\ -- cgit v1.2.3