Skip to content

Commit dbcc472

Browse files
committed
build: adjust the paths for the runtime MSI packaging rules
This is the build rules update to match swiftlang/swift-installer-scripts#224.
1 parent 9e21bd5 commit dbcc472

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

utils/build-windows-toolchain.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -978,11 +978,11 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\sdk\sdk.wixproj ^
978978
:: TODO(compnerd) actually perform the code-signing
979979
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\sdk\sdk.msi
980980

981-
:: Package runtime.msi
982-
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\runtimemsi\runtimemsi.wixproj ^
981+
:: Package rtl.msi
982+
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\rtl\msi\rtlmsi.wixproj ^
983983
-restore ^
984984
-p:Configuration=Release ^
985-
-p:BaseOutputPath=%PackageRoot%\runtime\ ^
985+
-p:BaseOutputPath=%PackageRoot%\rtl\ ^
986986
-p:SDK_ROOT=%SDKInstallRoot%\
987987
:: TODO(compnerd) actually perform the code-signing
988988
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\runtime\runtime.msi
@@ -993,7 +993,7 @@ move %PackageRoot%\cli\Release\amd64\cli.msi %PackageRoot% || (exit /b)
993993
move %PackageRoot%\dbg\Release\amd64\dbg.msi %PackageRoot% || (exit /b)
994994
move %PackageRoot%\ide\Release\amd64\ide.msi %PackageRoot% || (exit /b)
995995
move %PackageRoot%\sdk\Release\amd64\sdk.msi %PackageRoot% || (exit /b)
996-
move %PackageRoot%\runtime\Release\amd64\runtime.msi %PackageRoot% || (exit /b)
996+
move %PackageRoot%\rtl\Release\amd64\rtl.msi %PackageRoot% || (exit /b)
997997

998998
:: Build Installer
999999
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.wixproj ^

0 commit comments

Comments
 (0)