Skip to content

Commit 3cdc1b0

Browse files
authored
Merge pull request #208 from aaronfranke/formatting
Some formatting cleanup, remove trailing space characters and POSIX compliance
2 parents 63e7a59 + db1007e commit 3cdc1b0

Some content is hidden

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

51 files changed

+122
-122
lines changed

.azure-pipelines/build_jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,4 @@ jobs:
133133
condition: succeeded()
134134
inputs:
135135
path: $(System.DefaultWorkingDirectory)/nuget
136-
artifact: NuGet
136+
artifact: NuGet

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>OpenXR.Loader</id>
@@ -12,4 +12,4 @@
1212
<description>Khronos OpenXR loader and headers required to build a Win32 or UWP OpenXR application</description>
1313
<tags>native khronos openxr loader</tags>
1414
</metadata>
15-
</package>
15+
</package>

.azure-pipelines/nuget/stage_nuget.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ CopyLoader "Win32"
7171
CopyLoader "x64_uwp"
7272
CopyLoader "Win32_uwp"
7373
CopyLoader "arm64_uwp"
74-
CopyLoader "arm_uwp"
74+
CopyLoader "arm_uwp"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ stages:
6868
- script: ls -la sdk-tarball || true
6969
- task: ExtractFiles@1
7070
inputs:
71-
archiveFilePatterns: '$(Pipeline.Workspace)/*.tar.gz'
71+
archiveFilePatterns: '$(Pipeline.Workspace)/*.tar.gz'
7272
destinationFolder: $(Pipeline.Workspace)/pregen
73-
cleanDestinationFolder: true
73+
cleanDestinationFolder: true
7474
- script: ls -la $(Pipeline.Workspace)/pregen
7575
- template: build_linux.yml
7676
parameters:
@@ -89,9 +89,9 @@ stages:
8989

9090
- task: ExtractFiles@1
9191
inputs:
92-
archiveFilePatterns: '$(Pipeline.Workspace)/*.tar.gz'
92+
archiveFilePatterns: '$(Pipeline.Workspace)/*.tar.gz'
9393
destinationFolder: $(Pipeline.Workspace)/pregen
94-
cleanDestinationFolder: true
94+
cleanDestinationFolder: true
9595

9696
- template: build_msvc.yml
9797
parameters:

.azure-pipelines/organize_windows_artifacts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def move(src, dest):
4040
if not include_copied:
4141
# Move over one set of includes to the base
4242
move(artifact / 'include', outbase / 'include')
43-
include_copied = True
43+
include_copied = True
4444

4545
# lib files
4646
move(artifact / 'lib', base / 'lib')

.proclamation.json.license

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Copyright (c) 2020 Collabora, Ltd. and the Proclamation contributors
22
Copyright (c) 2020 The Khronos Group Inc.
33

4-
SPDX-License-Identifier: CC0-1.0
4+
SPDX-License-Identifier: CC0-1.0

BUILDING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ SPDX-License-Identifier: CC-BY-4.0
88

99
## Python v3.6+ required
1010

11-
Certain source files are generated at build time from the `xr.xml` file, utilizing
12-
python scripts. The scripts make use of the python `pathlib` module, which is
11+
Certain source files are generated at build time from the `xr.xml` file, utilizing
12+
python scripts. The scripts make use of the python `pathlib` module, which is
1313
fully supported in python version 3.6 or later.
1414

