Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-09 00:53:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #23484 - servo:jdm-patch-53, r=Manishearth

Browse source 
Update gstreamer on Windows to 1.16.0.

Fixes #23348.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23484)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-06-03 19:18:19 -04:00 • committed by GitHub
commit 3a2705f587
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/servo/build_commands.py
View file

@ -618,7 +618,8 @@ class MachCommands(CommandBase):
return rv
if sys.platform == "win32":
servo_exe_dir = path.join(base_path, "debug" if dev else "release")
servo_exe_dir = os.path.dirname(self.get_binary_path(release, dev, target=target))
assert os.path.exists(servo_exe_dir)
# on msvc builds, use editbin to change the subsystem to windows, but only
# on release builds -- on debug builds, it hides log output
@ -631,6 +632,7 @@ class MachCommands(CommandBase):
servo_exe_dir)
# Search for the generated nspr4.dll
build_path = path.join(servo_exe_dir, "build")
assert os.path.exists(build_path)
def package_generated_shared_libraries(libs, build_path, servo_exe_dir):
for root, dirs, files in os.walk(build_path):

4
python/servo/command_base.py
View file

@ -367,7 +367,7 @@ class CommandBase(object):
def get_gstreamer_path(self):
return path.join(self.context.topdir, "support", "linux", "gstreamer", "gst")
def get_binary_path(self, release, dev, android=False, magicleap=False):
def get_binary_path(self, release, dev, target=None, android=False, magicleap=False):
# TODO(autrilla): this function could still use work - it shouldn't
# handle quitting, or printing. It should return the path, or an error.
base_path = self.get_target_dir()
@ -380,6 +380,8 @@ class CommandBase(object):
elif android:
base_path = path.join(base_path, "android", self.config["android"]["target"])
binary_name = "libsimpleservo.so"
elif target:
base_path = path.join(base_path, target)
release_path = path.join(base_path, "release", binary_name)
dev_path = path.join(base_path, "debug", binary_name)

2
python/servo/package_commands.py
View file

@ -219,7 +219,7 @@ class PackageCommands(CommandBase):
if magicleap:
target = "aarch64-linux-android"
env = self.build_env(target=target)
binary_path = self.get_binary_path(release, dev, android=android, magicleap=magicleap)
binary_path = self.get_binary_path(release, dev, target=target, android=android, magicleap=magicleap)
dir_to_root = self.get_top_dir()
target_dir = path.dirname(binary_path)
if magicleap: