Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix Brewfile’s for running Servo without bulding it

Browse source
This commit is contained in:
Simon Sapin 2019-11-21 11:27:33 +01:00
parent 47e39af0f3
commit 203a06ff24
5 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
etc/taskcluster/decision_task.py
View file

@ -587,8 +587,8 @@ def update_wpt():
) )
return ( return (
with_homebrew(update_task, [ with_homebrew(update_task, [
"etc/taskcluster/macos/Brewfile-wpt", "etc/taskcluster/macos/Brewfile-wpt-update",
"etc/taskcluster/macos/Brewfile-gstreamer", "etc/taskcluster/macos/Brewfile",
]) ])
# Pushing the new changes to the git remote requires a full repo clone. # Pushing the new changes to the git remote requires a full repo clone.
.with_repo(shallow=False, alternate_object_dir="/var/cache/servo.git/objects") .with_repo(shallow=False, alternate_object_dir="/var/cache/servo.git/objects")
@ -628,7 +628,7 @@ def macos_wpt():
build_task = macos_release_build_with_debug_assertions(priority=priority) build_task = macos_release_build_with_debug_assertions(priority=priority)
def macos_run_task(name): def macos_run_task(name):
task = macos_task(name).with_python2() task = macos_task(name).with_python2()
return with_homebrew(task, ["etc/taskcluster/macos/Brewfile-gstreamer"]) return with_homebrew(task, ["etc/taskcluster/macos/Brewfile"])
wpt_chunks( wpt_chunks(
"macOS x64", "macOS x64",
macos_run_task, macos_run_task,
@ -909,7 +909,7 @@ def macos_build_task(name):
return ( return (
with_homebrew(build_task, [ with_homebrew(build_task, [
"etc/taskcluster/macos/Brewfile", "etc/taskcluster/macos/Brewfile",
"etc/taskcluster/macos/Brewfile-gstreamer", "etc/taskcluster/macos/Brewfile-build",
]) ])
.with_script(""" .with_script("""
export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include" export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include"

19
etc/taskcluster/macos/Brewfile
View file

@ -1,11 +1,10 @@
brew "autoconf@2.13" # Runtime dependencies
brew "automake"
brew "cmake"
brew "openssl"
brew "pkg-config"
brew "llvm"
brew "yasm"
brew "zlib"
# For sccache brew "gnutls"
brew "openssl@1.1" brew "gstreamer"
brew "gst-plugins-base"
brew "gst-libav"
brew "gst-plugins-bad"
brew "gst-plugins-good"
brew "gst-rtsp-server"
brew "openssl"

12
etc/taskcluster/macos/Brewfile-build Normal file
View file

@ -0,0 +1,12 @@
# Build dependencies (that are not also runtime dependencies)
brew "autoconf@2.13"
brew "automake"
brew "cmake"
brew "pkg-config"
brew "llvm"
brew "yasm"
brew "zlib"
# For sccache
brew "openssl@1.1"

7
etc/taskcluster/macos/Brewfile-gstreamer
View file

@ -1,7 +0,0 @@
brew "gnutls"
brew "gstreamer"
brew "gst-plugins-base"
brew "gst-libav"
brew "gst-plugins-bad"
brew "gst-plugins-good"
brew "gst-rtsp-server"

0
etc/taskcluster/macos/Brewfile-wpt → etc/taskcluster/macos/Brewfile-wpt-update
View file