Skip to content

Commit 5f97b8d

Browse files
bnbarhambnbarham
authored
Merge pull request #246 from compnerd/59-syntax
WiX: package up swift syntax for macro support
2 parents 339eee7 + 45ff614 commit 5f97b8d

File tree

2 files changed

+74
-0
lines changed

2 files changed

+74
-0
lines changed

‎platforms/Windows/toolchain-amd64.wxs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,42 @@
773773
</ComponentGroup>
774774
<?endif?>
775775

776+
<ComponentGroup Id="SwiftSyntax">
777+
<Component Id="SwiftBasicFormat.dll" Directory="_usr_bin" Guid="4b216675-c486-4a45-bb3d-18fefe6eb3ca">
778+
<File Id="SwiftBasicFormat.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftBasicFormat.dll" Checksum="yes" />
779+
</Component>
780+
<Component Id="SwiftCompilerPluginMessageHandling.dll" Directory="_usr_bin" Guid="d70e529b-d848-4c90-97b3-dfe1138a9375">
781+
<File Id="SwiftCompilerPluginMessageHandling.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftCompilerPluginMessageHandling.dll" Checksum="yes" />
782+
</Component>
783+
<Component Id="SwiftDiagnostics.dll" Directory="_usr_bin" Guid="7a22d954-714c-49f2-bd21-62b675aad2b1">
784+
<File Id="SwiftDiagnostics.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftDiagnostics.dll" Checksum="yes" />
785+
</Component>
786+
<Component Id="SwiftIDEUtils.dll" Directory="_usr_bin" Guid="688d421f-a1f2-43df-8aaf-c4bc53ebcf1e">
787+
<File Id="SwiftIDEUtils.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftIDEUtils.dll" Checksum="yes" />
788+
</Component>
789+
<Component Id="SwiftOperators.dll" Directory="_usr_bin" Guid="07895d1d-04f9-4529-b0fe-1398f8aaf547">
790+
<File Id="SwiftOperators.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftOperators.dll" Checksum="yes" />
791+
</Component>
792+
<Component Id="SwiftParser.dll" Directory="_usr_bin" Guid="13631ec9-d58b-4789-84e0-a3656e00e5bc">
793+
<File Id="SwiftParser.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftParser.dll" Checksum="yes" />
794+
</Component>
795+
<Component Id="SwiftParserDiagnostics.dll" Directory="_usr_bin" Guid="fa016c89-7721-43a7-b275-18b0740db960">
796+
<File Id="SwiftParserDiagnostics.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftParserDiagnostics.dll" Checksum="yes" />
797+
</Component>
798+
<Component Id="SwiftSyntax.dll" Directory="_usr_bin" Guid="e9388ab6-474e-41eb-aee7-39217c7d67d3">
799+
<File Id="SwiftSyntax.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftSyntax.dll" Checksum="yes" />
800+
</Component>
801+
<Component Id="SwiftSyntaxBuilder.dll" Directory="_usr_bin" Guid="6fdadcbc-f4d1-4346-b06c-f9a1b744549c">
802+
<File Id="SwiftSyntaxBuilder.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxBuilder.dll" Checksum="yes" />
803+
</Component>
804+
<Component Id="SwiftSyntaxMacroExpansion.dll" Directory="_usr_bin" Guid="21f83156-dc93-4ece-bbdd-6642d29be1a0">
805+
<File Id="SwiftSyntaxMacroExpansion.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacroExpansion.dll" Checksum="yes" />
806+
</Component>
807+
<Component Id="SwiftSyntaxMacros.dll" Directory="_usr_bin" Guid="deeb1409-a58f-4ae7-a477-3032fd5bb4e0">
808+
<File Id="SwiftSyntaxMacros.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacros.dll" Checksum="yes" />
809+
</Component>
810+
</ComponentGroup>
811+
776812
<Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="d01ea5b8-0f8a-4388-9b61-1186efddfc39">
777813
<Environment Id="DeveloperDir" Action="set" Name="DEVELOPER_DIR" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer" />
778814
<Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin" />
@@ -791,6 +827,7 @@
791827
<ComponentGroupRef Id="SwiftArgumentParser" />
792828
<ComponentGroupRef Id="SwiftToolsSupportCore" />
793829
<ComponentGroupRef Id="SwiftDriver" />
830+
<ComponentGroupRef Id="SwiftSyntax" />
794831

