Skip to content

Commit 2f20532

Browse files
compnerdcompnerd
committed
WiX: reduce some vertical whitespace usage
Remove the use of empty nodes and collapse them to the short form. This reduces the height of the directory hierarchy listing and makes it easier to identify the leaf nodes in the file system.
1 parent f4e0deb commit 2f20532

File tree

6 files changed

+48
-91
lines changed

6 files changed

+48
-91
lines changed

‎platforms/Windows/bld.wxs

+8-15
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,22 @@
2222
<StandardDirectory Id="ProgramFiles64Folder">
2323
<Directory Id="INSTALLDIR" Name="Swift">
2424
<Directory Id="Toolchains" Name="Toolchains">
25-
<Directory Id="xctoolchain" Name="$(var.ProductVersion)+Asserts">
25+
<Directory Id="_" Name="$(var.ProductVersion)+Asserts">
2626
<Directory Id="_usr" Name="usr">
27-
<Directory Id="_usr_bin" Name="bin">
28-
</Directory>
27+
<Directory Id="_usr_bin" Name="bin" />
2928
<Directory Id="_usr_include" Name="include">
30-
<Directory Id="_usr_include_llvm_c" Name="llvm-c">
31-
</Directory>
29+
<Directory Id="_usr_include_llvm_c" Name="llvm-c" />
3230
</Directory>
3331
<Directory Id="_usr_lib" Name="lib">
34-
<Directory Id="_usr_lib_clang" Name="clang">
35-
</Directory>
32+
<Directory Id="_usr_lib_clang" Name="clang" />
3633
<Directory Id="_usr_lib_swift" Name="swift">
37-
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx">
38-
</Directory>
39-
<Directory Id="_usr_lib_swift_migrator" Name="migrator">
40-
</Directory>
41-
<Directory Id="_usr_lib_swift_shims" Name="shims">
42-
</Directory>
34+
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx" />
35+
<Directory Id="_usr_lib_swift_migrator" Name="migrator" />
36+
<Directory Id="_usr_lib_swift_shims" Name="shims" />
4337
</Directory>
4438
</Directory>
4539
<Directory Id="_usr_share" Name="share">
46-
<Directory Id="_usr_share_swift" Name="swift">
47-
</Directory>
40+
<Directory Id="_usr_share_swift" Name="swift" />
4841
</Directory>
4942
</Directory>
5043
</Directory>

‎platforms/Windows/cli.wxs

+7-13
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,19 @@
1414
<StandardDirectory Id="ProgramFiles64Folder">
1515
<Directory Id="INSTALLDIR" Name="Swift">
1616
<Directory Id="Toolchains" Name="Toolchains">
17-
<Directory Id="xctoolchain" Name="$(var.ProductVersion)+Asserts">
17+
<Directory Id="_" Name="$(var.ProductVersion)+Asserts">
1818
<Directory Id="_usr" Name="usr">
19-
<Directory Id="_usr_bin" Name="bin">
20-
</Directory>
19+
<Directory Id="_usr_bin" Name="bin" />
2120
<Directory Id="_usr_include" Name="include">
22-
<Directory Id="_usr_include__InternalSwiftScan" Name="_InternalSwiftScan">
23-
</Directory>
24-
<Directory Id="_usr_include_clang_c" Name="clang-c">
25-
</Directory>
26-
<Directory Id="_usr_include_indexstore" Name="indexstore">
27-
</Directory>
21+
<Directory Id="_usr_include__InternalSwiftScan" Name="_InternalSwiftScan" />
22+
<Directory Id="_usr_include_clang_c" Name="clang-c" />
23+
<Directory Id="_usr_include_indexstore" Name="indexstore" />
2824
</Directory>
2925
<Directory Id="_usr_lib" Name="lib">
3026
<Directory Id="_usr_lib_swift" Name="swift">
3127
<Directory Id="_usr_lib_swift_pm" Name="pm">
32-
<Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI">
33-
</Directory>
34-
<Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI">
35-
</Directory>
28+
<Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI" />
29+
<Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI" />
3630
</Directory>
3731
</Directory>
3832
</Directory>

‎platforms/Windows/dbg.wxs

+4-7
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,16 @@
1414
<StandardDirectory Id="ProgramFiles64Folder">
1515
<Directory Id="INSTALLDIR" Name="Swift">
1616
<Directory Id="Toolchains" Name="Toolchains">
17-
<Directory Id="xctoolchain" Name="$(var.ProductVersion)+Asserts">
17+
<Directory Id="_" Name="$(var.ProductVersion)+Asserts">
1818
<Directory Id="_usr" Name="usr">
19-
<Directory Id="_usr_bin" Name="bin">
20-
</Directory>
19+
<Directory Id="_usr_bin" Name="bin" />
2120
<Directory Id="_usr_lib" Name="lib">
2221
<Directory Id="_usr_lib_site_packages" Name="site-packages">
2322
<Directory Id="_usr_lib_site_packages_lldb" Name="lldb">
2423
<Directory Id="_usr_lib_site_packages_lldb_formatters" Name="formatters">
25-
<Directory Id="_usr_lib_site_packages_lldb_formatters_cpp" Name="cpp">
26-
</Directory>
27-
</Directory>
28-
<Directory Id="_usr_lib_site_packages_lldb_utils" Name="utils">
24+
<Directory Id="_usr_lib_site_packages_lldb_formatters_cpp" Name="cpp" />
2925
</Directory>
26+
<Directory Id="_usr_lib_site_packages_lldb_utils" Name="utils" />
3027
</Directory>
3128
</Directory>
3229
</Directory>

