Skip to content

Commit 0ba2fa0

Browse files
committed
build: update build rules for CustomAction removal
With #63887, the swift compiler can dynamically inject the VFS overlay paths to add the modulemaps and apinotes for the Windows SDK. This obviates the need for the custom action in the SDK installation. Update the build rules to account for this along with swiftlang/swift-installer-scripts#176.
1 parent 342e5f6 commit 0ba2fa0

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

utils/build-windows-toolchain.bat

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -933,15 +933,13 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\toolchain.wixproj
933933
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\toolchain\toolchain.msi
934934

935935
:: Package sdk.msi
936-
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\CustomActions\SwiftInstaller\SwiftInstaller.vcxproj -t:restore
937936
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\sdk.wixproj ^
938937
-p:RunWixToolsOutOfProc=true ^
939938
-p:OutputPath=%PackageRoot%\sdk\ ^
940939
-p:IntermediateOutputPath=%PackageRoot%\sdk\ ^
941940
-p:PLATFORM_ROOT=%PlatformRoot%\ ^
942941
-p:SDK_ROOT=%SDKInstallRoot%\ ^
943-
-p:SWIFT_SOURCE_DIR=%SourceRoot%\swift\ ^
944-
-p:PlatformToolset=v142
942+
-p:SWIFT_SOURCE_DIR=%SourceRoot%\swift\
945943
:: TODO(compnerd) actually perform the code-signing
946944
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\sdk\sdk.msi
947945

0 commit comments

Comments
 (0)