795832
<ComponentGroupRef Id="ClangResources" />
796833
<!--

‎platforms/Windows/toolchain-arm64.wxs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,42 @@
773773
</ComponentGroup>
774774
<?endif?>
775775

776+
<ComponentGroup Id="SwiftSyntax">
777+
<Component Id="SwiftBasicFormat.dll" Directory="_usr_bin" Guid="db724de5-3471-43eb-9ea4-e831e73cdd4d">
778+
<File Id="SwiftBasicFormat.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftBasicFormat.dll" Checksum="yes" />
779+
</Component>
780+
<Component Id="SwiftCompilerPluginMessageHandling.dll" Directory="_usr_bin" Guid="849a5f28-c7a9-4eb9-8db9-4a47eb3c6cbf">
781+
<File Id="SwiftCompilerPluginMessageHandling.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftCompilerPluginMessageHandling.dll" Checksum="yes" />
782+
</Component>
783+
<Component Id="SwiftDiagnostics.dll" Directory="_usr_bin" Guid="7cf0d11e-48ab-4860-8ad0-1963996407e3">
784+
<File Id="SwiftDiagnostics.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftDiagnostics.dll" Checksum="yes" />
785+
</Component>
786+
<Component Id="SwiftIDEUtils.dll" Directory="_usr_bin" Guid="23dd3d8a-5332-439d-8c27-da6a6b176701">
787+
<File Id="SwiftIDEUtils.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftIDEUtils.dll" Checksum="yes" />
788+
</Component>
789+
<Component Id="SwiftOperators.dll" Directory="_usr_bin" Guid="b69d4cd7-e924-4174-b976-f655ec40bfbc">
790+
<File Id="SwiftOperators.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftOperators.dll" Checksum="yes" />
791+
</Component>
792+
<Component Id="SwiftParser.dll" Directory="_usr_bin" Guid="06a396b7-4939-427f-9331-676bde818c2e">
793+
<File Id="SwiftParser.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftParser.dll" Checksum="yes" />
794+
</Component>
795+
<Component Id="SwiftParserDiagnostics.dll" Directory="_usr_bin" Guid="ae9de1a5-d5fb-4624-9d6c-cbb81fddd3e2">
796+
<File Id="SwiftParserDiagnostics.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftParserDiagnostics.dll" Checksum="yes" />
797+
</Component>
798+
<Component Id="SwiftSyntax.dll" Directory="_usr_bin" Guid="969ea6d3-3ce7-4c88-94e6-eb3a22862a00">
799+
<File Id="SwiftSyntax.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftSyntax.dll" Checksum="yes" />
800+
</Component>
801+
<Component Id="SwiftSyntaxBuilder.dll" Directory="_usr_bin" Guid="7b8c8763-9e5a-4569-a2df-683142511476">
802+
<File Id="SwiftSyntaxBuilder.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxBuilder.dll" Checksum="yes" />
803+
</Component>
804+
<Component Id="SwiftSyntaxMacroExpansion.dll" Directory="_usr_bin" Guid="293dbd87-21ec-4083-bd3c-418f15e077ae">
805+
<File Id="SwiftSyntaxMacroExpansion.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacroExpansion.dll" Checksum="yes" />
806+
</Component>
807+
<Component Id="SwiftSyntaxMacros.dll" Directory="_usr_bin" Guid="a9ea7be1-3163-40ce-ae4c-14975b93f73f">
808+
<File Id="SwiftSyntaxMacros.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacros.dll" Checksum="yes" />
809+
</Component>
810+
</ComponentGroup>
811+
776812
<Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="d01ea5b8-0f8a-4388-9b61-1186efddfc39">
777813
<Environment Id="DeveloperDir" Action="set" Name="DEVELOPER_DIR" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer" />
778814
<Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin" />
@@ -791,6 +827,7 @@
791827
<ComponentGroupRef Id="SwiftArgumentParser" />
792828
<ComponentGroupRef Id="SwiftToolsSupportCore" />
793829
<ComponentGroupRef Id="SwiftDriver" />
830+
<ComponentGroupRef Id="SwiftSyntax" />
794831

795832
<ComponentGroupRef Id="ClangResources" />
796833
<!--

0 commit comments

Comments
 (0)