Skip to content

Commit 737bbd4

Browse files
committed
Adjust the packaging rules to remove the shared library to support migrating to static library forms for this. This should avoid the need to adjust the path when executing the compiled manifest.
1 parent fdf2acb commit 737bbd4

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

platforms/Windows/cli/cli.wxs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@
134134

135135
<ComponentGroup Id="CompilerPluginSupport" Directory="_usr_lib_swift_pm_ManifestAPI">
136136
<Component>
137-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" />
138-
</Component>
139-
<Component>
137+
<!-- TODO(compnerd) use a lib prefix -->
140138
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" />
141139
</Component>
142140
<Component>
@@ -149,9 +147,7 @@
149147

150148
<ComponentGroup Id="PackageDescription" Directory="_usr_lib_swift_pm_ManifestAPI">
151149
<Component>
152-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" />
153-
</Component>
154-
<Component>
150+
<!-- TODO(compnerd) use a lib prefix -->
155151
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" />
156152
</Component>
157153
<Component>
@@ -164,9 +160,7 @@
164160

165161
<ComponentGroup Id="PackagePlugin" Directory="_usr_lib_swift_pm_PluginAPI">
166162
<Component>
167-
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" />
168-
</Component>
169-
<Component>
163+
<!-- TODO(compnerd) use a lib prefix -->
170164
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" />
171165
</Component>
172166
<Component>

0 commit comments

Comments
 (0)