Skip to content

Commit 9936eaf

Browse files
authored
WiX: package up macro support libraries
Add the swift syntax runtime libraries and swiftmodules to enable macros on Windows.
1 parent 8d1f05d commit 9936eaf

File tree

1 file changed

+42
-1
lines changed

1 file changed

+42
-1
lines changed

platforms/Windows/bld/bld.wxs

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2+
3+
<?if $(ProductArchitecture) = "amd64"?>
4+
<?define ArchTriple = "x86_64-unknown-windows-msvc"?>
5+
<?elseif $(ProductArchitecture) = "arm64"?>
6+
<?define ArchTriple = "aarch64-unknown-windows-msvc"?>
7+
<?endif?>
8+
29
<Package
310
Language="1033"
411
Manufacturer="!(loc.ManufacturerName)"
@@ -17,8 +24,8 @@
1724
</DirectoryRef>
1825

1926
<DirectoryRef Id="_usr_lib_swift">
20-
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx" />
2127
<Directory Id="_usr_lib_swift_migrator" Name="migrator" />
28+
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx" />
2229
</DirectoryRef>
2330

2431
<DirectoryRef Id="_usr">
@@ -325,6 +332,39 @@
325332
</Component>
326333
</ComponentGroup>
327334

335+
<ComponentGroup Id="swift_syntax" Directory="_usr_bin">
336+
<Component>
337+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftBasicFormat.dll" />
338+
</Component>
339+
<Component>
340+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftCompilerPluginMessageHandling.dll" />
341+
</Component>
342+
<Component>
343+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDiagnostics.dll" />
344+
</Component>
345+
<Component>
346+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftOperators.dll" />
347+
</Component>
348+
<Component>
349+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftParser.dll" />
350+
</Component>
351+
<Component>
352+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftParserDiagnostics.dll" />
353+
</Component>
354+
<Component>
355+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntax.dll" />
356+
</Component>
357+
<Component>
358+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxBuilder.dll" />
359+
</Component>
360+
<Component>
361+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacroExpansion.dll" />
362+
</Component>
363+
<Component>
364+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacros.dll" />
365+
</Component>
366+
</ComponentGroup>
367+
328368
<ComponentGroup Id="EnvironmentVariables">
329369
<Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="_usr_bin" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
330370
<Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[_usr_bin]" />
@@ -342,6 +382,7 @@
342382
<ComponentGroupRef Id="argument_parser" />
343383
<ComponentGroupRef Id="tools_support_core" />
344384
<ComponentGroupRef Id="swift_driver" />
385+
<ComponentGroupRef Id="swift_syntax" />
345386

346387
<ComponentGroupRef Id="ClangResources" />
347388

0 commit comments

Comments
 (0)