Skip to content

Commit 98a9819

Browse files
compnerdcompnerd
committed
WiX: package up macro support libraries
Add the swift syntax runtime libraries and swiftmodules to enable macros on Windows.
1 parent 097a839 commit 98a9819

File tree

1 file changed

+139
-1
lines changed

1 file changed

+139
-1
lines changed

‎platforms/Windows/bld/bld.wxs

Lines changed: 139 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2+
3+
<?if $(ProductArchitecture) = "amd64"?>
4+
<?define ArchArchDir = "x86_64"?>
5+
<?define ArchTriple = "x86_64-unknown-windows-msvc"?>
6+
<?elseif $(ProductArchitecture) = "arm64"?>
7+
<?define ArchArchDir = "aarch64"?>
8+
<?define ArchTriple = "aarch64-unknown-windows-msvc"?>
9+
<?endif?>
10+
211
<Package
312
Language="1033"
413
Manufacturer="!(loc.ManufacturerName)"
@@ -17,8 +26,24 @@
1726
</DirectoryRef>
1827

1928
<DirectoryRef Id="_usr_lib_swift">
20-
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx" />
29+
<Directory Id="_usr_lib_swift_build" Name="build">
30+
<Directory Id="SwiftBasicFormat.swiftmodule" Name="SwiftBasicFormat.swiftmodule" />
31+
<Directory Id="SwiftCompilerPluginMessageHandling.swiftmodule" Name="SwiftCompilerPluginMessageHandling.swiftmodule" />
32+
<Directory Id="SwiftDiagnostics.swiftmodule" Name="SwiftDiagnostics.swiftmodule" />
33+
<Directory Id="SwiftIDEUtils.swiftmodule" Name="SwiftIDEUtils.swiftmodule" />
34+
<Directory Id="SwiftOperators.swiftmodule" Name="SwiftOperators.swiftmodule" />
35+
<Directory Id="SwiftParser.swiftmodule" Name="SwiftParser.swiftmodule" />
36+
<Directory Id="SwiftParserDiagnostics.swiftmodule" Name="SwiftParserDiagnostics.swiftmodule" />
37+
<Directory Id="SwiftSyntax.swiftmodule" Name="SwiftSyntax.swiftmodule" />
38+
<Directory Id="SwiftSyntaxBuilder.swiftmodule" Name="SwiftSyntaxBuilder.swiftmodule" />
39+
<Directory Id="SwiftSyntaxMacros.swiftmodule" Name="SwiftSyntaxMacros.swiftmodule" />
40+
<Directory Id="SwiftSyntaxMacroExpansion.swiftmodule" Name="SwiftSyntaxMacroExpansion.swiftmodule" />
41+
</Directory>
2142
<Directory Id="_usr_lib_swift_migrator" Name="migrator" />
43+
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx" />
44+
<Directory Id="_usr_lib_swift_Windows" Name="Windows">
45+
<Directory Id="_usr_lib_swift_Windows_ARCH" Name="$(ArchArchDir)" />
46+
</Directory>
2247
</DirectoryRef>
2348

2449
<DirectoryRef Id="_usr">
@@ -325,6 +350,118 @@
325350
</Component>
326351
</ComponentGroup>
327352

