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

formula: tweak versioned prefix approach.

Browse Source
This commit is contained in:
Mike McQuaid 2017-01-06 08:50:35 +00:00
parent 6c2b614a04
commit 1a4ff22447
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Library/Homebrew/formula.rb
View File

@ -198,7 +198,7 @@ class Formula
@build = active_spec.build @build = active_spec.build
@pin = FormulaPin.new(self) @pin = FormulaPin.new(self)
@follow_installed_alias = true @follow_installed_alias = true
@versioned_prefix = false @prefix_returns_versioned_prefix = false
end end
# @private # @private
@ -553,11 +553,12 @@ class Formula
# called from within the same formula's {#install} or {#post_install} methods. # called from within the same formula's {#install} or {#post_install} methods.
# Otherwise, return the full path to the formula's versioned cellar. # Otherwise, return the full path to the formula's versioned cellar.
def prefix(v = pkg_version) def prefix(v = pkg_version)
prefix = FormulaPrefixPathname.new(rack/v) versioned_prefix = versioned_prefix(v)
if !@versioned_prefix && prefix.directory? && Keg.new(prefix).optlinked? if !@prefix_returns_versioned_prefix && v == pkg_version &&
versioned_prefix.directory? && Keg.new(versioned_prefix).optlinked?
opt_prefix opt_prefix
else else
prefix versioned_prefix
end end
end end
@ -574,10 +575,7 @@ class Formula
# Is formula's linked keg points to the prefix. # Is formula's linked keg points to the prefix.
def prefix_linked?(v = pkg_version) def prefix_linked?(v = pkg_version)
return false unless linked? return false unless linked?
@versioned_prefix = true linked_keg.resolved_path == versioned_prefix(v)
result = linked_keg.resolved_path == prefix(v)
@versioned_prefix = false
result
end end
# {PkgVersion} of the linked keg for the formula. # {PkgVersion} of the linked keg for the formula.
@ -941,7 +939,7 @@ class Formula
# formula, as the path is stable even when the software is updated. # formula, as the path is stable even when the software is updated.
# <pre>args << "--with-readline=#{Formula["readline"].opt_prefix}" if build.with? "readline"</pre> # <pre>args << "--with-readline=#{Formula["readline"].opt_prefix}" if build.with? "readline"</pre>
def opt_prefix def opt_prefix
FormulaPrefixPathname.new("#{HOMEBREW_PREFIX}/opt/#{name}") Pathname.new("#{HOMEBREW_PREFIX}/opt/#{name}")
end end
def opt_bin def opt_bin
@ -1005,7 +1003,7 @@ class Formula
# @private # @private
def run_post_install def run_post_install
@versioned_prefix = true @prefix_returns_versioned_prefix = true
build = self.build build = self.build
self.build = Tab.for_formula(self) self.build = Tab.for_formula(self)
old_tmpdir = ENV["TMPDIR"] old_tmpdir = ENV["TMPDIR"]
@ -1020,7 +1018,7 @@ class Formula
ENV["TMPDIR"] = old_tmpdir ENV["TMPDIR"] = old_tmpdir
ENV["TEMP"] = old_temp ENV["TEMP"] = old_temp
ENV["TMP"] = old_tmp ENV["TMP"] = old_tmp
@versioned_prefix = false @prefix_returns_versioned_prefix = false
end end
# Tell the user about any caveats regarding this package. # Tell the user about any caveats regarding this package.
@ -1123,7 +1121,7 @@ class Formula
# where staging is a Mktemp staging context # where staging is a Mktemp staging context
# @private # @private
def brew def brew
@versioned_prefix = true @prefix_returns_versioned_prefix = true
stage do |staging| stage do |staging|
staging.retain! if ARGV.keep_tmp? staging.retain! if ARGV.keep_tmp?
prepare_patches prepare_patches
@ -1138,7 +1136,7 @@ class Formula
end end
end end
ensure ensure
@versioned_prefix = false @prefix_returns_versioned_prefix = false
end end
# @private # @private
@ -1640,7 +1638,7 @@ class Formula
# @private # @private
def run_test def run_test
@versioned_prefix = true @prefix_returns_versioned_prefix = true
old_home = ENV["HOME"] old_home = ENV["HOME"]
old_curl_home = ENV["CURL_HOME"] old_curl_home = ENV["CURL_HOME"]
old_tmpdir = ENV["TMPDIR"] old_tmpdir = ENV["TMPDIR"]
@ -1672,7 +1670,7 @@ class Formula
ENV["TEMP"] = old_temp ENV["TEMP"] = old_temp
ENV["TMP"] = old_tmp ENV["TMP"] = old_tmp
ENV["TERM"] = old_term ENV["TERM"] = old_term
@versioned_prefix = false @prefix_returns_versioned_prefix = false
end end
# @private # @private
@ -1857,6 +1855,12 @@ class Formula
private private
# Returns the prefix for a given formula version number.
# @private
def versioned_prefix(v)
rack/v
end
def exec_cmd(cmd, args, out, logfn) def exec_cmd(cmd, args, out, logfn)
ENV["HOMEBREW_CC_LOG_PATH"] = logfn ENV["HOMEBREW_CC_LOG_PATH"] = logfn
@ -2426,10 +2430,4 @@ class Formula
@link_overwrite_paths ||= Set.new @link_overwrite_paths ||= Set.new
end end
end end
class FormulaPrefixPathname < Pathname
def abv
Pathname.new(realpath).abv
end
end
end end