Skip to content

Commit aa45289

Browse files
compnerdbnbarham
compnerd
authored and
bnbarham
committed
WiX: remove references to DEVTOOLS_ROOT
As the Windows build has evolved, we have built up a complete toolchain image and removed the need for the separate `DEVTOOLS_ROOT`. This simplifies the packaging manifest and associated MSBuild files.
1 parent e833a7f commit aa45289

File tree

8 files changed

+44
-49
lines changed

8 files changed

+44
-49
lines changed

‎platforms/Windows/bld/bld.wixproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<DefineConstants>
44
$(DefineConstants);
5-
DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
65
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
76
TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
87
TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;

‎platforms/Windows/bld/bld.wxs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -352,40 +352,40 @@
352352

353353
<ComponentGroup Id="argument_parser" Directory="_usr_bin">
354354
<Component>
355-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" />
355+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\ArgumentParser.dll" />
356356
</Component>
357357
</ComponentGroup>
358358

359359
<ComponentGroup Id="tools_support_core" Directory="_usr_bin">
360360
<Component>
361-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\TSCBasic.dll" />
361+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\TSCBasic.dll" />
362362
</Component>
363363
<Component>
364-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\TSCUtility.dll" />
364+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\TSCUtility.dll" />
365365
</Component>
366366
</ComponentGroup>
367367

368368
<ComponentGroup Id="swift_driver" Directory="_usr_bin">
369369
<!-- TODO(compnerd) can we use symbolic links to swift.exe instead? -->
370370
<Component>
371-
<File Name="swiftc.exe" Source="$(DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" />
371+
<File Name="swiftc.exe" Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-driver.exe" />
372372
</Component>
373373

374374
<Component>
375-
<File Name="swift.exe" Source="$(DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" />
375+
<File Name="swift.exe" Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-driver.exe" />
376376
</Component>
377377
<Component>
378-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-help.exe" />
378+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-help.exe" />
379379
</Component>
380380

381381
<Component>
382-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftOptions.dll" />
382+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftOptions.dll" />
383383
</Component>
384384
<Component>
385-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftDriver.dll" />
385+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDriver.dll" />
386386
</Component>
387387
<Component>
388-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftDriverExecution.dll" />
388+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDriverExecution.dll" />
389389
</Component>
390390
</ComponentGroup>
391391

‎platforms/Windows/cli/cli.wixproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<DefineConstants>
44
$(DefineConstants);
5-
DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
65
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
76
SWIFT_DOCC_BUILD=$(SWIFT_DOCC_BUILD);
87
INCLUDE_SWIFT_DOCC=$(INCLUDE_SWIFT_DOCC);

‎platforms/Windows/cli/cli.wxs‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -112,73 +112,73 @@
112112

113113
<ComponentGroup Id="collections" Directory="_usr_bin">
114114
<Component>
115-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\Collections.dll" />
115+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\Collections.dll" />
116116
</Component>
117117
<Component>
118-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\DequeModule.dll" />
118+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\DequeModule.dll" />
119119
</Component>
120120
<Component>
121-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\InternalCollectionsUtilities.dll" />
121+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\InternalCollectionsUtilities.dll" />
122122
</Component>
123123
<Component>
124-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\OrderedCollections.dll" />
124+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\OrderedCollections.dll" />
125125
</Component>
126126
</ComponentGroup>
127127

128128
<ComponentGroup Id="llbuild" Directory="_usr_bin">
129129
<Component>
130-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\llbuildSwift.dll" />
130+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llbuildSwift.dll" />
131131
</Component>
132132
</ComponentGroup>
133133

134134
<ComponentGroup Id="system" Directory="_usr_bin">
135135
<Component>
136-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SystemPackage.dll" />
136+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SystemPackage.dll" />
137137
</Component>
138138
</ComponentGroup>
139139

140140
<ComponentGroup Id="CompilerPluginSupport" Directory="_usr_lib_swift_pm_ManifestAPI">
141141
<Component>
142-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" />
142+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" />
143143
</Component>
144144
<Component>
145-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" />
145+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" />
146146
</Component>
147147
<Component>
148-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" />
148+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" />
149149
</Component>
150150
<Component>
151-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" />
151+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" />
152152
</Component>
153153
</ComponentGroup>
154154

