From 6672ef5f9f4c89353ec5ae8031bb826dcf486b36 Mon Sep 17 00:00:00 2001 From: Alex Reece Date: Wed, 28 Nov 2012 01:21:03 -0500 Subject: [PATCH] Add support for external ocaml deps via opam Closes Homebrew/homebrew#16280. Signed-off-by: Adam Vandenberg --- Library/Homebrew/dependencies.rb | 2 +- Library/Homebrew/requirements.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dependencies.rb b/Library/Homebrew/dependencies.rb index 8e6c7afdf6..0e4d4be2f4 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 9dc8e0660a..a7bc9c45de 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"