aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorAlex Reece2012-11-28 01:21:03 -0500
committerAdam Vandenberg2013-01-04 21:50:31 -0800
commit6672ef5f9f4c89353ec5ae8031bb826dcf486b36 (patch)
tree6cc84e3287978231ea795df3f35e91cb81377899 /Library
parent2a40ff08a251063f649e4f73275f5994449ee432 (diff)
downloadbrew-6672ef5f9f4c89353ec5ae8031bb826dcf486b36.tar.bz2
Add support for external ocaml deps via opam
Closes Homebrew/homebrew#16280. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/dependencies.rb2
-rw-r--r--Library/Homebrew/requirements.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/dependencies.rb b/Library/Homebrew/dependencies.rb
index 8e6c7afdf..0e4d4be2f 100644
--- a/Library/Homebrew/dependencies.rb
+++ b/Library/Homebrew/dependencies.rb
@@ -16,7 +16,7 @@ require 'build_environment'
class DependencyCollector
# Define the languages that we can handle as external dependencies.
LANGUAGE_MODULES = [
- :chicken, :jruby, :lua, :node, :perl, :python, :rbx, :ruby
+ :chicken, :jruby, :lua, :node, :ocaml, :perl, :python, :rbx, :ruby
].freeze
attr_reader :deps, :requirements
diff --git a/Library/Homebrew/requirements.rb b/Library/Homebrew/requirements.rb
index 9dc8e0660..a7bc9c45d 100644
--- a/Library/Homebrew/requirements.rb
+++ b/Library/Homebrew/requirements.rb
@@ -25,6 +25,7 @@ class LanguageModuleDependency < Requirement
when :jruby then %W{/usr/bin/env jruby -rubygems -e require\ '#{@import_name}'}
when :lua then %W{/usr/bin/env luarocks show #{@import_name}}
when :node then %W{/usr/bin/env node -e require('#{@import_name}');}
+ when :ocaml then %W{/usr/bin/env opam list #{@import_name} | grep #{@import_name}}
when :perl then %W{/usr/bin/env perl -e use\ #{@import_name}}
when :python then %W{/usr/bin/env python -c import\ #{@import_name}}
when :ruby then %W{/usr/bin/env ruby -rubygems -e require\ '#{@import_name}'}
@@ -38,6 +39,7 @@ class LanguageModuleDependency < Requirement
when :jruby then "jruby -S gem install"
when :lua then "luarocks install"
when :node then "npm install"
+ when :ocaml then "opam install"
when :perl then "cpan -i"
when :python then "pip install"
when :rbx then "rbx gem install"