aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/build_commands.py
diff options
context:
space:
mode:
authorbors-servo <servo-ops@mozilla.com>2021-03-11 21:08:05 -0500
committerGitHub <noreply@github.com>2021-03-11 21:08:05 -0500
commit5dd0cba51d74ccbf6d745d92e54b840269f717c6 (patch)
tree73534349ad549284e2f74916e5c16e1c0bfb8dea /python/servo/build_commands.py
parent14fbe153e2da6973d5ae15125b4d7e5283d3f7da (diff)
parentc66255ba5e308726f7e9ffcea85577e3c56bb206 (diff)
downloadservo-5dd0cba51d74ccbf6d745d92e54b840269f717c6.tar.gz
servo-5dd0cba51d74ccbf6d745d92e54b840269f717c6.zip
Auto merge of #27865 - servo:github-actions-dev, r=jdm
Add Github Actions workflow for mac/linux/windows builds
Diffstat (limited to 'python/servo/build_commands.py')
-rw-r--r--python/servo/build_commands.py23
1 files changed, 9 insertions, 14 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index a3aae798eac..a0ad4b9d615 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -193,7 +193,9 @@ class MachCommands(CommandBase):
if not uwp:
uwp = target and 'uwp' in target
- features += self.pick_media_stack(media_stack, target)
+ media_stack = self.pick_media_stack(media_stack, target)
+ features += media_stack
+ has_media_stack = media_stack[0] == "media-gstreamer"
target_path = base_path = self.get_target_dir()
if android:
@@ -650,15 +652,7 @@ class MachCommands(CommandBase):
for key in env:
print((key, env[key]))
- if sys.platform == "win32":
- env.setdefault("CC", "clang-cl.exe")
- env.setdefault("CXX", "clang-cl.exe")
- if uwp:
- env.setdefault("TARGET_CFLAGS", "")
- env.setdefault("TARGET_CXXFLAGS", "")
- env["TARGET_CFLAGS"] += " -DWINAPI_FAMILY=WINAPI_FAMILY_APP"
- env["TARGET_CXXFLAGS"] += " -DWINAPI_FAMILY=WINAPI_FAMILY_APP"
- else:
+ if sys.platform != "win32":
env.setdefault("CC", "clang")
env.setdefault("CXX", "clang++")
@@ -725,9 +719,10 @@ class MachCommands(CommandBase):
status = 1
# copy needed gstreamer DLLs in to servo.exe dir
- print("Packaging gstreamer DLLs")
- if not package_gstreamer_dlls(env, servo_exe_dir, target_triple, uwp):
- status = 1
+ if has_media_stack:
+ print("Packaging gstreamer DLLs")
+ if not package_gstreamer_dlls(env, servo_exe_dir, target_triple, uwp):
+ status = 1
# UWP app packaging already bundles all required DLLs for us.
print("Packaging MSVC DLLs")
@@ -740,7 +735,7 @@ class MachCommands(CommandBase):
)
assert os.path.exists(servo_exe_dir)
- if not package_gstreamer_dylibs(servo_exe_dir):
+ if has_media_stack and not package_gstreamer_dylibs(servo_exe_dir):
return 1
# On the Mac, set a lovely icon. This makes it easier to pick out the Servo binary in tools