admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

linkage_checker: Distinguish indirect deps from undeclared deps

Browse Source
This commit is contained in:
Andrew Janke 2018-02-10 08:34:23 -05:00
parent 646d696135
commit c946da88ab
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Library/Homebrew/os/mac/linkage_checker.rb
View File

@ -14,6 +14,7 @@ class LinkageChecker
@system_dylibs = Set.new @system_dylibs = Set.new
@broken_dylibs = Set.new @broken_dylibs = Set.new
@variable_dylibs = Set.new @variable_dylibs = Set.new
@indirect_deps = []
@undeclared_deps = [] @undeclared_deps = []
@reverse_links = Hash.new { |h, k| h[k] = Set.new } @reverse_links = Hash.new { |h, k| h[k] = Set.new }
@unnecessary_deps = [] @unnecessary_deps = []
@ -52,7 +53,7 @@ class LinkageChecker
end end
end end
@undeclared_deps, @unnecessary_deps = check_undeclared_deps if formula @indirect_deps, @undeclared_deps, @unnecessary_deps = check_undeclared_deps if formula
end end
def check_undeclared_deps def check_undeclared_deps
@ -62,13 +63,31 @@ class LinkageChecker
formula.build.without?(dep) formula.build.without?(dep)
end end
declared_deps = formula.deps.reject { |dep| filter_out.call(dep) }.map(&:name) declared_deps = formula.deps.reject { |dep| filter_out.call(dep) }.map(&:name)
recursive_deps = keg.to_formula.runtime_dependencies.map { |dep| dep.to_formula.full_name }
declared_dep_names = declared_deps.map { |dep| dep.split("/").last } declared_dep_names = declared_deps.map { |dep| dep.split("/").last }
undeclared_deps = @brewed_dylibs.keys.reject do |full_name| indirect_deps = []
undeclared_deps = []
@brewed_dylibs.each_key do |full_name|
name = full_name.split("/").last name = full_name.split("/").last
next true if name == formula.name next if name == formula.name
declared_dep_names.include?(name) if recursive_deps.include?(name)
indirect_deps << full_name unless declared_dep_names.include?(name)
else
undeclared_deps << full_name
end end
undeclared_deps.sort do |a, b| end
sort_by_formula_full_name!(indirect_deps)
sort_by_formula_full_name!(undeclared_deps)
unnecessary_deps = declared_dep_names.reject do |full_name|
name = full_name.split("/").last
next true if Formula[name].bin.directory?
@brewed_dylibs.keys.map { |x| x.split("/").last }.include?(name)
end
[indirect_deps, undeclared_deps, unnecessary_deps]
end
def sort_by_formula_full_name!(arr)
arr.sort! do |a, b|
if a.include?("/") && !b.include?("/") if a.include?("/") && !b.include?("/")
1 1
elsif !a.include?("/") && b.include?("/") elsif !a.include?("/") && b.include?("/")
@ -77,17 +96,12 @@ class LinkageChecker
a <=> b a <=> b
end end
end end
unnecessary_deps = declared_dep_names.reject do |full_name|
name = full_name.split("/").last
next true if Formula[name].bin.directory?
@brewed_dylibs.keys.map { |x| x.split("/").last }.include?(name)
end
[undeclared_deps, unnecessary_deps]
end end
def display_normal_output def display_normal_output
display_items "System libraries", @system_dylibs display_items "System libraries", @system_dylibs
display_items "Homebrew libraries", @brewed_dylibs display_items "Homebrew libraries", @brewed_dylibs
display_items "Indirect dependencies with linkage", @indirect_deps
display_items "Variable-referenced libraries", @variable_dylibs display_items "Variable-referenced libraries", @variable_dylibs
display_items "Missing libraries", @broken_dylibs display_items "Missing libraries", @broken_dylibs
display_items "Undeclared dependencies with linkage", @undeclared_deps display_items "Undeclared dependencies with linkage", @undeclared_deps