Remove message from default_formula'd requirements
This commit is contained in:
parent
59fdcfd4d0
commit
e3f26a9ced
@ -24,21 +24,6 @@ class MysqlDependency < Requirement
|
|||||||
default_formula 'mysql'
|
default_formula 'mysql'
|
||||||
|
|
||||||
satisfy { which 'mysql_config' }
|
satisfy { which 'mysql_config' }
|
||||||
|
|
||||||
def message; <<-EOS.undent
|
|
||||||
MySQL is required to install.
|
|
||||||
|
|
||||||
You can install this with Homebrew using:
|
|
||||||
brew install mysql-connector-c
|
|
||||||
For MySQL client libraries only.
|
|
||||||
|
|
||||||
brew install mysql
|
|
||||||
For MySQL server.
|
|
||||||
|
|
||||||
Or you can use an official installer from:
|
|
||||||
http://dev.mysql.com/downloads/mysql/
|
|
||||||
EOS
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
class PostgresqlDependency < Requirement
|
class PostgresqlDependency < Requirement
|
||||||
@ -46,18 +31,6 @@ class PostgresqlDependency < Requirement
|
|||||||
default_formula 'postgresql'
|
default_formula 'postgresql'
|
||||||
|
|
||||||
satisfy { which 'pg_config' }
|
satisfy { which 'pg_config' }
|
||||||
|
|
||||||
def message
|
|
||||||
<<-EOS.undent
|
|
||||||
Postgres is required to install.
|
|
||||||
|
|
||||||
You can install this with Homebrew using:
|
|
||||||
brew install postgres
|
|
||||||
|
|
||||||
Or you can use an official installer from:
|
|
||||||
http://www.postgresql.org/download/macosx/
|
|
||||||
EOS
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
class TeXDependency < Requirement
|
class TeXDependency < Requirement
|
||||||
@ -117,12 +90,4 @@ class MercurialDependency < Requirement
|
|||||||
default_formula 'mercurial'
|
default_formula 'mercurial'
|
||||||
|
|
||||||
satisfy { which('hg') }
|
satisfy { which('hg') }
|
||||||
|
|
||||||
def message; <<-EOS.undent
|
|
||||||
Mercurial is needed to install this software.
|
|
||||||
|
|
||||||
You can install this with Homebrew using:
|
|
||||||
brew install mercurial
|
|
||||||
EOS
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@ -10,15 +10,4 @@ class FortranDependency < Requirement
|
|||||||
satisfy :build_env => false do
|
satisfy :build_env => false do
|
||||||
(ENV['FC'] || which('gfortran')) ? true : false
|
(ENV['FC'] || which('gfortran')) ? true : false
|
||||||
end
|
end
|
||||||
|
|
||||||
def message; <<-EOS.undent
|
|
||||||
Fortran is required to install.
|
|
||||||
|
|
||||||
You can install this with Homebrew using:
|
|
||||||
brew install gfortran
|
|
||||||
|
|
||||||
Or you can use an external compiler by setting:
|
|
||||||
FC=<path-to-fortran-compiler>
|
|
||||||
EOS
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@ -60,28 +60,4 @@ class MPIDependency < Requirement
|
|||||||
ENV[compiler.upcase] = mpi_path
|
ENV[compiler.upcase] = mpi_path
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def message
|
|
||||||
if not @unknown_langs.empty?
|
|
||||||
<<-EOS.undent
|
|
||||||
There is no MPI compiler wrapper for:
|
|
||||||
#{@unknown_langs.join ', '}
|
|
||||||
|
|
||||||
The following values are valid arguments to `MPIDependency.new`:
|
|
||||||
:cc, :cxx, :f90, :f77
|
|
||||||
EOS
|
|
||||||
else
|
|
||||||
<<-EOS.undent
|
|
||||||
Homebrew could not locate working copies of the following MPI compiler
|
|
||||||
wrappers:
|
|
||||||
#{@non_functional.join ', '}
|
|
||||||
|
|
||||||
If you have a MPI installation, please ensure the bin directory is on your
|
|
||||||
PATH and that all the wrappers are functional. Otherwise, a MPI
|
|
||||||
installation can be obtained from homebrew by *picking one* of the
|
|
||||||
following formulae:
|
|
||||||
open-mpi, mpich2
|
|
||||||
EOS
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user