Skip to content

Commit 4873e41

Browse files
walbournwalbourn
authored
Fix some warnings in WSL build due to case (#197)
1 parent e836827 commit 4873e41

File tree

3 files changed

+156
-16
lines changed

3 files changed

+156
-16
lines changed

‎build/DirectXMesh-GitHub-WSL-11.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,42 +67,42 @@ jobs:
6767
clean: true
6868
fetchTags: false
6969
fetchDepth: 1
70-
path: 's/directx-headers'
70+
path: 's/DirectX-Headers'
7171
- checkout: dxMathRepo
7272
displayName: Fetch DirectX-Math
7373
clean: true
7474
fetchTags: false
7575
fetchDepth: 1
76-
path: 's/directxmath'
76+
path: 's/DirectXMath'
7777
- task: CMake@1
7878
displayName: CMake DirectX-Headers
7979
inputs:
80-
cwd: directx-headers
80+
cwd: DirectX-Headers
8181
cmakeArgs: . -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR)
8282
- task: CMake@1
8383
displayName: CMake DirectX-Headers (Build)
8484
inputs:
85-
cwd: directx-headers
85+
cwd: DirectX-Headers
8686
cmakeArgs: --build . -v
8787
- task: CMake@1
8888
displayName: CMake DirectX-Headers (Install)
8989
inputs:
90-
cwd: directx-headers
90+
cwd: DirectX-Headers
9191
cmakeArgs: --install .
9292
- task: CMake@1
9393
displayName: CMake DirectXMath
9494
inputs:
95-
cwd: directxmath
95+
cwd: DirectXMath
9696
cmakeArgs: . -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR)
9797
- task: CMake@1
9898
displayName: CMake DirectXMath (Build)
9999
inputs:
100-
cwd: directxmath
100+
cwd: DirectXMath
101101
cmakeArgs: --build . -v
102102
- task: CMake@1
103103
displayName: CMake DirectXMath (Install)
104104
inputs:
105-
cwd: directxmath
105+
cwd: DirectXMath
106106
cmakeArgs: --install .
107107
- task: PowerShell@2
108108
displayName: Fetch SAL.H

