java: move java_dependency into a separate file and add Language::Java.java_home_env

Also update activemq to test against it

Closes Homebrew/homebrew#37218.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2015-02-26 22:36:04 +08:00
parent f27f427d95
commit 2222834107
3 changed files with 54 additions and 43 deletions

View File

@ -0,0 +1,8 @@
module Language
module Java
def self.java_home_env(version=nil)
version_flag = " --version #{version}" if version
{ :JAVA_HOME => "$(/usr/libexec/java_home#{version_flag})" }
end
end
end

View File

@ -7,6 +7,7 @@ require 'requirements/maximum_macos_requirement'
require 'requirements/mpi_dependency'
require 'requirements/osxfuse_dependency'
require 'requirements/python_dependency'
require 'requirements/java_dependency'
require 'requirements/tuntap_dependency'
require 'requirements/unsigned_kext_requirement'
require 'requirements/x11_dependency'
@ -122,46 +123,3 @@ class GitDependency < Requirement
satisfy { !!which('git') }
end
class JavaDependency < Requirement
fatal true
cask "java"
download "http://www.oracle.com/technetwork/java/javase/downloads/index.html"
satisfy { java_version }
env do
java_home = Pathname.new(@java_home)
ENV["JAVA_HOME"] = java_home
ENV.prepend_path "PATH", java_home/"bin"
if (java_home/"include").exist? # Oracle JVM
ENV.append_to_cflags "-I#{java_home}/include"
ENV.append_to_cflags "-I#{java_home}/include/darwin"
else # Apple JVM
ENV.append_to_cflags "-I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/"
end
end
def initialize(tags)
@version = tags.shift if /(\d\.)+\d/ === tags.first
super
end
def java_version
args = %w[--failfast]
args << "--version" << "#{@version}" if @version
@java_home = Utils.popen_read("/usr/libexec/java_home", *args).chomp
$?.success?
end
def message
version_string = " #{@version}" if @version
s = "Java#{version_string} is required to install this formula."
s += super
s
end
def inspect
"#<#{self.class.name}: #{name.inspect} #{tags.inspect} version=#{@version.inspect}>"
end
end

View File

@ -0,0 +1,45 @@
require "language/java"
class JavaDependency < Requirement
fatal true
cask "java"
download "http://www.oracle.com/technetwork/java/javase/downloads/index.html"
satisfy { java_version }
env do
java_home = Pathname.new(@java_home)
ENV["JAVA_HOME"] = java_home
ENV.prepend_path "PATH", java_home/"bin"
if (java_home/"include").exist? # Oracle JVM
ENV.append_to_cflags "-I#{java_home}/include"
ENV.append_to_cflags "-I#{java_home}/include/darwin"
else # Apple JVM
ENV.append_to_cflags "-I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/"
end
end
def initialize(tags)
@version = tags.shift if /(\d\.)+\d/ === tags.first
super
end
def java_version
args = %w[--failfast]
args << "--version" << "#{@version}" if @version
@java_home = Utils.popen_read("/usr/libexec/java_home", *args).chomp
$?.success?
end
def message
version_string = " #{@version}" if @version
s = "Java#{version_string} is required to install this formula."
s += super
s
end
def inspect
"#<#{self.class.name}: #{name.inspect} #{tags.inspect} version=#{@version.inspect}>"
end
end