aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/build_commands.py
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2020-02-20 16:27:08 -0500
committerJosh Matthews <josh@joshmatthews.net>2020-02-20 16:27:08 -0500
commitfb5213c8fcd2ef9aa1a0d692bf27c1289c6aaad2 (patch)
treecfacf8966e706fa40a8374adcce2c44dde4ddcf0 /python/servo/build_commands.py
parent0633f327ca00e2603967cbb491d2e7f6d5d9a6bf (diff)
downloadservo-fb5213c8fcd2ef9aa1a0d692bf27c1289c6aaad2.tar.gz
servo-fb5213c8fcd2ef9aa1a0d692bf27c1289c6aaad2.zip
Synchronize ANGLE linking path with VS project.
Diffstat (limited to 'python/servo/build_commands.py')
-rw-r--r--python/servo/build_commands.py16
1 files changed, 14 insertions, 2 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 6340480b131..7233114af67 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -784,13 +784,25 @@ class MachCommands(CommandBase):
def angle_root(target, nuget_env):
arch = {
-
"aarch64": "arm64",
"x86_64": "x64",
}
angle_arch = arch[target.split('-')[0]]
+
+ package_name = "ANGLE.WindowsStore.Servo"
+
+ import xml.etree.ElementTree as ET
+ tree = ET.parse(os.path.join('support', 'hololens', 'ServoApp', 'packages.config'))
+ root = tree.getroot()
+ for package in root.iter('package'):
+ if package.get('id') == package_name:
+ package_version = package.get('version')
+ break
+ else:
+ raise Exception("Couldn't locate ANGLE package")
+
angle_default_path = path.join(os.getcwd(), "support", "hololens", "packages",
- "ANGLE.WindowsStore.Servo.2.1.16", "bin", "UAP", angle_arch)
+ package_name + "." + package_version, "bin", "UAP", angle_arch)
# Nuget executable command
nuget_app = path.join(os.getcwd(), "support", "hololens", "ServoApp.sln")