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

Auto merge of #24226 - paulrouget:openxrup, r=jdm

Browse source 
OpenXR loader update

Fix #24181

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24226)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-09-17 10:22:41 -04:00 • committed by GitHub
commit 540a73ed29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

36
.gitignore vendored
View file

@ -55,37 +55,7 @@ support/hololens/ServoApp/ARM64/
support/hololens/ServoApp/Generated\ Files
support/hololens/ServoApp/BundleArtifacts/
support/hololens/ServoApp/support/
# Ignore thumbnails created by Windows
support/hololens/ServoApp/Thumbs.db
# Ignore files built by Visual Studio
support/hololens/ServoApp/*.obj
support/hololens/ServoApp/*.exe
support/hololens/ServoApp/*.pdb
support/hololens/ServoApp/*.user
support/hololens/ServoApp/*.aps
support/hololens/ServoApp/*.pch
support/hololens/ServoApp/*.vspscc
support/hololens/ServoApp/*_i.c
support/hololens/ServoApp/*_p.c
support/hololens/ServoApp/*.ncb
support/hololens/ServoApp/*.suo
support/hololens/ServoApp/*.tlb
support/hololens/ServoApp/*.tlh
support/hololens/ServoApp/*.bak
support/hololens/ServoApp/*.cache
support/hololens/ServoApp/*.ilk
support/hololens/ServoApp/*.log
support/hololens/ServoApp/[Bb]in
support/hololens/ServoApp/[Dd]ebug*/
support/hololens/ServoApp/*.lib
support/hololens/ServoApp/*.sbr
support/hololens/ServoApp/obj/
support/hololens/ServoApp/[Rr]elease*/
support/hololens/ServoApp/_ReSharper*/
support/hololens/ServoApp/[Tt]est[Rr]esult*
support/hololens/.vs/
# Nuget packages folder
support/hololens/ServoApp/Debug/
support/hololens/ServoApp/Release/
support/hololens/packages/
support/hololens/.vs/

20
python/servo/build_commands.py
View file

@ -729,6 +729,26 @@ class MachCommands(CommandBase):
print('Removing virtualenv directory: %s' % virtualenv_path)
shutil.rmtree(virtualenv_path)
uwp_artifacts = [
"support/hololens/x64/",
"support/hololens/ARM/",
"support/hololens/ARM64/",
"support/hololens/ServoApp/x64/",
"support/hololens/ServoApp/ARM/",
"support/hololens/ServoApp/ARM64/",
"support/hololens/ServoApp/Generated Files/",
"support/hololens/ServoApp/BundleArtifacts/",
"support/hololens/ServoApp/support/",
"support/hololens/ServoApp/Debug/",
"support/hololens/ServoApp/Release/",
"support/hololens/packages/",
]
for uwp_artifact in uwp_artifacts:
dir_path = path.join(self.get_top_dir(), uwp_artifact)
if path.exists(dir_path):
shutil.rmtree(dir_path)
opts = ["--manifest-path", manifest_path or path.join(self.context.topdir, "Cargo.toml")]
if verbose:
opts += ["-v"]

12
support/hololens/ServoApp/ServoApp.vcxproj
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.props" Condition="Exists('..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.props')" />
<Import Project="..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props" Condition="Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props')" />
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<CppWinRTOptimized>true</CppWinRTOptimized>
@ -960,14 +960,16 @@
<Midl Include="ServoControl\ServoControl.idl" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="PropertySheet.props" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets" Condition="Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets')" />
<Import Project="..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.targets" Condition="Exists('..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.targets')" />
<Import Project="..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets" Condition="Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@ -976,7 +978,7 @@
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
<Error Condition="!Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets'))" />
<Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.props'))" />
<Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.targets'))" />
<Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props'))" />
<Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets'))" />
</Target>
</Project>

2
support/hololens/ServoApp/packages.config
View file

@ -2,5 +2,5 @@
<packages>
<package id="ANGLE.WindowsStore.Servo" version="2.1.13" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.190620.2" targetFramework="native" />
<package id="OpenXR.Loader" version="1.0.2" targetFramework="native" />
<package id="OpenXR.Loader" version="1.0.2.1" targetFramework="native" />
</packages>