‎platforms/Windows/ide.wxs

+4-7
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
<StandardDirectory Id="ProgramFiles64Folder">
1515
<Directory Id="INSTALLDIR" Name="Swift">
1616
<Directory Id="Toolchains" Name="Toolchains">
17-
<Directory Id="xctoolchain" Name="$(var.ProductVersion)+Asserts">
17+
<Directory Id="_" Name="$(var.ProductVersion)+Asserts">
1818
<Directory Id="_usr" Name="usr">
19-
<Directory Id="_usr_bin" Name="bin">
20-
</Directory>
19+
<Directory Id="_usr_bin" Name="bin" />
2120
<Directory Id="_usr_include" Name="include">
22-
<Directory Id="_usr_include_SourceKit" Name="SourceKit">
23-
</Directory>
24-
</Directory>
25-
<Directory Id="_usr_lib" Name="lib">
21+
<Directory Id="_usr_include_SourceKit" Name="SourceKit" />
2622
</Directory>
23+
<Directory Id="_usr_lib" Name="lib" />
2724
</Directory>
2825
</Directory>
2926
</Directory>

‎platforms/Windows/runtime.wxs

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
<Directory Id="Runtimes" Name="Runtimes">
1717
<Directory Id="_" Name="$(var.ProductVersion)">
1818
<Directory Id="_usr" Name="usr">
19-
<Directory Id="_usr_bin" Name="bin">
20-
</Directory>
19+
<Directory Id="_usr_bin" Name="bin" />
2120
</Directory>
2221
</Directory>
2322
</Directory>

‎platforms/Windows/sdk.wxs

+24-47
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<StandardDirectory Id="ProgramFiles64Folder">
1515
<Directory Id="INSTALLDIR" Name="Swift">
16-
<Directory Id="DeveloperPlatforms" Name="Platforms">
16+
<Directory Id="Platforms" Name="Platforms">
1717
<Directory Id="WindowsPlatform" Name="Windows.platform">
1818
<Directory Id="WindowsPlatform_Developer" Name="Developer">
1919
<Directory Id="WindowsPlatform_Developer_Library" Name="Library">
@@ -29,10 +29,8 @@
2929
<Directory Id="XCTest_usr_lib" Name="lib">
3030
<Directory Id="XCTest_usr_lib_swift" Name="swift">
3131
<Directory Id="XCTest_usr_lib_swift_windows" Name="windows">
32-
<Directory Id="XCTest_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)">
33-
</Directory>
34-
<Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule">
35-
</Directory>
32+
<Directory Id="XCTest_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)" />
33+
<Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule" />
3634
</Directory>
3735
</Directory>
3836
</Directory>
@@ -44,57 +42,36 @@
4442
<Directory Id="WindowsSDK" Name="Windows.sdk">
4543
<Directory Id="WindowsSDK_usr" Name="usr">
4644
<Directory Id="WindowsSDK_usr_include" Name="include">
47-
<Directory Id="WindowsSDK_usr_include_Block" Name="Block">
48-
</Directory>
49-
<Directory Id="WindowsSDK_usr_include_dispatch" Name="dispatch">
50-
</Directory>
51-
<Directory Id="WindowsSDK_usr_include_os" Name="os">
52-
</Directory>
45+
<Directory Id="WindowsSDK_usr_include_Block" Name="Block" />
46+
<Directory Id="WindowsSDK_usr_include_dispatch" Name="dispatch" />
47+
<Directory Id="WindowsSDK_usr_include_os" Name="os" />
5348
<Directory Id="WindowsSDK_usr_include_swift" Name="swift">
54-
<Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror">
55-
</Directory>
49+
<Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" />
5650
</Directory>
5751
</Directory>
5852
<Directory Id="WindowsSDK_usr_lib" Name="lib">
5953
<Directory Id="WindowsSDK_usr_lib_swift" Name="swift">
60-
<Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims">
61-
</Directory>
54+
<Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims" />
6255
<Directory Id="WindowsSDK_usr_lib_swift_windows" Name="windows">
63-
<Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule">
64-
</Directory>
65-
<Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
66-
</Directory>
67-
<Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule">
68-
</Directory>
69-
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
70-
</Directory>
71-
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
72-
</Directory>
73-
<Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule">
74-
</Directory>
75-
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
76-
</Directory>
77-
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
78-
</Directory>
79-
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
80-
</Directory>
81-
<Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule">
82-
</Directory>
83-
<Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule">
84-
</Directory>
85-
<Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule">
86-
</Directory>
87-
<Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule">
88-
</Directory>
89-
<Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule">
90-
</Directory>
91-
<Directory Id="WindowsSDK_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)">
92-
</Directory>
56+
<Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule" />
57+
<Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule" />
58+
<Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
59+
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
60+
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule" />
61+
<Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule" />
62+
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule" />
63+
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule" />
64+
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule" />
65+
<Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule" />
66+
<Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule" />
67+
<Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule" />
68+
<Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
69+
<Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule" />
70+
<Directory Id="WindowsSDK_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)" />
9371
</Directory>
9472
</Directory>
9573
</Directory>
96-
<Directory Id="WindowsSDK_usr_share" Name="share">
97-
</Directory>
74+
<Directory Id="WindowsSDK_usr_share" Name="share" />
9875
</Directory>
9976
</Directory>
10077
</Directory>

0 commit comments

Comments
 (0)