Skip to content

Commit 14d7588

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 14d7588

File tree

1 file changed

+105
-0
lines changed

1 file changed

+105
-0
lines changed

‎platforms/Windows/bld/bld.wxs

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,22 @@
1717
</DirectoryRef>
1818

1919
<DirectoryRef Id="_usr_lib_swift">
20+
<Directory Id="_usr_lib_swift_build" Name="build">
21+
<Directory Id="SwiftBasicFormat.swiftmodule" Name="SwiftBasicFormat.swiftmodule" />
22+
<Directory Id="SwiftCompilerPlugin.swiftmodule" Name="SwiftCompilerPlugin.swiftmodule" />
23+
<Directory Id="SwiftCompilerPluginHandling.swiftmodule" Name="SwiftCompilerPluginHandling.swiftmodule" />
24+
<Directory Id="SwiftDiagnostics.swiftmodule" Name="SwiftDiagnostics.swiftmodule" />
25+
<Directory Id="SwiftIDEUtils.swiftmodule" Name="SwiftIDEUtils.swiftmodule" />
26+
<Directory Id="SwiftOperators.swiftmodule" Name="SwiftOperators.swiftmodule" />
27+
<Directory Id="SwiftParser.swiftmodule" Name="SwiftParser.swiftmodule" />
28+
<Directory Id="SwiftParserDiagnostics.swiftmodule" Name="SwiftParserDiagnostics.swiftmodule" />
29+
<Directory Id="SwiftRefactor.swiftmodule" Name="SwiftRefactor.swiftmodule" />
30+
<Directory Id="SwiftSyntax.swiftmodule" Name="SwiftSyntax.swiftmodule" />
31+
<Directory Id="SwiftSyntaxBuilder.swiftmodule" Name="SwiftSyntaxBuilder.swiftmodule" />
32+
<Directory Id="SwiftSyntaxMacros.swiftmodule" Name="SwiftSyntaxMacros.swiftmodule" />
33+
<Directory Id="SwiftSyntaxMacroExpansion.swiftmodule" Name="SwiftSyntaxMacroExpansion.swiftmodule" />
34+
<Directory Id="SwiftSyntaxMacrosTestSupport.swiftmodule" Name="SwiftSyntaxMacrosTestSupport.swiftmodule" />
35+
</Directory>
2036
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx" />
2137
<Directory Id="_usr_lib_swift_migrator" Name="migrator" />
2238
</DirectoryRef>
@@ -325,6 +341,94 @@
325341
</Component>
326342
</ComponentGroup>
327343

344+
<ComponentGroup Id="swift_syntax" Directory="_usr_bin">
345+
<Component>
346+
<File Name="SwiftBasicFormat.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftBasicFormat.dll" />
347+
</Component>
348+
<Component>
349+
<File Name="SwiftCompilerPlugin.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftCompilerPlugin.dll" />
350+
</Component>
351+
<Component>
352+
<File Name="SwiftCompilerPluginMessageHandling.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftCompilerPluginMessageHandling.dll" />
353+
</Component>
354+
<Component>
355+
<File Name="SwiftDiagnostics.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDiagnostics.dll" />
356+
</Component>
357+
<Component>
358+
<File Name="SwiftIDEUtils.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftIDEUtils.dll" />
359+
</Component>
360+
<Component>
361+
<File Name="SwiftOperators.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftOperators.dll" />
362+
</Component>
363+
<Component>
364+
<File Name="SwiftParser.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftParser.dll" />
365+
</Component>
366+
<Component>
367+
<File Name="SwiftParserDiagnostics.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftParserDiagnostics.dll" />
368+
</Component>
369+
<Component>
370+
<File Name="SwiftRefactor.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftRefactor.dll" />
371+
</Component>
372+
<Component>
373+
<File Name="SwiftSyntax.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntax.dll" />
374+
</Component>
375+
<Component>
376+
<File Name="SwiftSyntaxBuilder.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxBuilder.dll" />
377+
</Component>
378+
<Component>
379+
<File Name="SwiftSyntaxMacros.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacros.dll" />
380+
</Component>
381+
<Component>
382+
<File Name="SwiftSyntaxMacroExpansion.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacroExpansion.dll" />
383+
</Component>
384+
<Component>
385+
<File Name="SwiftSyntaxMacrosTestSupport.dll" Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacrosTestSupport.dll" />
386+
</Component>
387+
388+
<Component Directory="SwiftBasicFormat.swiftmodule">
389+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftBasicFormat.swiftmodule\$(ArchTriple).swiftinterface" />
390+
</Component>
391+
<Component Directory="SwiftCompilerPlugin.swiftmodule">
392+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftCompilerPlugin.swiftmodule\$(ArchTriple).swiftinterface" />
393+
</Component>
394+
<Component Directory="SwiftCompilerPluginHandling.swiftmodule">
395+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftCompilerPluginHandling.swiftmodule\$(ArchTriple).swiftinterface" />
396+
</Component>
397+
<Component Directory="SwiftDiagnostics.swiftmodule">
398+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftDiagnostics.swiftmodule\$(ArchTriple).swiftinterface" />
399+
</Component>
400+
<Component Directory="SwiftIDEUtils.swiftmodule">
401+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftIDEUtils.swiftmodule\$(ArchTriple).swiftinterface" />
402+
</Component>
403+
<Component Directory="SwiftOperators.swiftmodule">
404+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftOperators.swiftmodule\$(ArchTriple).swiftinterface" />
405+
</Component>
406+
<Component Directory="SwiftParser.swiftmodule">
407+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftParser.swiftmodule\$(ArchTriple).swiftinterface" />
408+
</Component>
409+
<Component Directory="SwiftParserDiagnostics.swiftmodule">
410+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftParserDiagnostics.swiftmodule\$(ArchTriple).swiftinterface" />
411+
</Component>
412+
<Component Directory="SwiftRefactor.swiftmodule">
413+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftRefactor.swiftmodule\$(ArchTriple).swiftinterface" />
414+
</Component>
415+
<Component Directory="SwiftSyntax.swiftmodule">
416+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntax.swiftmodule\$(ArchTriple).swiftinterface" />
417+
</Component>
418+
<Component Directory="SwiftSyntaxBuilder.swiftmodule">
419+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntaxBuilder.swiftmodule\$(ArchTriple).swiftinterface" />
420+
</Component>
421+
<Component Directory="SwiftSyntaxMacros.swiftmodule">
422+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntaxMacros.swiftmodule\$(ArchTriple).swiftinterface" />
423+
</Component>
424+
<Component Directory="SwiftSyntaxMacroExpansion.swiftmodule">
425+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntaxMacroExpansion.swiftmodule\$(ArchTriple).swiftinterface" />
426+
</Component>
427+
<Component Directory="SwiftSyntaxMacrosTestSupport.swiftmodule">
428+
<File Name="$(TOOLCHAIN_ROOT)\usr\lib\swift\host\SwiftSyntaxMacrosTestSupport.swiftmodule\$(ArchTriple).swiftinterface" />
429+
</Component>
430+
</Component>
431+
328432
<ComponentGroup Id="EnvironmentVariables">
329433
<Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="_usr_bin" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
330434
<Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[_usr_bin]" />
@@ -342,6 +446,7 @@
342446
<ComponentGroupRef Id="argument_parser" />
343447
<ComponentGroupRef Id="tools_support_core" />
344448
<ComponentGroupRef Id="swift_driver" />
449+
<ComponentGroupRef Id="swift_syntax" />
345450

346451
<ComponentGroupRef Id="ClangResources" />
347452

0 commit comments

Comments
 (0)