Refactoring based on suggestions

Defaulting zip_dep_if_needed(tags) and bzip2_dep_if_needed(tags)
methods to those on Linux and overriding them on macOS.
This commit is contained in:
Maxim Belkin 2018-02-19 06:49:42 +00:00
parent 1b74f21492
commit 3dabebbd16
3 changed files with 6 additions and 26 deletions

View File

@ -72,9 +72,13 @@ class DependencyCollector
def ld64_dep_if_needed(*); end def ld64_dep_if_needed(*); end
def zip_dep_if_needed(*); end def zip_dep_if_needed(tags)
Dependency.new("zip", tags)
end
def bzip2_dep_if_needed(*); end def bzip2_dep_if_needed(tags)
Dependency.new("bzip2", tags)
end
def self.tar_needs_xz_dependency? def self.tar_needs_xz_dependency?
!new.xz_dep_if_needed([]).nil? !new.xz_dep_if_needed([]).nil?

View File

@ -1,3 +1,2 @@
require "dependency_collector" require "dependency_collector"
require "extend/os/mac/dependency_collector" if OS.mac? require "extend/os/mac/dependency_collector" if OS.mac?
require "extend/os/linux/dependency_collector" if OS.linux?

View File

@ -1,23 +0,0 @@
class DependencyCollector
def git_dep_if_needed(tags)
Dependency.new("git", tags)
end
def cvs_dep_if_needed(tags)
Dependency.new("cvs", tags)
end
def xz_dep_if_needed(tags)
Dependency.new("xz", tags)
end
def ld64_dep_if_needed(*); end
def zip_dep_if_needed(tags)
Dependency.new("zip", tags)
end
def bzip2_dep_if_needed(tags)
Dependency.new("bzip2", tags)
end
end