mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

ARGV: Deprecate ARGV.build_formula_from_source? and ARGV.build_from_source?

Browse Source
This commit is contained in:
Gautham G 2020-04-05 16:47:47 +05:30
parent 28a1497c2b
commit 602cb7e636
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cli/args.rb
View File

@ -158,6 +158,14 @@ module Homebrew
!(HEAD? || devel?) !(HEAD? || devel?)
end end
# Whether a given formula should be built from source during the current
# installation run.
def build_formula_from_source?(f)
return false if !build_from_source && !build_bottle
formulae.any? { |args_f| args_f.full_name == f.full_name }
end
private private
def downcased_unique_named def downcased_unique_named

12
Library/Homebrew/extend/ARGV.rb
View File

@ -52,18 +52,6 @@ module HomebrewArgvExtension
arch&.to_sym arch&.to_sym
end end
def build_from_source?
switch?("s") || include?("--build-from-source")
end
# Whether a given formula should be built from source during the current
# installation run.
def build_formula_from_source?(f)
return false if !build_from_source? && !build_bottle?
formulae.any? { |argv_f| argv_f.full_name == f.full_name }
end
def force_bottle? def force_bottle?
include?("--force-bottle") include?("--force-bottle")
end end

2
Library/Homebrew/fetch.rb
View File

@ -7,7 +7,7 @@ module Homebrew
def fetch_bottle?(f) def fetch_bottle?(f)
return true if ARGV.force_bottle? && f.bottle return true if ARGV.force_bottle? && f.bottle
return false unless f.bottle && f.pour_bottle? return false unless f.bottle && f.pour_bottle?
return false if ARGV.build_formula_from_source?(f) return false if Homebrew.args.build_formula_from_source?(f)
return false unless f.bottle.compatible_cellar? return false unless f.bottle.compatible_cellar?
true true

8
Library/Homebrew/formula_installer.rb
View File

@ -50,7 +50,7 @@ class FormulaInstaller
@show_header = false @show_header = false
@ignore_deps = false @ignore_deps = false
@only_deps = false @only_deps = false
@build_from_source = ARGV.build_from_source? @build_from_source = Homebrew.args.build_from_source
@build_bottle = false @build_bottle = false
@force_bottle = ARGV.force_bottle? @force_bottle = ARGV.force_bottle?
@include_test = ARGV.include?("--include-test") @include_test = ARGV.include?("--include-test")
@ -98,7 +98,7 @@ class FormulaInstaller
return false if !formula.bottled? && !formula.local_bottle_path return false if !formula.bottled? && !formula.local_bottle_path
return true if force_bottle? return true if force_bottle?
return false if build_from_source? || build_bottle? || interactive? return false if Homebrew.args.build_from_source || build_bottle? || interactive?
return false if ARGV.cc return false if ARGV.cc
return false unless options.empty? return false unless options.empty?
return false if formula.bottle_disabled? return false if formula.bottle_disabled?
@ -129,7 +129,7 @@ class FormulaInstaller
def install_bottle_for?(dep, build) def install_bottle_for?(dep, build)
return pour_bottle? if dep == formula return pour_bottle? if dep == formula
return false if ARGV.build_formula_from_source?(dep) return false if Homebrew.args.build_formula_from_source?(dep)
return false unless dep.bottle && dep.pour_bottle? return false unless dep.bottle && dep.pour_bottle?
return false unless build.used_options.empty? return false unless build.used_options.empty?
return false unless dep.bottle.compatible_cellar? return false unless dep.bottle.compatible_cellar?
@ -592,7 +592,7 @@ class FormulaInstaller
fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options)
fi.options |= inherited_options fi.options |= inherited_options
fi.options &= df.options fi.options &= df.options
fi.build_from_source = ARGV.build_formula_from_source?(df) fi.build_from_source = Homebrew.args.build_formula_from_source?(df)
fi.force_bottle = false fi.force_bottle = false
fi.verbose = verbose? fi.verbose = verbose?
fi.quiet = quiet? fi.quiet = quiet?