diff options
author | Josh Matthews <josh@joshmatthews.net> | 2019-06-05 12:57:30 -0400 |
---|---|---|
committer | Josh Matthews <josh@joshmatthews.net> | 2019-06-11 15:53:35 -0400 |
commit | d9fdf42bfe53dab08ba38fcdb349e84355f4cb3e (patch) | |
tree | 5e939812bba0d50fd2f37a603ce2ba140a9d8e45 /python/servo/command_base.py | |
parent | 385b46cff735db4bb1d4b395a5d872a006a987aa (diff) | |
download | servo-d9fdf42bfe53dab08ba38fcdb349e84355f4cb3e.tar.gz servo-d9fdf42bfe53dab08ba38fcdb349e84355f4cb3e.zip |
Improve windows DLL packaging.
Diffstat (limited to 'python/servo/command_base.py')
-rw-r--r-- | python/servo/command_base.py | 7 |
1 files changed, 5 insertions, 2 deletions
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) |