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

Auto merge of #25819 - servo:angle-version, r=Manishearth

Browse source 
Synchronize ANGLE linking path with VS project.

This avoids problems when upgrading or downgrading the ANGLE NuGet package from Visual Studio. The next time the Rust code needs to be linked, it's common to forget to update the path in build_commands.py, leading to surprising linker errors. By reading the current package version from the VS project configuration, we avoid this papercut.
This commit is contained in:
bors-servo 2020-02-20 23:48:09 -05:00 • committed by GitHub
commit 8f3622af35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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):
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")