Merge pull request #7773 from Bo98/java-improvements-2

language/java: add support for OpenJDK formula

Library/Homebrew/compat/language/java.rb

@@ -5,7 +5,8 @@ module Language
     class << self
       module Compat
         def java_home_cmd(version = nil)
-          odeprecated "Language::Java::java_home_cmd", "Language::Java::java_home"
+          odeprecated "Language::Java.java_home_cmd",
+                      "Language::Java.java_home or Language::Java.overridable_java_home_env"
 
           # macOS provides /usr/libexec/java_home, but Linux does not.
           return system_java_home_cmd(version) if OS.mac?

Library/Homebrew/extend/os/mac/language/java.rb

@@ -4,18 +4,26 @@ module Language
   module Java
     def self.system_java_home_cmd(version = nil)
       version_flag = " --version #{version}" if version
-      "/usr/libexec/java_home#{version_flag}"
+      "/usr/libexec/java_home#{version_flag} --failfast 2>/dev/null"
     end
     private_class_method :system_java_home_cmd
 
     def self.java_home(version = nil)
+      f = find_openjdk_formula(version)
+      return f.opt_libexec/"openjdk.jdk/Contents/Home" if f
+
       cmd = system_java_home_cmd(version)
-      Pathname.new Utils.popen_read(cmd).chomp
+      path = Utils.popen_read(cmd).chomp
+
+      Pathname.new path if path.present?
     end
 
-    # @private
     def self.java_home_shell(version = nil)
+      f = find_openjdk_formula(version)
+      return (f.opt_libexec/"openjdk.jdk/Contents/Home").to_s if f
+
       "$(#{system_java_home_cmd(version)})"
     end
+    private_class_method :java_home_shell
   end
 end

Library/Homebrew/extend/pathname.rb

@@ -346,13 +346,17 @@ class Pathname
   end
 
   # Writes an exec script that sets environment variables
-  def write_env_script(target, env)
+  def write_env_script(target, args, env = nil)
+    unless env
+      env = args
+      args = nil
+    end
     env_export = +""
     env.each { |key, value| env_export << "#{key}=\"#{value}\" " }
     dirname.mkpath
     write <<~SH
       #!/bin/bash
-      #{env_export}exec "#{target}" "$@"
+      #{env_export}exec "#{target}" #{args} "$@"
     SH
   end
 
@@ -370,12 +374,8 @@ class Pathname
 
   # Writes an exec script that invokes a Java jar
   def write_jar_script(target_jar, script_name, java_opts = "", java_version: nil)
-    mkpath
+    (self/script_name).write_env_script "java", "#{java_opts} -jar \"#{target_jar}\"",
-    java_home = ("JAVA_HOME=\"#{Language::Java.java_home_shell(java_version)}\" " if java_version)
+                                        Language::Java.overridable_java_home_env(java_version)
-    join(script_name).write <<~SH
-      #!/bin/bash
-      #{java_home}exec java #{java_opts} -jar #{target_jar} "$@"
-    SH
   end
 
   def install_metafiles(from = Pathname.pwd)

Library/Homebrew/language/java.rb

@@ -2,17 +2,41 @@
 
 module Language
   module Java
+    def self.find_openjdk_formula(version = nil)
+      can_be_newer = version&.end_with?("+")
+      version = version.to_i
+
+      openjdk = Formula["openjdk"]
+      [openjdk, *openjdk.versioned_formulae].find do |f|
+        next false unless f.any_version_installed?
+
+        unless version.zero?
+          major = f.version.to_s[/\d+/].to_i
+          next false if major < version
+          next false if major > version && !can_be_newer
+        end
+
+        true
+      end
+    rescue FormulaUnavailableError
+      nil
+    end
+    private_class_method :find_openjdk_formula
+
     def self.java_home(version = nil)
+      f = find_openjdk_formula(version)
+      return f.opt_libexec if f
+
       req = JavaRequirement.new [*version]
       raise UnsatisfiedRequirements, req.message unless req.satisfied?
 
       req.java_home
     end
 
-    # @private
     def self.java_home_shell(version = nil)
       java_home(version).to_s
     end
+    private_class_method :java_home_shell
 
     def self.java_home_env(version = nil)
       { JAVA_HOME: java_home_shell(version) }