diff options
| author | Xu Cheng | 2015-02-24 13:27:54 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-02-24 14:22:39 +0800 |
| commit | 676c83f900cfa0e225c455fa74582e36306c4703 (patch) | |
| tree | f9aa31c9ee5c3110a8c07f15f93629c5474416e2 /Library/Formula | |
| parent | f746b6c238d99eb9b4eaccb58056064c3dd9b7a6 (diff) | |
| download | homebrew-676c83f900cfa0e225c455fa74582e36306c4703.tar.bz2 | |
hamsterdb: use :java instead of custom requirement
Closes #37119.
Signed-off-by: Xu Cheng <xucheng@me.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/hamsterdb.rb | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/Library/Formula/hamsterdb.rb b/Library/Formula/hamsterdb.rb index 1c515767c..a889dee0a 100644 --- a/Library/Formula/hamsterdb.rb +++ b/Library/Formula/hamsterdb.rb @@ -1,28 +1,3 @@ -class JavaRequirement < Requirement - fatal true - - def self.jdk_home - [ - `/usr/libexec/java_home`.chomp, - ENV['JAVA_HOME'] - ].find { |dir| dir && File.exist?("#{dir}/bin/javac") && File.exist?("#{dir}/include") } - end - - satisfy :build_env => false do - self.class.jdk_home - end - - def message; <<-EOS.undent - Could not find a JDK (i.e. not a JRE) - - Do one of the following: - - install a JDK that is detected with /usr/libexec/java_home - - set the JAVA_HOME environment variable - - specify --without-java - EOS - end -end - class Hamsterdb < Formula homepage "http://hamsterdb.com" url "http://files.hamsterdb.com/dl/hamsterdb-2.1.9.tar.gz" @@ -48,7 +23,7 @@ class Hamsterdb < Formula depends_on "boost" depends_on "gnutls" - depends_on JavaRequirement if build.with? "java" + depends_on :java => :recommended depends_on "protobuf" if build.with? "remote" resource "libuv" do @@ -77,7 +52,7 @@ class Hamsterdb < Formula features = [] if build.with? "java" - features << "JDK=#{JavaRequirement.jdk_home}" + features << "JDK=#{ENV["JAVA_HOME"]}" else features << "--disable-java" end |