Skip to content

Commit 56e95ea

Browse files
rpavlikrpavlik
authored
Merge branch 'main' into disable-USE_MIRROR_WINDOW-default
2 parents 11b0a24 + 88095bc commit 56e95ea

File tree

1,123 files changed

+266798
-20116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,123 files changed

+266798
-20116
lines changed

‎.appveyor.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Copyright (c) 2017-2023 The Khronos Group Inc.
1+
# Copyright (c) 2017-2024, The Khronos Group Inc.
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
version: 1.0.27.{build}
5+
version: 1.1.43.{build}
66
image: Visual Studio 2017
77

88

@@ -45,9 +45,9 @@ install:
4545
build_script:
4646
- cmd: >-
4747
call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\%VCVARS%.bat" &&
48-
cmake -GNinja -Bbuild -H. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe -DBUILD_ALL_EXTENSIONS=ON &&
48+
cmake -GNinja -Bbuild -H. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPython3_EXECUTABLE=C:/Python37-x64/python.exe -DBUILD_ALL_EXTENSIONS=ON &&
4949
ninja -C build
5050
- cmd: >-
5151
call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\%VCVARS%.bat" &&
52-
cmake -GNinja -Bbuild -H. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDYNAMIC_LOADER=ON -DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe -DBUILD_ALL_EXTENSIONS=ON &&
52+
cmake -GNinja -Bbuild -H. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDYNAMIC_LOADER=ON -DPython3_EXECUTABLE=C:/Python37-x64/python.exe -DBUILD_ALL_EXTENSIONS=ON &&
5353
ninja -C build

‎.azure-pipelines/nuget/NugetTemplate/OpenXR.Loader.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<!--
4-
Copyright (c) 2020-2023, The Khronos Group Inc.
4+
Copyright (c) 2020-2024, The Khronos Group Inc.
55
SPDX-License-Identifier: CC-BY-4.0
66
-->
77
<metadata>

‎.azure-pipelines/nuget/NugetTemplate/build/native/OpenXR.Loader.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<!--
3-
Copyright (c) 2020 The Khronos Group Inc.
3+
Copyright (c) 2020-2024, The Khronos Group Inc.
44
SPDX-License-Identifier: CC-BY-4.0
55
-->
66
<PropertyGroup>

‎.azure-pipelines/nuget/NugetTemplate/build/native/OpenXR.Loader.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project ToolsVersion="4.0"
22
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<!--
4-
Copyright (c) 2020 The Khronos Group Inc.
4+
Copyright (c) 2020-2024, The Khronos Group Inc.
55
SPDX-License-Identifier: CC-BY-4.0
66
-->
77

