Skip to content

Commit ed8c508

Browse files
compnerdcompnerd
authored
Merge pull request #70 from compnerd/driver-packaging
Windows: shuffle files in the MSI packaging
2 parents 5ca64c4 + 615e05a commit ed8c508

File tree

3 files changed

+68
-85
lines changed

3 files changed

+68
-85
lines changed

‎platforms/Windows/devtools.wxs‎

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -67,23 +67,6 @@
6767
</Component>
6868
<?endif?>
6969

70-
<!-- llbuild -->
71-
<Component Id="LLBUILD_BINS" Guid="ff7fc643-d14b-465b-ba9e-79191c27d403">
72-
<File Id="LLBUILD_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuild.dll" Checksum="yes" />
73-
<File Id="LLBUILDSWIFT_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuildSwift.dll" Checksum="yes" />
74-
75-
<File Id="SWIFT_BUILD_TOOL_EXE" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build-tool.exe" Checksum="yes" />
76-
</Component>
77-
78-
<?ifdef INCLUDE_DEBUG_INFO ?>
79-
<Component Id="LLBUILD_DEBUGINFO" Guid="a74f4415-d0a8-42c2-adaf-abd98d2865b5">
80-
<File Id="LLBUILD_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuild.pdb" Checksum="yes" />
81-
<File Id="LLBUILDSWIFT_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuildSwift.pdb" Checksum="yes" />
82-
83-
<File Id="SWIFT_BUILD_TOOL_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build-tool.pdb" Checksum="yes" />
84-
</Component>
85-
<?endif?>
86-
8770
<!-- SourceKit-LSP -->
8871
<Component Id="SOURCEKIT_LSP_BINS" Guid="5ca5d02f-76f3-4537-9dfb-a3fdb6381ac4">
8972
<File Id="BUILD_SERVER_PROTOCOL_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\BuildServerProtocol.dll" Checksum="yes" />
@@ -113,19 +96,6 @@
11396
</Component>
11497
<?endif?>
11598

116-
<!-- swift-argument-parser -->
117-
<Component Id="SWIFT_ARGUMENT_PARSER_BINS" Guid="ead7f2bd-f3ce-4f50-a04e-a2b9af25ae03">
118-
<File Id="ARGUMENT_PARSER_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" Checksum="yes" />
119-
<File Id="ARGUMENT_PARSER_TOOL_INFO_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\ArgumentParserToolInfo.dll" Checksum="yes" />
120-
</Component>
121-
122-
<?ifdef INCLUDE_DEBUG_INFO ?>
123-
<Component Id="SWIFT_ARGUMENT_PARSER_DEBUGINFO" Guid="93c2ef9c-ba1f-462c-8701-2d77125ec9c8">
124-
<File Id="ARGUMENT_PARSER_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\ArgumentParser.pdb" Checksum="yes" />
125-
<File Id="ARGUMENT_PARSER_TOOL_INFO_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\ArgumentParserToolInfo.pdb" Checksum="yes" />
126-
</Component>
127-
<?endif?>
128-
12999
<!-- swift-crypto -->
130100
<Component Id="SWIFT_CRYPTO_BINS" Guid="8f4fb997-7a41-4d37-a3d4-f5e006f5e3c4">
131101
<File Id="CRYPTO_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Crypto.dll" Checksum="yes" />
@@ -152,19 +122,6 @@
152122
</Component>
153123
<?endif?>
154124

