From aa64dfaae751fe1cd559ca6f2fb5da2650146b98 Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Fri, 11 Dec 2015 12:40:41 -0500 Subject: [PATCH] Bug 1231989 - Install watchman via Homebrew and MacPorts; r=ahal This is needed to support hgwatchman. --HG-- extra : commitid : 8D2A8YPNimB extra : rebase_source : 7d5932aa049dfb352b93a87c2c8087dd7b324aab extra : histedit_source : 9863189f265eca9e0b9363e13c59a7d55f5c633d --- python/mozboot/mozboot/osx.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/python/mozboot/mozboot/osx.py b/python/mozboot/mozboot/osx.py index aed09c6e08e3..543becebddfd 100644 --- a/python/mozboot/mozboot/osx.py +++ b/python/mozboot/mozboot/osx.py @@ -307,6 +307,7 @@ class OSXBootstrapper(BaseBootstrapper): ('git', 'git'), ('autoconf213', HOMEBREW_AUTOCONF213), ('gnu-tar', 'gnu-tar'), + ('watchman', 'watchman',) ] self._ensure_homebrew_packages(packages) @@ -385,10 +386,13 @@ class OSXBootstrapper(BaseBootstrapper): self.run_as_root([self.port, '-v', 'install'] + missing) def ensure_macports_system_packages(self): - packages = ['python27', - 'mercurial', - 'autoconf213', - 'gnutar'] + packages = [ + 'python27', + 'mercurial', + 'autoconf213', + 'gnutar', + 'watchman', + ] self._ensure_macports_packages(packages) self.run_as_root([self.port, 'select', '--set', 'python', 'python27'])