Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-29 19:43:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improve windows DLL packaging.

Browse source
This commit is contained in:
Josh Matthews 2019-06-05 12:57:30 -04:00
parent 385b46cff7
commit d9fdf42bfe
3 changed files with 146 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

7
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, 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)