155-
<!-- swift-driver -->
156-
<Component Id="SWIFT_DRIVER_BINS" Guid="6108d465-9eb5-441f-8cde-5437457fb539">
157-
<File Id="SWIFT_DRIVER_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftDriver.dll" Checksum="yes" />
158-
<File Id="SWIFT_OPTIONS_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftOptions.dll" Checksum="yes" />
159-
</Component>
160-
161-
<?ifdef INCLUDE_DEBUG_INFO ?>
162-
<Component Id="SWIFT_DRIVER_DEBUGINFO" Guid="2e5f4e86-628c-4184-99eb-9385efdebe83">
163-
<File Id="SWIFT_DRIVER_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftDriver.pdb" Checksum="yes" />
164-
<File Id="SWIFT_OPTIONS_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftOptions.pdb" Checksum="yes" />
165-
</Component>
166-
<?endif?>
167-
168125
<!-- swift-package-manager -->
169126
<Component Id="SWIFT_PACKAGE_MANAGER_BINS" Guid="1b6a0df3-9fd5-4262-8d90-55585f059d40">
170127
<File Id="BASICS_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Basics.dll" Checksum="yes" />
@@ -230,34 +187,6 @@
230187
<File Id="SWIFT_PACKAGE_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SystemPackage.pdb" Checksum="yes" />
231188
</Component>
232189
<?endif?>
233-
234-
<!-- swift-tools-support-core -->
235-
<Component Id="SWIFT_TOOLS_SUPPORT_CORE_BINS" Guid="24999b97-7709-4a57-a987-4f8b7e16bb53">
236-
<File Id="TSC_BASIC_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCBasic.dll" Checksum="yes" />
237-
<File Id="TSC_LIBC_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCLibc.dll" Checksum="yes" />
238-
<File Id="TSC_UTILITY_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCUtility.dll" Checksum="yes" />
239-
</Component>
240-
241-
<?ifdef INCLUDE_DEBUG_INFO ?>
242-
<Component Id="SWIFT_TOOLS_SUPPORT_CORE_DEBUGINFO" Guid="9487dcfc-ceb1-4763-9db5-af7b52687197">
243-
<File Id="TSC_BASIC_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCBasic.pdb" Checksum="yes" />
244-
<File Id="TSC_LIBC_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCLibc.pdb" Checksum="yes" />
245-
<File Id="TSC_UTILITY_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCUtility.pdb" Checksum="yes" />
246-
</Component>
247-
<?endif?>
248-
249-
<!--- Yams -->
250-
<Component Id="YAMS_BINS" Guid="d60b565d-9efe-42db-b821-fa1d6ad4d2e2">
251-
<File Id="CYAML_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\CYaml.dll" Checksum="yes" />
252-
<File Id="YAMS_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Yams.dll" Checksum="yes" />
253-
</Component>
254-
255-
<?ifdef INCLUDE_DEBUG_INFO ?>
256-
<Component Id="YAMS_DEBUGINFO" Guid="b09420e8-6c4f-4a9e-8882-4d399ed02ed5">
257-
<File Id="CYAML_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\CYaml.pdb" Checksum="yes" />
258-
<File Id="YAMS_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Yams.pdb" Checksum="yes" />
259-
</Component>
260-
<?endif?>
261190
</DirectoryRef>
262191

263192
<DirectoryRef Id="USR_LIB_SWIFT_PM_MANIFEST_API">
@@ -277,34 +206,24 @@
277206

278207
<Feature Id="DEVTOOLS" Level="1">
279208
<ComponentRef Id="INDEXSTOREDB_BINS" />
280-
<ComponentRef Id="LLBUILD_BINS" />
281209
<ComponentRef Id="SOURCEKIT_LSP_BINS" />
282-
<ComponentRef Id="SWIFT_ARGUMENT_PARSER_BINS" />
283210
<ComponentRef Id="SWIFT_CRYPTO_BINS" />
284211
<ComponentRef Id="SWIFT_COLLECTIONS_BINS" />
285-
<ComponentRef Id="SWIFT_DRIVER_BINS" />
286212
<ComponentRef Id="SWIFT_PACKAGE_MANAGER_BINS" />
287213
<ComponentRef Id="SWIFT_SYSTEM_BINS" />
288-
<ComponentRef Id="SWIFT_TOOLS_SUPPORT_CORE_BINS" />
289214
<ComponentRef Id="MANIFEST_API" />
290-
<ComponentRef Id="YAMS_BINS" />
291215
</Feature>
292216

293217
<?ifdef INCLUDE_DEBUG_INFO ?>
294218
<Feature Id="DEBUGINFO" Level="0">
295219
<Condition Level="1">INSTALL_DEBUGINFO</Condition>
296220
<ComponentRef Id="INDEXSTOREDB_DEBUGINFO" />
297-
<ComponentRef Id="LLBUILD_DEBUGINFO" />
298221
<ComponentRef Id="SOURCEKIT_LSP_DEBUGINFO" />
299-
<ComponentRef Id="SWIFT_ARGUMENT_PARSER_DEBUGINFO" />
300222
<ComponentRef Id="SWIFT_CRYPTO_DEBUGINFO" />
301223
<ComponentRef Id="SWIFT_COLLECTIONS_DEBUGINFO" />
302-
<ComponentRef Id="SWIFT_DRIVER_DEBUGINFO" />
303224
<ComponentRef Id="SWIFT_PACKAGE_MANAGER_DEBUGINFO" />
304225
<ComponentRef Id="SWIFT_SYSTEM_DEBUGINFO" />
305-
<ComponentRef Id="SWIFT_TOOLS_SUPPORT_CORE_DEBUGINFO" />
306226
<ComponentRef Id="MANIFEST_API_DEBUGINFO" />
307-
<ComponentRef Id="YAMS_DEBUGINFO" />
308227
</Feature>
309228
<?endif?>
310229

