Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Synchronize ANGLE linking path with VS project.

Browse source
This commit is contained in:
Josh Matthews 2020-02-20 16:27:08 -05:00
parent 0633f327ca
commit fb5213c8fc
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
python/servo/build_commands.py
View file

@ -784,13 +784,25 @@ class MachCommands(CommandBase):
def angle_root(target, nuget_env): def angle_root(target, nuget_env):
arch = { arch = {
"aarch64": "arm64", "aarch64": "arm64",
"x86_64": "x64", "x86_64": "x64",
} }
angle_arch = arch[target.split('-')[0]] 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_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 executable command
nuget_app = path.join(os.getcwd(), "support", "hololens", "ServoApp.sln") nuget_app = path.join(os.getcwd(), "support", "hololens", "ServoApp.sln")