‎build/DirectXMesh-GitHub-WSL-13.yml‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
# Copyright (c) Microsoft Corporation.
2+
# Licensed under the MIT License.
3+
#
4+
# https://go.microsoft.com/fwlink/?LinkID=324981
5+
6+
# Builds the library for Windows Subsystem for Linux (WSL)
7+
8+
schedules:
9+
- cron: "0 1 * * *"
10+
displayName: 'Nightly build'
11+
branches:
12+
include:
13+
- main
14+
15+
trigger: none
16+
17+
pr:
18+
branches:
19+
include:
20+
- main
21+
paths:
22+
include:
23+
- CMake*
24+
- build/*.cmake
25+
- build/*.in
26+
- build/DirectXMesh-GitHub-WSL-13.yml
27+
28+
resources:
29+
repositories:
30+
- repository: self
31+
type: git
32+
ref: refs/heads/main
33+
trigger: none
34+
- repository: dxHeadersRepo
35+
name: Microsoft/DirectX-Headers
36+
type: github
37+
endpoint: microsoft
38+
ref: refs/heads/main
39+
- repository: dxMathRepo
40+
name: Microsoft/DirectXMath
41+
type: github
42+
endpoint: microsoft
43+
ref: refs/heads/main
44+
45+
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
46+
47+
pool:
48+
vmImage: ubuntu-24.04
49+
50+
variables:
51+
Codeql.Enabled: false
52+
LOCAL_PKG_DIR: '$(Agent.BuildDirectory)/install/'
53+
54+
jobs:
55+
- job: BUILD_WSL
56+
displayName: 'Windows Subsystem for Linux (WSL)'
57+
timeoutInMinutes: 120
58+
cancelTimeoutInMinutes: 1
59+
steps:
60+
- checkout: self
61+
clean: true
62+
fetchTags: false
63+
fetchDepth: 1
64+
path: 's'
65+
- checkout: dxHeadersRepo
66+
displayName: Fetch DirectX-Headers
67+
clean: true
68+
fetchTags: false
69+
fetchDepth: 1
70+
path: 's/DirectX-Headers'
71+
- checkout: dxMathRepo
72+
displayName: Fetch DirectX-Math
73+
clean: true
74+
fetchTags: false
75+
fetchDepth: 1
76+
path: 's/DirectXMath'
77+
- task: CMake@1
78+
displayName: CMake DirectX-Headers
79+
inputs:
80+
cwd: DirectX-Headers
81+
cmakeArgs: . -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR)
82+
- task: CMake@1
83+
displayName: CMake DirectX-Headers (Build)
84+
inputs:
85+
cwd: DirectX-Headers
86+
cmakeArgs: --build . -v
87+
- task: CMake@1
88+
displayName: CMake DirectX-Headers (Install)
89+
inputs:
90+
cwd: DirectX-Headers
91+
cmakeArgs: --install .
92+
- task: CMake@1
93+
displayName: CMake DirectXMath
94+
inputs:
95+
cwd: DirectXMath
96+
cmakeArgs: . -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR)
97+
- task: CMake@1
98+
displayName: CMake DirectXMath (Build)
99+
inputs:
100+
cwd: DirectXMath
101+
cmakeArgs: --build . -v
102+
- task: CMake@1
103+
displayName: CMake DirectXMath (Install)
104+
inputs:
105+
cwd: DirectXMath
106+
cmakeArgs: --install .
107+
- task: PowerShell@2
108+
displayName: Fetch SAL.H
109+
inputs:
110+
targetType: inline
111+
script: |
112+
$ProgressPreference = 'SilentlyContinue'
113+
Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/corert/master/src/Native/inc/unix/sal.h -OutFile $(LOCAL_PKG_DIR)/include/sal.h
114+
$fileHash = Get-FileHash -Algorithm SHA512 $(LOCAL_PKG_DIR)/include/sal.h | ForEach { $_.Hash} | Out-String
115+
$filehash = $fileHash.Trim()
116+
Write-Host "##[debug]SHA512: " $filehash
117+
if ($fileHash -ne "1643571673195d9eb892d2f2ac76eac7113ef7aa0ca116d79f3e4d3dc9df8a31600a9668b7e7678dfbe5a76906f9e0734ef8d6db0903ccc68fc742dd8238d8b0") {
118+
Write-Error -Message "##[error]Computed hash does not match!" -ErrorAction Stop
119+
}
120+
121+
- task: CMake@1
122+
displayName: CMake DirectXMesh (Config) dbg
123+
inputs:
124+
cwd: $(Build.SourcesDirectory)
125+
cmakeArgs: -B out -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake
126+
- task: CMake@1
127+
displayName: CMake DirectXMesh (Build) dbg
128+
inputs:
129+
cwd: $(Build.SourcesDirectory)
130+
cmakeArgs: --build out -v
131+
- task: CMake@1
132+
displayName: CMake DirectXMesh (Config) rel
133+
inputs:
134+
cwd: $(Build.SourcesDirectory)
135+
cmakeArgs: -B out2 -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake
136+
- task: CMake@1
137+
displayName: CMake DirectXMesh (Build) rel
138+
inputs:
139+
cwd: $(Build.SourcesDirectory)
140+
cmakeArgs: --build out2 -v

‎build/DirectXMesh-GitHub-WSL.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,42 +84,42 @@ jobs:
8484
clean: true
8585
fetchTags: false
8686
fetchDepth: 1
87-
path: 's/directx-headers'
87+
path: 's/DirectX-Headers'
8888
- checkout: dxMathRepo
8989
displayName: Fetch DirectX-Math
9090
clean: true
9191
fetchTags: false
9292
fetchDepth: 1
93-
path: 's/directxmath'
93+
path: 's/DirectXMath'
9494
- task: CMake@1
9595
displayName: CMake DirectX-Headers
9696
inputs:
97-
cwd: directx-headers
97+
cwd: DirectX-Headers
9898
cmakeArgs: . -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR)
9999
- task: CMake@1
100100
displayName: CMake DirectX-Headers (Build)
101101
inputs:
102-
cwd: directx-headers
102+
cwd: DirectX-Headers
103103
cmakeArgs: --build . -v
104104
- task: CMake@1
105105
displayName: CMake DirectX-Headers (Install)
106106
inputs:
107-
cwd: directx-headers
107+
cwd: DirectX-Headers
108108
cmakeArgs: --install .
109109
- task: CMake@1
110110
displayName: CMake DirectXMath
111111
inputs:
112-
cwd: directxmath
112+
cwd: DirectXMath
113113
cmakeArgs: . -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR)
114114
- task: CMake@1
115115
displayName: CMake DirectXMath (Build)
116116
inputs:
117-
cwd: directxmath
117+
cwd: DirectXMath
118118
cmakeArgs: --build . -v
119119
- task: CMake@1
120120
displayName: CMake DirectXMath (Install)
121121
inputs:
122-
cwd: directxmath
122+
cwd: DirectXMath
123123
cmakeArgs: --install .
124124
- task: PowerShell@2
125125
displayName: Fetch SAL.H

0 commit comments

Comments
 (0)