Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1344244 - Part 4: Homebrew includes |brew cask| directly now. r=glandium

Browse Source 
There's no need to install the caskroom bits for Homebrew now,
allowing to fix Java installation on Mac OS X and simplify the code at
the same time.

MozReview-Commit-ID: 1Ssjm4YRrPQ

--HG--
extra : rebase_source : 3414d1fbe2bdb693cae1f5b1379d8d9335f1e7f4
This commit is contained in:
Nick Alexander 2017-07-05 17:05:25 -07:00
parent 0f67ddbc23
commit c3efb6fe79
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
python/mozboot/mozboot/osx.py
View File

@ -290,8 +290,8 @@ class OSXBootstrapper(BaseBootstrapper):
printed = False
for name, package in packages:
if name in installed:
for package in packages:
if package in installed:
continue
if not printed:
@ -312,21 +312,21 @@ class OSXBootstrapper(BaseBootstrapper):
# development headers which are missing from OS X (at least on
# 10.8) and because the build system wants a version newer than
# what Apple ships.
('python', 'python'),
('mercurial', 'mercurial'),
('git', 'git'),
('autoconf@2.13', 'autoconf@2.13'),
('gnu-tar', 'gnu-tar'),
('watchman', 'watchman',),
('terminal-notifier', 'terminal-notifier')
'python',
'mercurial',
'git',
'autoconf@2.13',
'gnu-tar',
'watchman',
'terminal-notifier',
]
self._ensure_homebrew_packages(packages)
def ensure_homebrew_browser_packages(self, artifact_mode=False):
# TODO: Figure out what not to install for artifact mode
packages = [
('yasm', 'yasm'),
('llvm', 'llvm'),
'llvm',
'yasm',
]
self._ensure_homebrew_packages(packages)
@ -337,13 +337,12 @@ class OSXBootstrapper(BaseBootstrapper):
# 1. System packages.
packages = [
('brew-cask', 'caskroom/cask/brew-cask'), # For installing Java later.
('wget', 'wget'),
'wget',
]
self._ensure_homebrew_packages(packages)
casks = [
('java', 'java'),
'java',
]
installed = self._ensure_homebrew_casks(casks)
if installed: