admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #3109 from DomT4/mandatory_java_cache

Browse Source 
Java: deprecate ENV.java_cache in favour of setting it by default.
This commit is contained in:
Mike McQuaid 2017-09-03 21:18:51 +01:00 committed by GitHub
commit e82f36db3e
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/compat/ENV/shared.rb
View File

@ -3,4 +3,8 @@ module SharedEnvExtension
odeprecated "ENV.j1", "ENV.deparallelize" odeprecated "ENV.j1", "ENV.deparallelize"
deparallelize deparallelize
end end
def java_cache
# odeprecated "ENV.java_cache"
end
end end

4
Library/Homebrew/dev-cmd/audit.rb
View File

@ -869,6 +869,10 @@ class FormulaAuditor
problem "Use \"depends_on :x11\" instead of \"ENV.x11\"" problem "Use \"depends_on :x11\" instead of \"ENV.x11\""
end end
if line.include?("ENV.java_cache")
problem "In-formula ENV.java_cache usage has been deprecated & should be removed."
end
# Avoid hard-coding compilers # Avoid hard-coding compilers
if line =~ %r{(system|ENV\[.+\]\s?=)\s?['"](/usr/bin/)?(gcc|llvm-gcc|clang)['" ]} if line =~ %r{(system|ENV\[.+\]\s?=)\s?['"](/usr/bin/)?(gcc|llvm-gcc|clang)['" ]}
problem "Use \"\#{ENV.cc}\" instead of hard-coding \"#{Regexp.last_match(3)}\"" problem "Use \"\#{ENV.cc}\" instead of hard-coding \"#{Regexp.last_match(3)}\""

4
Library/Homebrew/extend/ENV/shared.rb
View File

@ -260,10 +260,6 @@ module SharedEnvExtension
set_cpu_flags(flags) set_cpu_flags(flags)
end end
def java_cache
append "_JAVA_OPTIONS", "-Duser.home=#{HOMEBREW_CACHE}/java_cache"
end
# ld64 is a newer linker provided for Xcode 2.5 # ld64 is a newer linker provided for Xcode 2.5
# @private # @private
def ld64 def ld64

6
Library/Homebrew/formula.rb
View File

@ -1613,6 +1613,7 @@ class Formula
def run_test def run_test
@prefix_returns_versioned_prefix = true @prefix_returns_versioned_prefix = true
old_home = ENV["HOME"] old_home = ENV["HOME"]
old_java_opts = ENV["_JAVA_OPTIONS"]
old_curl_home = ENV["CURL_HOME"] old_curl_home = ENV["CURL_HOME"]
old_tmpdir = ENV["TMPDIR"] old_tmpdir = ENV["TMPDIR"]
old_temp = ENV["TEMP"] old_temp = ENV["TEMP"]
@ -1626,6 +1627,7 @@ class Formula
ENV["TERM"] = "dumb" ENV["TERM"] = "dumb"
ENV["PATH"] = PATH.new(old_path).append(HOMEBREW_PREFIX/"bin") ENV["PATH"] = PATH.new(old_path).append(HOMEBREW_PREFIX/"bin")
ENV["HOMEBREW_PATH"] = nil ENV["HOMEBREW_PATH"] = nil
ENV["_JAVA_OPTIONS"] = "#{old_java_opts} -Duser.home=#{HOMEBREW_CACHE}/java_cache"
ENV.clear_sensitive_environment! ENV.clear_sensitive_environment!
@ -1646,6 +1648,7 @@ class Formula
ensure ensure
@testpath = nil @testpath = nil
ENV["HOME"] = old_home ENV["HOME"] = old_home
ENV["_JAVA_OPTIONS"] = old_java_opts
ENV["CURL_HOME"] = old_curl_home ENV["CURL_HOME"] = old_curl_home
ENV["TMPDIR"] = old_tmpdir ENV["TMPDIR"] = old_tmpdir
ENV["TEMP"] = old_temp ENV["TEMP"] = old_temp
@ -1888,11 +1891,13 @@ class Formula
mkdir_p env_home mkdir_p env_home
old_home = ENV["HOME"] old_home = ENV["HOME"]
old_java_opts = ENV["_JAVA_OPTIONS"]
old_curl_home = ENV["CURL_HOME"] old_curl_home = ENV["CURL_HOME"]
old_path = ENV["HOMEBREW_PATH"] old_path = ENV["HOMEBREW_PATH"]
unless ARGV.interactive? unless ARGV.interactive?
ENV["HOME"] = env_home ENV["HOME"] = env_home
ENV["_JAVA_OPTIONS"] = "#{old_java_opts} -Duser.home=#{HOMEBREW_CACHE}/java_cache"
ENV["CURL_HOME"] = old_curl_home || old_home ENV["CURL_HOME"] = old_curl_home || old_home
end end
ENV["HOMEBREW_PATH"] = nil ENV["HOMEBREW_PATH"] = nil
@ -1907,6 +1912,7 @@ class Formula
@buildpath = nil @buildpath = nil
unless ARGV.interactive? unless ARGV.interactive?
ENV["HOME"] = old_home ENV["HOME"] = old_home
ENV["_JAVA_OPTIONS"] = old_java_opts
ENV["CURL_HOME"] = old_curl_home ENV["CURL_HOME"] = old_curl_home
end end
ENV["HOMEBREW_PATH"] = old_path ENV["HOMEBREW_PATH"] = old_path