‎platforms/Windows/toolchain.wixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<Import Project="$(WixTargetsPath)" />
2323

2424
<PropertyGroup>
25-
<DefineConstants>ProductVersion=$(ProductVersion);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;$(INCLUDE_DEBUG_INFO)</DefineConstants>
25+
<DefineConstants>ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;$(INCLUDE_DEBUG_INFO)</DefineConstants>
2626
<HarvestDirectoryAutogenerateGuids>false</HarvestDirectoryAutogenerateGuids>
2727
<HarvestDirectoryGenerateGuidsNow>true</HarvestDirectoryGenerateGuidsNow>
2828
<HarvestDirectoryNoLogo>true</HarvestDirectoryNoLogo>

‎platforms/Windows/toolchain.wxs‎

Lines changed: 67 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
<Media Id="5" Cabinet="Swift_PDBs.cab" />
2121
<Media Id="6" Cabinet="SourceKit_PDBs.cab" />
2222
<Media Id="7" Cabinet="LLD_PDBs.cab" />
23+
<Media Id="8" Cabinet="LLBuild_PDBs.cab" />
24+
<Media Id="9" Cabinet="SwiftDriver_PDBs.cab" />
25+
<Media Id="10" Cabinet="ArgumentParser_PDBs.cab" />
26+
<Media Id="11" Cabinet="ToolsSupportCore_PDBs.cab" />
27+
<Media Id="12" Cabinet="Yams_PDBs.cab" />
2328
<?endif?>
2429

2530
<!-- Directory Structure -->
@@ -170,12 +175,11 @@
170175

171176
<!-- symlinks -->
172177
<File Id="SWIFT_AUTOLINK_EXTRACT_EXE" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-autolink-extract.exe" Checksum="yes" />
173-
<File Id="SWIFTC_EXE" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swiftc.exe" Checksum="yes" />
174178
<!-- /symlinks -->
175179

176180
<File Id="SWIFT_DEMANGLE_EXE" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-demangle.exe" Checksum="yes" />
181+
<File Id="SWIFT_FRONTEND_EXE" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-frontend.exe" Checksum="yes" />
177182
<File Id="SWIFT_REFACTOR_EXE" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-refactor.exe" Checksum="yes" />
178-
<File Id="SWIFT_EXE" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift.exe" Checksum="yes" />
179183
<File Id="SWIFTDEMANGLE_DLL" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swiftDemangle.dll" Checksum="yes" />
180184
<File Id="_INTERNALSWIFTSCAN_DLL" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftScan.dll" Checksum="yes" />
181185
<File Id="_INTERNALSWIFTSYNTAXPARSER_DLL" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftSyntaxParser.dll" Checksum="yes" />
@@ -184,6 +188,39 @@
184188
<File Id="BLOCKSRUNTIME_DLL" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\BlocksRuntime.dll" Checksum="yes" />
185189
<File Id="DISPATCH_DLL" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\dispatch.dll" Checksum="yes" />
186190
<File Id="SOURCEKITDINPROC_DLL" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\sourcekitdInProc.dll" Checksum="yes" />
191+
192+
<!-- non-LLVM build components -->
193+
194+
<!-- llbuild -->
195+
<File Id="LLBUILD_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuild.dll" Checksum="yes" />
196+
<File Id="LLBUILDSWIFT_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuildSwift.dll" Checksum="yes" />
197+
198+
<File Id="SWIFT_BUILD_TOOL_EXE" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build-tool.exe" Checksum="yes" />
199+
200+
<!-- swift-driver -->
201+
<!-- symlinks -->
202+
<File Id="SWIFTC_EXE" Name="swiftc.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" Checksum="yes" />
203+
<!-- /symlinks -->
204+
205+
<File Id="SWIFT_EXE" Name="swift.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" Checksum="yes" />
206+
<File Id="SWIFT_HELP_EXE" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-help.exe" Checksum="yes" />
207+
<File Id="SWIFT_BUILD_SDK_INTERFACES_EXE" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build-sdk-interfaces.exe" Checksum="yes" />
208+
<File Id="SWIFT_OPTIONS_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftOptions.dll" Checksum="yes" />
209+
<File Id="SWIFT_DRIVER_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftDriver.dll" Checksum="yes" />
210+
<File Id="SWIFT_DRIVER_EXECUTION_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftDriverExecution.dll" Checksum="yes" />
211+
212+
<!-- swift-argument-parser -->
213+
<File Id="ARGUMENT_PARSER_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" Checksum="yes" />
214+
<File Id="ARGUMENT_PARSER_TOOL_INFO_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\ArgumentParserToolInfo.dll" Checksum="yes" />
215+
216+
<!-- tools-support-core -->
217+
<File Id="TSC_BASIC_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCBasic.dll" Checksum="yes" />
218+
<File Id="TSC_LIBC_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCLibc.dll" Checksum="yes" />
219+
<File Id="TSC_UTILITY_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCUtility.dll" Checksum="yes" />
220+
221+
<!-- Yams -->
222+
<File Id="CYAML_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\CYaml.dll" Checksum="yes" />
223+
<File Id="YAMS_DLL" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Yams.dll" Checksum="yes" />
187224
</Component>
188225