353+
<ComponentGroup Id="swift_syntax">
354+
<Component Directory="_usr_bin">
355+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftBasicFormat.dll" />
356+
</Component>
357+
<Component Directory="_usr_lib_swift_Windows_ARCH">
358+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftBasicFormat.lib" />
359+
</Component>
360+
<Component Directory="SwiftBasicFormat.swiftmodule">
361+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftBasicFormat.swiftmodule\$(ArchTriple).swiftinterface" />
362+
</Component>
363+
364+
<Component Directory="_usr_bin">
365+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftCompilerPluginMessageHandling.dll" />
366+
</Component>
367+
<Component Directory="_usr_lib_swift_Windows_ARCH">
368+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftCompilerPluginMessageHandling.lib" />
369+
</Component>
370+
<Component Directory="SwiftCompilerPluginMessageHandling.swiftmodule">
371+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftCompilerPluginMessageHandling.swiftmodule\$(ArchTriple).swiftinterface" />
372+
</Component>
373+
374+
<Component Directory="_usr_bin">
375+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDiagnostics.dll" />
376+
</Component>
377+
<Component Directory="_usr_lib_swift_Windows_ARCH">
378+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftDiagnostics.lib" />
379+
</Component>
380+
<Component Directory="SwiftDiagnostics.swiftmodule">
381+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftDiagnostics.swiftmodule\$(ArchTriple).swiftinterface" />
382+
</Component>
383+
384+
<Component Directory="_usr_bin">
385+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftIDEUtils.dll" />
386+
</Component>
387+
<Component Directory="_usr_lib_swift_Windows_ARCH">
388+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftIDEUtils.lib" />
389+
</Component>
390+
<Component Directory="SwiftIDEUtils.swiftmodule">
391+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftIDEUtils.swiftmodule\$(ArchTriple).swiftinterface" />
392+
</Component>
393+
394+
<Component Directory="_usr_bin">
395+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftOperators.dll" />
396+
</Component>
397+
<Component Directory="_usr_lib_swift_Windows_ARCH">
398+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftOperators.lib" />
399+
</Component>
400+
<Component Directory="SwiftOperators.swiftmodule">
401+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftOperators.swiftmodule\$(ArchTriple).swiftinterface" />
402+
</Component>
403+
404+
<Component Directory="_usr_bin">
405+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftParser.dll" />
406+
</Component>
407+
<Component Directory="_usr_lib_swift_Windows_ARCH">
408+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftParser.lib" />
409+
</Component>
410+
<Component Directory="SwiftParser.swiftmodule">
411+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftParser.swiftmodule\$(ArchTriple).swiftinterface" />
412+
</Component>
413+
414+
<Component Directory="_usr_bin">
415+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftParserDiagnostics.dll" />
416+
</Component>
417+
<Component Directory="_usr_lib_swift_Windows_ARCH">
418+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftParserDiagnostics.lib" />
419+
</Component>
420+
<Component Directory="SwiftParserDiagnostics.swiftmodule">
421+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftParserDiagnostics.swiftmodule\$(ArchTriple).swiftinterface" />
422+
</Component>
423+
424+
<Component Directory="_usr_bin">
425+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntax.dll" />
426+
</Component>
427+
<Component Directory="_usr_lib_swift_Windows_ARCH">
428+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntax.lib" />
429+
</Component>
430+
<Component Directory="SwiftSyntax.swiftmodule">
431+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntax.swiftmodule\$(ArchTriple).swiftinterface" />
432+
</Component>
433+
434+
<Component Directory="_usr_bin">
435+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxBuilder.dll" />
436+
</Component>
437+
<Component Directory="_usr_lib_swift_Windows_ARCH">
438+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntaxBuilder.lib" />
439+
</Component>
440+
<Component Directory="SwiftSyntaxBuilder.swiftmodule">
441+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntaxBuilder.swiftmodule\$(ArchTriple).swiftinterface" />
442+
</Component>
443+
444+
<Component Directory="_usr_bin">
445+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacroExpansion.dll" />
446+
</Component>
447+
<Component Directory="_usr_lib_swift_Windows_ARCH">
448+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntaxMacroExpansion.lib" />
449+
</Component>
450+
<Component Directory="SwiftSyntaxMacroExpansion.swiftmodule">
451+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntaxMacroExpansion.swiftmodule\$(ArchTriple).swiftinterface" />
452+
</Component>
453+
454+
<Component Directory="_usr_bin">
455+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacros.dll" />
456+
</Component>
457+
<Component Directory="_usr_lib_swift_Windows_ARCH">
458+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntaxMacros.lib" />
459+
</Component>
460+
<Component Directory="SwiftSyntaxMacros.swiftmodule">
461+
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntaxMacros.swiftmodule\$(ArchTriple).swiftinterface" />
462+
</Component>
463+
</ComponentGroup>
464+
328465
<ComponentGroup Id="EnvironmentVariables">
329466
<Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="_usr_bin" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
330467
<Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[_usr_bin]" />
@@ -342,6 +479,7 @@
342479
<ComponentGroupRef Id="argument_parser" />
343480
<ComponentGroupRef Id="tools_support_core" />
344481
<ComponentGroupRef Id="swift_driver" />
482+
<ComponentGroupRef Id="swift_syntax" />
345483

346484
<ComponentGroupRef Id="ClangResources" />
347485

0 commit comments

Comments
 (0)