aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorXu Cheng2015-02-26 22:36:04 +0800
committerXu Cheng2015-02-28 01:42:09 +0800
commit8a24a886b6a2a66810a4b09f5f5c78db11ca4058 (patch)
tree5c21351a711a668676d9fb9366a0dd709a08831c /Library/Formula
parentcc3c8a33ea8b18699c1fb9a44c031923df88dee7 (diff)
downloadhomebrew-8a24a886b6a2a66810a4b09f5f5c78db11ca4058.tar.bz2
java: move java_dependency into a separate file and add Language::Java.java_home_env
Also update activemq to test against it Closes #37218. Signed-off-by: Xu Cheng <xucheng@me.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/activemq.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Formula/activemq.rb b/Library/Formula/activemq.rb
index 4a054e174..541449589 100644
--- a/Library/Formula/activemq.rb
+++ b/Library/Formula/activemq.rb
@@ -11,8 +11,8 @@ class Activemq < Formula
prefix.install_metafiles
libexec.install Dir["*"]
- (bin/"activemq").write_env_script libexec/"bin/activemq", :JAVA_HOME => ENV["JAVA_HOME"]
- (bin/"activemq-admin").write_env_script libexec/"bin/activemq-admin", :JAVA_HOME => ENV["JAVA_HOME"]
+ (bin/"activemq").write_env_script libexec/"bin/activemq", Language::Java.java_home_env("1.6+")
+ (bin/"activemq-admin").write_env_script libexec/"bin/activemq-admin", Language::Java.java_home_env("1.6+")
end
test do