155155
<ComponentGroup Id="PackageDescription" Directory="_usr_lib_swift_pm_ManifestAPI">
156156
<Component>
157-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" />
157+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" />
158158
</Component>
159159
<Component>
160-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" />
160+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" />
161161
</Component>
162162
<Component>
163-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" />
163+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" />
164164
</Component>
165165
<Component>
166-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" />
166+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" />
167167
</Component>
168168
</ComponentGroup>
169169

170170
<ComponentGroup Id="PackagePlugin" Directory="_usr_lib_swift_pm_PluginAPI">
171171
<Component>
172-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" />
172+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" />
173173
</Component>
174174
<Component>
175-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" />
175+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" />
176176
</Component>
177177
<Component>
178-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" />
178+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" />
179179
</Component>
180180
<Component>
181-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" />
181+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" />
182182
</Component>
183183
</ComponentGroup>
184184

@@ -188,53 +188,53 @@
188188
<ComponentGroupRef Id="PackagePlugin" />
189189

190190
<Component>
191-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-build.exe" />
191+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-build.exe" />
192192
</Component>
193193
<Component>
194-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-package.exe" />
194+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-package.exe" />
195195
</Component>
196196
<Component>
197-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-run.exe" />
197+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-run.exe" />
198198
</Component>
199199
<Component>
200-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-test.exe" />
200+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-test.exe" />
201201
</Component>
202202

203203
<Component>
204-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\Basics.dll" />
204+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\Basics.dll" />
205205
</Component>
206206
<Component>
207-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\Build.dll" />
207+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\Build.dll" />
208208
</Component>
209209
<Component>
210-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\Commands.dll" />
210+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\Commands.dll" />
211211
</Component>
212212
<Component>
213-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\CoreCommands.dll" />
213+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\CoreCommands.dll" />
214214
</Component>
215215
<Component>
216-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\DriverSupport.dll" />
216+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\DriverSupport.dll" />
217217
</Component>
218218
<Component>
219-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\PackageGraph.dll" />
219+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageGraph.dll" />
220220
</Component>
221221
<Component>
222-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\PackageLoading.dll" />
222+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageLoading.dll" />
223223
</Component>
224224
<Component>
225-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\PackageModel.dll" />
225+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageModel.dll" />
226226
</Component>
227227
<Component>
228-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\PackageModelSyntax.dll" />
228+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageModelSyntax.dll" />
229229
</Component>
230230
<Component>
231-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SourceControl.dll" />
231+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SourceControl.dll" />
232232
</Component>
233233
<Component>
234-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SPMBuildCore.dll" />
234+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SPMBuildCore.dll" />
235235
</Component>
236236
<Component>
237-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\Workspace.dll" />
237+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\Workspace.dll" />
238238
</Component>
239239

240240
<!-- FIXME(compnerd) we should include the SPM import libraries -->

‎platforms/Windows/dbg/dbg.wixproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<DefineConstants>
44
$(DefineConstants);
5-
DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
65
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
76
SWIFT_INSPECT_BUILD=$(SWIFT_INSPECT_BUILD);
87
INCLUDE_SWIFT_INSPECT=$(INCLUDE_SWIFT_INSPECT);

‎platforms/Windows/ide/ide.wixproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<DefineConstants>
44
$(DefineConstants);
5-
DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
65
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT)
76
</DefineConstants>
87
</PropertyGroup>

‎platforms/Windows/ide/ide.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
<ComponentGroup Id="lsp" Directory="_usr_bin">
4646
<Component>
47-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\sourcekit-lsp.exe" />
47+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\sourcekit-lsp.exe" />
4848
</Component>
4949
</ComponentGroup>
5050

‎platforms/Windows/readme.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.
165165
-p:BaseReleaseDownloadUrl=todo://base/release/download/url ^
166166
-p:Configuration=Release ^
167167
-p:BaseOutputPath=%PackageRoot%\online\ ^
168-
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
169168
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
170169
-p:PLATFORM_ROOT_X86=path\to\x86\platform ^
171170
-p:PLATFORM_ROOT_AMD64=path\to\amd64\platform ^

0 commit comments

Comments
 (0)