‎.azure-pipelines/nuget/stage_nuget.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019-2020 The Khronos Group Inc.
1+
# Copyright (c) 2019-2024, The Khronos Group Inc.
22
# SPDX-License-Identifier: Apache-2.0
33
param(
44
[Parameter(Mandatory = $true, HelpMessage = "Path to unzipped openxr_loader_windows OpenXR-SDK release asset")]

‎.azure-pipelines/openxr-sdk-source.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019-2023, The Khronos Group Inc.
1+
# Copyright (c) 2019-2024, The Khronos Group Inc.
22
# SPDX-License-Identifier: Apache-2.0
33

44
# Main azure-pipelines configuration for the OpenXR-SDK-Sources repo.
@@ -21,22 +21,20 @@ stages:
2121
- job: loader_docs
2222
pool:
2323
vmImage: "ubuntu-latest"
24-
container: khronosgroup/docker-images:openxr.20230323
25-
# container: khronosgroup/docker-images@sha256:091f1d988744f0b5149126d1f4bdba342b72c01dc90c2d06d4a61738bec5521c
24+
container: khronosgroup/docker-images:openxr.20240924@sha256:3d595e68d21b2bba12cb7bbfa8cb135f66a2d9b97efeda6de3c6c8412163c4b7
2625
steps:
2726
- script: make loader
2827
workingDirectory: specification
2928
displayName: Build loader document
30-
- publish: $(System.DefaultWorkingDirectory)/specification/generated/out/1.0/loader.html
29+
- publish: $(System.DefaultWorkingDirectory)/specification/generated/out/1.1/loader.html
3130
artifact: LoaderDoc
3231

3332
- stage: Generate
3433
jobs:
3534
- job: archive
3635
pool:
3736
vmImage: "ubuntu-latest"
38-
container: khronosgroup/docker-images:openxr.20230323
39-
# container: khronosgroup/docker-images@sha256:091f1d988744f0b5149126d1f4bdba342b72c01dc90c2d06d4a61738bec5521c
37+
container: khronosgroup/docker-images:openxr.20240924@sha256:3d595e68d21b2bba12cb7bbfa8cb135f66a2d9b97efeda6de3c6c8412163c4b7
4038
steps:
4139
- script: make loader
4240
workingDirectory: specification
@@ -64,7 +62,7 @@ stages:
6462
presentationBackend: wayland
6563
pool:
6664
vmImage: "ubuntu-latest"
67-
container: khronosgroup/docker-images:openxr-pregenerated-sdk.20230323
65+
container: khronosgroup/docker-images:openxr-pregenerated-sdk.20240924@sha256:5ddce09400cc7e17a81e65a0e7e2c26376f21e0844a6cf932270c2955213eef6
6866
# container: sha256:845e19e59f22c29fedc33dcaa4f3c5f8aa44e367283ef955c7549239cf9a46d2
6967
steps:
7068
- task: DownloadPipelineArtifact@2

‎.azure-pipelines/openxr-sdk.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019-2023, The Khronos Group Inc.
1+
# Copyright (c) 2019-2024, The Khronos Group Inc.
22
# SPDX-License-Identifier: Apache-2.0
33

44
# Main azure-pipelines configuration for the OpenXR-SDK repo.

‎.azure-pipelines/shared/build_jobs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019-2023, The Khronos Group Inc.
1+
# Copyright (c) 2019-2024, The Khronos Group Inc.
22
# SPDX-License-Identifier: Apache-2.0
33

44
parameters:
@@ -26,8 +26,8 @@ jobs:
2626
presentationBackend: wayland
2727
pool:
2828
vmImage: "ubuntu-latest"
29-
container: khronosgroup/docker-images:openxr-sdk.20230323
30-
# container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032
29+
container: khronosgroup/docker-images:openxr-sdk.20240924@sha256:5e6a6f5d72dc4a20d5c33f12550fdd9b6a1206e94d6cf1382e0697a5726c424c
30+
3131
steps:
3232
# First build as debug
3333
- template: build_linux.yml

‎.azure-pipelines/shared/build_linux.yml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019-2023, The Khronos Group Inc.
1+
# Copyright (c) 2019-2024, The Khronos Group Inc.
22
# SPDX-License-Identifier: Apache-2.0
33

44
parameters:
@@ -10,21 +10,19 @@ parameters:
1010
default: ""
1111
- name: sourceDir
1212
type: string
13-
default: "$(System.DefaultWorkingDirectory)"
13+
default: "$(Pipeline.Workspace)"
1414
- name: buildDir
1515
type: string
16-
default: build
16+
default: "$(Build.BinariesDirectory)"
1717

1818
steps:
19-
- script: |
20-
rm -rf ${{ parameters.sourceDir }}/${{ parameters.buildDir }}
21-
mkdir -p ${{ parameters.sourceDir }}/${{ parameters.buildDir }}
22-
displayName: "Clean up and create new build directory"
19+
- script: "rm -rf ${{ parameters.buildDir }}"
20+
displayName: "Clean up build directory"
2321

24-
- script: cmake -G Ninja .. -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} ${{ parameters.cmakeArgs }}
25-
workingDirectory: ${{ parameters.sourceDir }}/${{ parameters.buildDir }}
22+
- script: "cmake -G Ninja -S . -B ${{ parameters.buildDir }} -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} ${{ parameters.cmakeArgs }}"
23+
workingDirectory: "${{ parameters.sourceDir }}"
2624
displayName: "Generate build system"
2725

28-
- script: ninja
29-
workingDirectory: ${{ parameters.sourceDir }}/${{ parameters.buildDir }}
26+
- script: "ninja -C ${{ parameters.buildDir }}"
27+
workingDirectory: "${{ parameters.sourceDir }}"
3028
displayName: "Compile"

‎.azure-pipelines/shared/build_mingw.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019-2023, The Khronos Group Inc.
1+
# Copyright (c) 2019-2024, The Khronos Group Inc.
22
# SPDX-License-Identifier: Apache-2.0
33

44
parameters:
@@ -17,6 +17,9 @@ parameters:
1717
default: "true"
1818

1919
steps:
20+
- checkout: self
21+
lfs: true
22+
2023
# - script: choco install -y ninja
2124
# displayName: 'Install Ninja'
2225

0 commit comments

Comments
 (0)