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

switch to using extend pattern

Browse Source
This commit is contained in:
Bob W. Hogg 2016-09-18 12:11:30 -04:00
parent 54a086e2fe
commit 0a4bc8494d
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/dependency_collector.rb
View File

@ -5,6 +5,12 @@ require "requirement"
require "requirements" require "requirements"
require "set" require "set"
if OS.mac?
require "extend/os/mac/ant_dep"
elsif OS.linux?
require "extend/os/linux/ant_dep"
end
## A dependency is a formula that another formula needs to install. ## A dependency is a formula that another formula needs to install.
## A requirement is something other than a formula that another formula ## A requirement is something other than a formula that another formula
## needs to be present. This includes external language modules, ## needs to be present. This includes external language modules,
@ -135,12 +141,6 @@ class DependencyCollector
end end
end end
def ant_dep(spec, tags)
if MacOS.version >= :mavericks || !OS.mac?
Dependency.new(spec.to_s, tags)
end
end
def resource_dep(spec, tags) def resource_dep(spec, tags)
tags << :build tags << :build
strategy = spec.download_strategy strategy = spec.download_strategy

4
Library/Homebrew/extend/os/linux/ant_dep.rb Normal file
View File

@ -0,0 +1,4 @@
def ant_dep(spec, tags)
# Always use brewed ant on Linux
Dependency.new(spec.to_s, tags)
end

5
Library/Homebrew/extend/os/mac/ant_dep.rb Normal file
View File

@ -0,0 +1,5 @@
def ant_dep(spec, tags)
if MacOS.version >= :mavericks
Dependency.new(spec.to_s, tags)
end
end