Skip to content

Commit 046f9ad

Browse files
compnerdcompnerd
committed
WiX: extract CDispatch module definition
The core dispatch headers are uniform across the SDKs. Ideally we would also be able to share the "os" headers, but they are installed into a separate directory and we cannot simply include them for the restructuring.
1 parent 8a91a7e commit 046f9ad

File tree

3 files changed

+47
-84
lines changed

3 files changed

+47
-84
lines changed

‎platforms/Windows/sdk/CDispatch.wxi

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
3+
<Component>
4+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\base.h" />
5+
</Component>
6+
<Component>
7+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\block.h" />
8+
</Component>
9+
<Component>
10+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\data.h" />
11+
</Component>
12+
<Component>
13+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\dispatch.h" />
14+
</Component>
15+
<Component>
16+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\group.h" />
17+
</Component>
18+
<Component>
19+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\introspection.h" />
20+
</Component>
21+
<Component>
22+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\io.h" />
23+
</Component>
24+
<Component>
25+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\module.modulemap" />
26+
</Component>
27+
<Component>
28+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\object.h" />
29+
</Component>
30+
<Component>
31+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\once.h" />
32+
</Component>
33+
<Component>
34+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\queue.h" />
35+
</Component>
36+
<Component>
37+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\semaphore.h" />
38+
</Component>
39+
<Component>
40+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\source.h" />
41+
</Component>
42+
<Component>
43+
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\time.h" />
44+
</Component>
45+
</Include>

‎platforms/Windows/sdk/drd/sdk.wxs

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -207,48 +207,7 @@
207207
</ComponentGroup>
208208

209209
<ComponentGroup Id="libdispatch" Directory="AndroidSDK_usr_include_dispatch">
210-
<Component>
211-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\base.h" />
212-
</Component>
213-
<Component>
214-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\block.h" />
215-
</Component>
216-
<Component>
217-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\data.h" />
218-
</Component>
219-
<Component>
220-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\dispatch.h" />
221-
</Component>
222-
<Component>
223-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\group.h" />
224-
</Component>
225-
<Component>
226-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\introspection.h" />
227-
</Component>
228-
<Component>
229-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\io.h" />
230-
</Component>
231-
<Component>
232-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\module.modulemap" />
233-
</Component>
234-
<Component>
235-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\object.h" />
236-
</Component>
237-
<Component>
238-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\once.h" />
239-
</Component>
240-
<Component>
241-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\queue.h" />
242-
</Component>
243-
<Component>
244-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\semaphore.h" />
245-
</Component>
246-
<Component>
247-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\source.h" />
248-
</Component>
249-
<Component>
250-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\time.h" />
251-
</Component>
210+
<?include ../CDispatch.wxi?>
252211
<Component Directory="AndroidSDK_usr_include_os">
253212
<File Source="$(SDK_ROOT)\usr\lib\swift\os\generic_base.h" />
254213
</Component>

‎platforms/Windows/sdk/win/sdk.wxs

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -192,48 +192,7 @@
192192
</ComponentGroup>
193193

194194
<ComponentGroup Id="libdispatch" Directory="WindowsSDK_usr_include_dispatch">
195-
<Component>
196-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\base.h" />
197-
</Component>
198-
<Component>
199-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\block.h" />
200-
</Component>
201-
<Component>
202-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\data.h" />
203-
</Component>
204-
<Component>
205-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\dispatch.h" />
206-
</Component>
207-
<Component>
208-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\group.h" />
209-
</Component>
210-
<Component>
211-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\introspection.h" />
212-
</Component>
213-
<Component>
214-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\io.h" />
215-
</Component>
216-
<Component>
217-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\module.modulemap" />
218-
</Component>
219-
<Component>
220-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\object.h" />
221-
</Component>
222-
<Component>
223-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\once.h" />
224-
</Component>
225-
<Component>
226-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\queue.h" />
227-
</Component>
228-
<Component>
229-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\semaphore.h" />
230-
</Component>
231-
<Component>
232-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\source.h" />
233-
</Component>
234-
<Component>
235-
<File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\time.h" />
236-
</Component>
195+
<?include ../CDispatch.wxi?>
237196
<Component Directory="WindowsSDK_usr_include_os">
238197
<File Source="$(SDK_ROOT)\usr\lib\swift\os\generic_base.h" />
239198
</Component>

0 commit comments

Comments
 (0)