Skip to content

Commit 8a91a7e

Browse files
committed
WiX: add educational notes to the windows packaging
This packages up the educational notes for distribution with the toolchain. It is yet unclear if this should be broken out into an optioanl MSI to allow installation of the documentation on demand rather than as an always available option. This should at least ensure that we distribute the user facing documentation that can be accessed from the compiler.
1 parent d9f557b commit 8a91a7e

File tree

1 file changed

+49
-0
lines changed

1 file changed

+49
-0
lines changed

platforms/Windows/bld/bld.wxs

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
<DirectoryRef Id="_usr_share">
3333
<Directory Id="_usr_share_clang" Name="clang" />
3434
<Directory Id="_usr_share_swift" Name="swift" />
35+
<Directory Id="_usr_share_doc" Name="doc">
36+
<Directory Id="_usr_share_doc_swift" Name="swift">
37+
<Directory Id="_usr_share_doc_swift_diagnostics" Name="diagnostics">
38+
</Directory>
39+
</Directory>
40+
</Directory>
3541
</DirectoryRef>
3642

3743
<ComponentGroup Id="cmark_gfm" Directory="_usr_bin">
@@ -266,6 +272,48 @@
266272
</Component>
267273
</ComponentGroup>
268274

275+
<ComponentGroup Id="SwiftEducationalNotes" Directory="_usr_share_doc_swift_diagnostics">
276+
<Component>
277+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\complex-closure-inference.md" />
278+
</Component>
279+
<Component>
280+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\dynamic-callable-requirements.md" />
281+
</Component>
282+
<Component>
283+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\error-in-future-swift-version.md" />
284+
</Component>
285+
<Component>
286+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\existential-member-access-limitations.md" />
287+
</Component>
288+
<Component>
289+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\multiple-inheritance.md" />
290+
</Component>
291+
<Component>
292+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\nominal-types.md" />
293+
</Component>
294+
<Component>
295+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\opaque-type-inference.md" />
296+
</Component>
297+
<Component>
298+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\property-wrapper-requirements.md" />
299+
</Component>
300+
<Component>
301+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\protocol-type-non-conformance.md" />
302+
</Component>
303+
<Component>
304+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\result-builder-methods.md" />
305+
</Component>
306+
<Component>
307+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\string-interpolation-conformance.md" />
308+
</Component>
309+
<Component>
310+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\temporary-pointers.md" />
311+
</Component>
312+
<Component>
313+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\trailing-closure-matching.md" />
314+
</Component>
315+
</ComponentGroup>
316+
269317
<ComponentGroup Id="SwiftFeatures" Directory="_usr_share_swift">
270318
<Component>
271319
<File Source="$(TOOLCHAIN_ROOT)\usr\share\swift\features.json" />
@@ -308,6 +356,7 @@
308356
<ComponentGroup Id="swift" Directory="_usr_bin">
309357
<ComponentGroupRef Id="SwiftCxx" />
310358
<ComponentGroupRef Id="SwiftDemangle" />
359+
<ComponentGroupRef Id="SwiftEducationalNotes" />
311360
<ComponentGroupRef Id="SwiftFeatures" />
312361
<ComponentGroupRef Id="SwiftMigrator" />
313362

0 commit comments

Comments
 (0)