189226
<?ifdef INCLUDE_DEBUG_INFO ?>
@@ -229,8 +266,8 @@
229266

230267
<!-- swift -->
231268
<File Id="SWIFT_DEMANGLE_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-demangle.pdb" Checksum="yes" DiskId="5" />
269+
<File Id="SWIFT_FRONTEND_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-frontend.pdb" Checksum="yes" DiskId="5" />
232270
<File Id="SWIFT_REFACTOR_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-refactor.pdb" Checksum="yes" DiskId="5" />
233-
<File Id="SWIFT_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift.pdb" Checksum="yes" DiskId="5" />
234271
<File Id="SWIFTDEMANGLE_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swiftDemangle.pdb" Checksum="yes" DiskId="5" />
235272
<File Id="_INTERNALSWIFTCAN_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftScan.pdb" Checksum="yes" DiskId="5" />
236273
<File Id="_INTERNALSWIFTSYNTAXPARSER_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftSyntaxParser.pdb" Checksum="yes" DiskId="5" />
@@ -239,6 +276,33 @@
239276
<File Id="BLOCKSRUNTIME_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\BlocksRuntime.pdb" Checksum="yes" DiskId="6" />
240277
<File Id="DISPATCH_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\dispatch.pdb" Checksum="yes" DiskId="6" />
241278
<File Id="SOURCEKITDINPROC_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\sourcekitdInProc.pdb" Checksum="yes" DiskId="6" />
279+
280+
<!-- non-LLVM build components -->
281+
282+
<!-- llbuild -->
283+
<File Id="LLBUILD_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuild.pdb" Checksum="yes" DiskId="8" />
284+
<File Id="LLBUILDSWIFT_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuildSwift.pdb" Checksum="yes" DiskId="8" />
285+
286+
<File Id="SWIFT_BUILD_TOOL_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build-tool.pdb" Checksum="yes" DiskId="8" />
287+
288+
<!-- swift-driver -->
289+
<File Id="SWIFT_PDB" Name="swift.pdb" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-driver.pdb" Checksum="yes" DiskId="9" />
290+
<File Id="SWIFT_OPTIONS_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftOptions.pdb" Checksum="yes" DiskId="9" />
291+
<File Id="SWIFT_DRIVER_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftDriver.pdb" Checksum="yes" DiskId="9" />
292+
<File Id="SWIFT_DRIVER_EXECUTION_PDB" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftDriverExecution.pdb" Checksum="yes" DiskId="9" />
293+
294+
<!-- swift-argument-parser -->
295+
<File Id="ARGUMENT_PARSER_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\ArgumentParser.pdb" Checksum="yes" DiskId="10" />
296+
<File Id="ARGUMENT_PARSER_TOOL_INFO_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\ArgumentParserToolInfo.pdb" Checksum="yes" DiskId="10" />
297+
298+
<!-- tools-support-core -->
299+
<File Id="TSC_BASIC_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCBasic.pdb" Checksum="yes" DiskId="11" />
300+
<File Id="TSC_LIBC_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCLibc.pdb" Checksum="yes" DiskId="11" />
301+
<File Id="TSC_UTILITY_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCUtility.pdb" Checksum="yes" DiskId="11" />
302+
303+
<!-- Yams -->
304+
<File Id="CYAML_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\CYaml.pdb" Checksum="yes" DiskId="12" />
305+
<File Id="YAMS_PDB" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Yams.pdb" Checksum="yes" DiskId="12" />
242306
</Component>
243307
<?endif?>
244308
</DirectoryRef>

0 commit comments

Comments
 (0)