aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2013-10-28 14:44:20 -0500
committerJack Nagel2013-10-28 14:44:20 -0500
commitc0b17c8c2020213cba3fb61089c5764f54dd0995 (patch)
tree71e370c2ca3ca5a6dfa247ae25616c5282b9def7
parentc8bf4730e2e5adea2617aa4a585a26ec5b59cff8 (diff)
downloadhomebrew-c0b17c8c2020213cba3fb61089c5764f54dd0995.tar.bz2
Add ant dependency
Closes #23484. Closes #23494. Closes #23681.
-rw-r--r--Library/Formula/closure-compiler.rb2
-rw-r--r--Library/Formula/sleuthkit.rb1
-rw-r--r--Library/Formula/voldemort.rb2
-rw-r--r--Library/Formula/yeti.rb2
-rw-r--r--Library/Formula/zookeeper.rb1
-rw-r--r--Library/Homebrew/dependency_collector.rb8
6 files changed, 16 insertions, 0 deletions
diff --git a/Library/Formula/closure-compiler.rb b/Library/Formula/closure-compiler.rb
index 81450392a..a222843fe 100644
--- a/Library/Formula/closure-compiler.rb
+++ b/Library/Formula/closure-compiler.rb
@@ -6,6 +6,8 @@ class ClosureCompiler < Formula
head 'https://code.google.com/p/closure-compiler/', :using => :git
+ depends_on :ant
+
def install
system "ant", "clean"
system "ant"
diff --git a/Library/Formula/sleuthkit.rb b/Library/Formula/sleuthkit.rb
index ed2446e90..be8ce96a7 100644
--- a/Library/Formula/sleuthkit.rb
+++ b/Library/Formula/sleuthkit.rb
@@ -15,6 +15,7 @@ class Sleuthkit < Formula
option 'with-jni', "Build Sleuthkit with JNI bindings"
+ depends_on :ant
depends_on 'afflib' => :optional
depends_on 'libewf' => :optional
diff --git a/Library/Formula/voldemort.rb b/Library/Formula/voldemort.rb
index 4699d2a29..9fc7d0caf 100644
--- a/Library/Formula/voldemort.rb
+++ b/Library/Formula/voldemort.rb
@@ -5,6 +5,8 @@ class Voldemort < Formula
url 'https://github.com/voldemort/voldemort/archive/v1.4.0.tar.gz'
sha1 'f07b552d494b9b68d9c4e3561384bc932e7e7bd8'
+ depends_on :ant
+
skip_clean 'libexec/config'
def install
diff --git a/Library/Formula/yeti.rb b/Library/Formula/yeti.rb
index 23d7dec30..9111e4e4d 100644
--- a/Library/Formula/yeti.rb
+++ b/Library/Formula/yeti.rb
@@ -7,6 +7,8 @@ class Yeti < Formula
head 'https://github.com/mth/yeti.git'
+ depends_on :ant
+
def install
system "ant jar"
libexec.install "yeti.jar"
diff --git a/Library/Formula/zookeeper.rb b/Library/Formula/zookeeper.rb
index be6f10f12..01740bc71 100644
--- a/Library/Formula/zookeeper.rb
+++ b/Library/Formula/zookeeper.rb
@@ -15,6 +15,7 @@ class Zookeeper < Formula
option "c", "Build C bindings."
option "perl", "Build Perl bindings."
+ depends_on :ant
depends_on :python => :optional
def shim_script target
diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index f8bd2d41a..43e701078 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -109,6 +109,7 @@ class DependencyCollector
when :python3 then PythonDependency.new("3", tags)
# Tiger's ld is too old to properly link some software
when :ld64 then LD64Dependency.new if MacOS.version < :leopard
+ when :ant then ant_dep(spec, tags)
else
raise "Unsupported special dependency #{spec.inspect}"
end
@@ -141,6 +142,13 @@ class DependencyCollector
end
end
+ def ant_dep(spec, tags)
+ if MacOS.version >= :mavericks
+ tags << :build
+ Dependency.new(spec.to_s, tags)
+ end
+ end
+
def resource_dep(spec, tags)
tags << :build
strategy = spec.download_strategy