diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-06-03 19:18:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 19:18:19 -0400 |
| commit | 3a2705f587c9a33f9440412f130a27cc66dcad28 (patch) | |
| tree | de9a02ac1a132d88c863956af81a0b0c5a15809f /python | |
| parent | bdc584f3ed31dcb94e7b49a9977ab2e6a512c9fd (diff) | |
| parent | c973587a7f1c43cd616579592c531b75697cf347 (diff) | |
| download | servo-3a2705f587c9a33f9440412f130a27cc66dcad28.tar.gz servo-3a2705f587c9a33f9440412f130a27cc66dcad28.zip | |
Auto merge of #23484 - servo:jdm-patch-53, r=Manishearth
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 -->
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/build_commands.py | 4 | ||||
| -rw-r--r-- | python/servo/command_base.py | 4 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 51709be6834..013889f2d15 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -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): diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 0902a956912..6313fff9bfe 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -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) diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 12ab0607a3a..491abf2eb84 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -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: |