1515
You will also need the python `jinja2` package, available from your package
@@ -88,7 +88,7 @@ cmake -DCMAKE_BUILD_TYPE=Release ../..
8888
make
8989
```
9090

91-
## (Optional) Building the OpenXR Loader as a DLL
91+
## (Optional) Building the OpenXR Loader as a DLL
9292

9393
The OpenXR loader is built as a static library by default. To instead build as a dynamic link library, define
9494
the cmake option `DYNAMIC_LOADER=ON`. e.g. for Win64, replace the cmake line shown above with:
@@ -103,15 +103,15 @@ cmake -DDYNAMIC_LOADER=ON -G "Visual Studio [Version Number] Win64" ../..
103103

104104
An OpenXR _runtime_ must first be installed before running the hello_xr sample. The runtime is an
105105
implementation of the OpenXR API, typically tailed to a specific device and distributed by the
106-
device manufacturer. To allow experimentation with the API in the absence of a specific device runtime,
107-
several organizations have made available prototype OpenXR runtimes, linked from the main OpenXR landing
106+
device manufacturer. To allow experimentation with the API in the absence of a specific device runtime,
107+
several organizations have made available prototype OpenXR runtimes, linked from the main OpenXR landing
108108
page at https://www.khronos.org/openxr
109109

110110
## Configuring the OpenXR Loader
111111
### XR\_RUNTIME\_JSON environment variable
112112

113113
The OpenXR loader looks in system-specific locations for the JSON file `active_runtime.json`, which describes the
114-
default installed OpenXR runtime. To override the default selection, you may define an environment variable
114+
default installed OpenXR runtime. To override the default selection, you may define an environment variable
115115
`XR_RUNTIME_JSON` to select a different runtime, or a runtime which has not been installed in the default
116116
location.
117117

LICENSES/Apache-2.0.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ AND DISTRIBUTION
77

88
1. Definitions.
99

10-
10+
1111

1212
"License" shall mean the terms and conditions for use, reproduction, and distribution
1313
as defined by Sections 1 through 9 of this document.
1414

15-
15+
1616

1717
"Licensor" shall mean the copyright owner or entity authorized by the copyright
1818
owner that is granting the License.
1919

20-
20+
2121

2222
"Legal Entity" shall mean the union of the acting entity and all other entities
2323
that control, are controlled by, or are under common control with that entity.
@@ -26,31 +26,31 @@ or indirect, to cause the direction or management of such entity, whether
2626
by contract or otherwise, or (ii) ownership of fifty percent (50%) or more
2727
of the outstanding shares, or (iii) beneficial ownership of such entity.
2828

29-
29+
3030

3131
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions
3232
granted by this License.
3333

34-
34+
3535

3636
"Source" form shall mean the preferred form for making modifications, including
3737
but not limited to software source code, documentation source, and configuration
3838
files.
3939

40-
40+
4141

4242
"Object" form shall mean any form resulting from mechanical transformation
4343
or translation of a Source form, including but not limited to compiled object
4444
code, generated documentation, and conversions to other media types.
4545

46-
46+
4747

4848
"Work" shall mean the work of authorship, whether in Source or Object form,
4949
made available under the License, as indicated by a copyright notice that
5050
is included in or attached to the work (an example is provided in the Appendix
5151
below).
5252

53-
53+
5454

5555
"Derivative Works" shall mean any work, whether in Source or Object form,
5656
that is based on (or derived from) the Work and for which the editorial revisions,
@@ -59,7 +59,7 @@ original work of authorship. For the purposes of this License, Derivative
5959
Works shall not include works that remain separable from, or merely link (or
6060
bind by name) to the interfaces of, the Work and Derivative Works thereof.
6161

62-
62+
6363

6464
"Contribution" shall mean any work of authorship, including the original version
6565
of the Work and any modifications or additions to that Work or Derivative
@@ -74,7 +74,7 @@ for the purpose of discussing and improving the Work, but excluding communicatio
7474
that is conspicuously marked or otherwise designated in writing by the copyright
7575
owner as "Not a Contribution."
7676

77-
77+
7878

7979
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
8080
of whom a Contribution has been received by Licensor and subsequently incorporated

include/openxr/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if(HAVE_PREGENERATED AND NOT BUILD_FORCE_GENERATION)
4141
add_custom_target(generate_openxr_header
4242
COMMENT "Using found pre-generated OpenXR headers.")
4343

44-
set(INSTALL_HEADERS
44+
set(INSTALL_HEADERS
4545
${CMAKE_CURRENT_SOURCE_DIR}/openxr_platform_defines.h
4646
${SOURCE_HEADERS})
4747
else()

include/openxr/openxr_platform_defines.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ typedef unsigned __int64 uint64_t;
8080
#endif
8181
#endif
8282

83-
// Identifies if the current compiler has C++11 support enabled.
83+
// Identifies if the current compiler has C++11 support enabled.
8484
// Does not by itself identify if any given C++11 feature is present.
8585
#if !defined(XR_CPP11_ENABLED) && defined(__cplusplus)
8686
#if defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__)

0 commit comments

Comments
 (0)