From d9fdf42bfe53dab08ba38fcdb349e84355f4cb3e Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 5 Jun 2019 12:57:30 -0400 Subject: Improve windows DLL packaging. --- python/servo/command_base.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'python/servo/command_base.py') diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 6313fff9bfe..d39576fe9c9 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, target=None, android=False, magicleap=False): + def get_binary_path(self, release, dev, target=None, android=False, magicleap=False, simpleservo=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() @@ -379,10 +379,13 @@ class CommandBase(object): binary_name = "libmlservo.a" elif android: base_path = path.join(base_path, "android", self.config["android"]["target"]) - binary_name = "libsimpleservo.so" + simpleservo = True elif target: base_path = path.join(base_path, target) + if simpleservo: + binary_name = "simpleservo.dll" if sys.platform == "win32" else "libsimpleservo.so" + release_path = path.join(base_path, "release", binary_name) dev_path = path.join(base_path, "debug", binary_name) -- cgit v1.2.3