This repository has been archived by the owner. It is now read-only.

requirements should be required by default #12794

Closed
wants to merge 1 commit into
from
Jump to file or symbol
Failed to load files and symbols.
+23 −72
Split
@@ -10,9 +10,6 @@ def message; <<-EOS.undent
def satisfied?
which 'latex'
end
- def fatal?
- true
- end
end
class Asymptote < Formula
@@ -10,9 +10,6 @@ def message; <<-EOS.undent
def satisfied?
which 'latex'
end
- def fatal?
- true
- end
end
class Auctex < Formula
View
@@ -15,6 +15,7 @@ def message; <<-EOS.undent
def satisfied?
archs_for_command("python").universal?
end
+ def fatal?; false; end # "likely" fail? is this required or not??
end
class Boost < Formula
View
@@ -13,6 +13,7 @@ def message; <<-EOS.undent
def satisfied?
not File.exist? "/Library/Frameworks/expat.framework"
end
+ def fatal?; false; end # shouldn't we check for an actual arch mismatch?
end
@@ -12,7 +12,7 @@ def message; <<-EOS.undent
def satisfied?
Formula.factory('python').installed?
end
- def fatal?
+ def fatal? # TODO: figure this out
false
end
end
View
@@ -12,9 +12,6 @@ def satisfied?
# If installed, make sure it is transitional instead of strict.
`camlp5 -pmode 2>&1`.chomp == 'transitional'
end
- def fatal?
- true
- end
end
class Coq < Formula
@@ -14,10 +14,6 @@ def message; <<-EOS.undent
def satisfied?
quiet_system "python", "-c", "import gdbm"
end
-
- def fatal?
- true
- end
end
class Cvs2svn < Formula
@@ -18,9 +18,6 @@ def message; <<-EOS.undent
def satisfied?
which 'mysql_config'
end
- def fatal?
- true
- end
end
class Dbslayer < Formula
@@ -6,10 +6,6 @@ def satisfied?
poppler.installed_with? '--with-qt4'
end
- def fatal?
- true
- end
-
def message; <<-EOS.undent
DiffPDF requires the Poppler-Qt4 bindings but Poppler was not installed
with support for Qt. Please reinstall Poppler using the `--with-qt4`
@@ -13,6 +13,7 @@ def satisfied?
f = Formula.factory("berkeley-db")
not f.installed?
end
+ def fatal?; false; end # can fail? what is the problem, and why don't we fix it?
end
class Dsniff < Formula
@@ -15,10 +15,6 @@ def message; <<-EOS.undent
def satisfied?
which 'erl'
end
-
- def fatal?
- true
- end
end
class Elixir < Formula
View
@@ -13,6 +13,7 @@ def satisfied?
f = Formula.factory("berkeley-db")
not f.installed?
end
+ def fatal?; false; end # need to figure this out
end
class Exim < Formula
View
@@ -11,6 +11,8 @@ def message; <<-EOS.undent
http://hackage.haskell.org/trac/ghc/ticket/6009
EOS
end
+
+ def fatal?; false; end # why is this non-fatal? is 10.6 required or not?
end
class Ghc < Formula
@@ -14,6 +14,7 @@ def message; <<-EOS.undent
def satisfied?
which 'hg'
end
+ def fatal?; false; end # why is this non-fatal? is mercurial required or not?
end
class GitHg < Formula
@@ -8,6 +8,8 @@ def message
def satisfied?
MacOS.snow_leopard?
end
+
+ def fatal?; false; end # why is this non-fatal? is 10.6 required or not?
end
class GoogleJsTest < Formula
@@ -8,6 +8,8 @@ def satisfied?
def message
"jstalk requires Mac OS X 10.6 or newer"
end
+
+ def fatal?; false; end # why is this non-fatal? is 10.6 required or not?
end
class Jstalk < Formula
@@ -10,9 +10,6 @@ def message; <<-EOS.undent
def satisfied?
which 'mpost'
end
- def fatal?
- true
- end
end
class Lilypond < Formula
View
@@ -16,6 +16,7 @@ def message; <<-EOS.undent
def satisfied?
HOMEBREW_PREFIX.to_s == "/usr/local"
end
+ def fatal?; false; end # why is this non-fatal if it won't work without it?
end
class Mlton < Formula
View
@@ -15,9 +15,6 @@ def satisfied?
`emacs --version 2>/dev/null` =~ /^GNU Emacs (\d{2})/
$1.to_i >= 23
end
- def fatal?
- true
- end
end
class Mu < Formula
View
@@ -5,10 +5,6 @@ def satisfied?
MACOS_VERSION >= 10.6
end
- def fatal?
- true
- end
-
def message; <<-EOS.undent
The version of Freetype that comes with Leopard is too old to build MuPDF
against. It is possible to get MuPDF working on Leopard using the Freetype
@@ -18,9 +18,6 @@ def message; <<-EOS.undent
def satisfied?
which 'mysql_config'
end
- def fatal?
- true
- end
end
class Mydumper < Formula
@@ -18,9 +18,6 @@ def message; <<-EOS.undent
def satisfied?
which 'mysql_config'
end
- def fatal?
- true
- end
end
class MysqlProxy < Formula
View
@@ -7,9 +7,6 @@ def satisfied?
def message
"Nu requires Mac OS X 10.7 or newer"
end
- def fatal?
- true
- end
end
class Nu < Formula
@@ -11,6 +11,7 @@ def satisfied?
args = %W{/usr/bin/env python -c import\ oasa}
quiet_system *args
end
+ def fatal?; false; end # eventually we should have depends_on ... => :optional
end
class OpenBabel < Formula
@@ -14,9 +14,6 @@ def message; <<-EOS.undent
def satisfied?
which 'pg_config'
end
- def fatal?
- true
- end
end
class Osm2pgsql < Formula
@@ -6,10 +6,6 @@ def satisfied?
poppler.installed_with? '--with-glib'
end
- def fatal?
- true
- end
-
def message; <<-EOS.undent
pdf2svg requires the Poppler-Glib bindings but Poppler was not installed
with support for glib. Please reinstall Poppler using the `--with-glib`
@@ -14,9 +14,6 @@ def message; <<-EOS.undent
def satisfied?
which 'pg_config'
end
- def fatal?
- true
- end
end
@@ -14,9 +14,6 @@ def message; <<-EOS.undent
def satisfied?
which 'pg_config'
end
- def fatal?
- true
- end
end
class PgpoolIi < Formula
View
@@ -14,9 +14,6 @@ def message; <<-EOS.undent
def satisfied?
which 'pg_config'
end
- def fatal?
- true
- end
end
class Pgtap < Formula
@@ -8,6 +8,8 @@ def satisfied?
def message
"PhantomJS requires Mac OS X 10.6 (Snow Leopard) or newer."
end
+
+ def fatal?; false; end # why is this non-fatal? is 10.6 required or not?
end
class Phantomjs < Formula
@@ -14,9 +14,6 @@ def message; <<-EOS.undent
def satisfied?
which 'pg_config'
end
- def fatal?
- true
- end
end
class SagaCore < Formula
@@ -17,7 +17,7 @@ def satisfied?
which 'gpg' or which 'gpg2'
end
- def fatal?
+ def fatal? # is it really useful to allow users to build this without installing the requirements?
false
end
end
@@ -14,9 +14,6 @@ def message; <<-EOS.undent
def satisfied?
which 'postgres'
end
- def fatal?
- true
- end
end
class Skytools < Formula
View
@@ -13,6 +13,7 @@ def satisfied?
f = Formula.factory("berkeley-db")
not f.installed?
end
+ def fatal?; false; end # figure out what the problem is
end
class Squid < Formula
@@ -16,6 +16,7 @@ def satisfied?
f = Formula.factory('neon')
!f.installed? || archs_for_command(f.lib+'libneon.dylib').universal?
end
+ def fatal?; false; end # why is this non-fatal? is it required or not?
end
class UniversalSqlite < Requirement
@@ -28,6 +29,7 @@ def satisfied?
f = Formula.factory('sqlite')
!f.installed? || archs_for_command(f.lib+'libsqlite3.dylib').universal?
end
+ def fatal?; false; end # why is this non-fatal? is it required or not?
end
class Subversion < Formula
@@ -85,11 +85,11 @@ def options
# A base class for non-formula requirements needed by formulae.
-# A "fatal" requirement is one that will fail the build if it is not present.
-# By default, Requirements are non-fatal.
+# A "fatal" requirement is one that is required for the build to proceed.
+# A requirement may be made non-fatal to simply display a message before the build.
class Requirement
def satisfied?; false; end
- def fatal?; false; end
+ def fatal?; true; end
def message; ""; end
end
@@ -102,8 +102,6 @@ def initialize language, module_name, import_name=nil
@import_name = import_name || module_name
end
- def fatal?; true; end
-
def satisfied?
quiet_system(*the_test)
end