Skip to content

Commit 2f07371

Browse files
compnerdcompnerd
committed
build: update build rules for new MSI set
This corresponds to swiftlang/swift-installer-scripts#207 which restructures the MSIs and enables a number of new features. It switches us to: - durable GUIDs which will enable upgrades - enables dual-purpose MSIs - switches the installer to per-user installs - should drop the requirement on Administrator rights - splits the MSIs into smaller chunks to provide a nicer installer experience - reduces the complexity in the management of the manifest
1 parent 2e484a1 commit 2f07371

File tree

1 file changed

+67
-28
lines changed

1 file changed

+67
-28
lines changed

‎utils/build-windows-toolchain.bat‎

Lines changed: 67 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -928,23 +928,61 @@ endlocal
928928
:PackageToolchain
929929
setlocal enableextensions enabledelayedexpansion
930930

931-
:: Package toolchain.msi
932-
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\toolchain.wixproj ^
931+
:: Package bld.msi
932+
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bld.wixproj ^
933933
-restore ^
934+
-p:Configuration=Release ^
935+
-p:IntermediateOutputPath=%PackageRoot%\bld\ ^
936+
-p:OutputPath=%PackageRoot%\bld\ ^
934937
-p:RunWixToolsOutOfProc=true ^
935-
-p:OutputPath=%PackageRoot%\toolchain\ ^
936-
-p:IntermediateOutputPath=%PackageRoot%\toolchain\ ^
937938
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
938939
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
939940
:: TODO(compnerd) actually perform the code-signing
940-
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\toolchain\toolchain.msi
941+
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\bld\bld.msi
942+
943+
:: Package cli.msi
944+
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\cli.wixproj ^
945+
-restore ^
946+
-p:Configuration=Release ^
947+
-p:IntermediateOutputPath=%PackageRoot%\cli\ ^
948+
-p:OutputPath=%PackageRoot%\cli\ ^
949+
-p:RunWixToolsOutOfProc=true ^
950+
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
951+
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
952+
:: TODO(compnerd) actually perform the code-signing
953+
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\cli\cli.msi
954+
955+
:: Package dbg.msi
956+
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\dbg.wixproj ^
957+
-restore ^
958+
-p:Configuration=Release ^
959+
-p:IntermediateOutputPath=%PackageRoot%\dbg\ ^
960+
-p:OutputPath=%PackageRoot%\dbg\ ^
961+
-p:RunWixToolsOutOfProc=true ^
962+
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
963+
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
964+
:: TODO(compnerd) actually perform the code-signing
965+
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\dbg\dbg.msi
966+
967+
:: Package ide.msi
968+
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\ide.wixproj ^
969+
-restore ^
970+
-p:Configuration=Release ^
971+
-p:IntermediateOutputPath=%PackageRoot%\ide\ ^
972+
-p:OutputPath=%PackageRoot%\ide\ ^
973+
-p:RunWixToolsOutOfProc=true ^
974+
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
975+
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
976+
:: TODO(compnerd) actually perform the code-signing
977+
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\ide\ide.msi
941978

942979
:: Package sdk.msi
943980
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\sdk.wixproj ^
944981
-restore ^
945-
-p:RunWixToolsOutOfProc=true ^
946-
-p:OutputPath=%PackageRoot%\sdk\ ^
982+
-p:Configuration=Release ^
947983
-p:IntermediateOutputPath=%PackageRoot%\sdk\ ^
984+
-p:OutputPath=%PackageRoot%\sdk\ ^
985+
-p:RunWixToolsOutOfProc=true ^
948986
-p:PLATFORM_ROOT=%PlatformRoot%\ ^
949987
-p:SDK_ROOT=%SDKInstallRoot%\
950988
:: TODO(compnerd) actually perform the code-signing
@@ -953,35 +991,29 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\sdk.wixproj ^
953991
:: Package runtime.msi
954992
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\runtime.wixproj ^
955993
-restore ^
956-
-p:RunWixToolsOutOfProc=true ^
957-
-p:OutputPath=%PackageRoot%\runtime\ ^
994+
-p:Configuration=Release ^
958995
-p:IntermediateOutputPath=%PackageRoot%\runtime\ ^
996+
-p:OutputPath=%PackageRoot%\runtime\ ^
997+
-p:RunWixToolsOutOfProc=true ^
959998
-p:SDK_ROOT=%SDKInstallRoot%\
960999
:: TODO(compnerd) actually perform the code-signing
9611000
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\runtime\runtime.msi
9621001

963-
:: Package devtools.msi
964-
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\devtools.wixproj ^
965-
-restore ^
966-
-p:RunWixToolsOutOfProc=true ^
967-
-p:OutputPath=%PackageRoot%\devtools\ ^
968-
-p:IntermediateOutputPath=%PackageRoot%\devtools\ ^
969-
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
970-
:: TODO(compnerd) actually perform the code-signing
971-
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\devtools\devtools.msi
972-
9731002
:: Collate MSIs
974-
move %PackageRoot%\toolchain\toolchain.msi %PackageRoot% || (exit /b)
1003+
move %PackageRoot%\bld\bld.msi %PackageRoot% || (exit /b)
1004+
move %PackageRoot%\cli\cli.msi %PackageRoot% || (exit /b)
1005+
move %PackageRoot%\dbg\dbg.msi %PackageRoot% || (exit /b)
1006+
move %PackageRoot%\ide\ide.msi %PackageRoot% || (exit /b)
9751007
move %PackageRoot%\sdk\sdk.msi %PackageRoot% || (exit /b)
9761008
move %PackageRoot%\runtime\runtime.msi %PackageRoot% || (exit /b)
977-
move %PackageRoot%\devtools\devtools.msi %PackageRoot% || (exit /b)
9781009

9791010
:: Build Installer
9801011
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\installer.wixproj ^
9811012
-restore ^
982-
-p:RunWixToolsOutOfProc=true ^
983-
-p:OutputPath=%PackageRoot%\installer\ ^
1013+
-p:Configuration=Release ^
9841014
-p:IntermediateOutputPath=%PackageRoot%\installer\ ^
1015+
-p:OutputPath=%PackageRoot%\installer\ ^
1016+
-p:RunWixToolsOutOfProc=true ^
9851017
-p:MSI_LOCATION=%PackageRoot%\
9861018
:: TODO(compnerd) actually perform the code-signing
9871019
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\installer\installer.exe
@@ -990,12 +1022,19 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\installer.wixproj
9901022
md %BuildRoot%\artifacts
9911023

9921024
:: Redistributable libraries for developers
993-
move %PackageRoot%\runtime.msi %BuildRoot%\artifacts || (exit /b)
994-
:: Toolchain
995-
move %PackageRoot%\toolchain.msi %BuildRoot%\artifacts || (exit /b)
996-
:: SDK
1025+
:: bld
1026+
move %PackageRoot%\bld.msi %BuildRoot%\artifacts || (exit /b)
1027+
:: cli
1028+
move %PackageRoot%\cli.msi %BuildRoot%\artifacts || (exit /b)
1029+
:: dbg
1030+
move %PackageRoot%\dbg.msi %BuildRoot%\artifacts || (exit /b)
1031+
:: ide
1032+
move %PackageRoot%\ide.msi %BuildRoot%\artifacts || (exit /b)
1033+
:: sdk
9971034
move %PackageRoot%\sdk.msi %BuildRoot%\artifacts || (exit /b)
998-
:: Installer
1035+
:: runtime
1036+
move %PackageRoot%\runtime.msi %BuildRoot%\artifacts || (exit /b)
1037+
:: installer
9991038
move %PackageRoot%\installer\installer.exe %BuildRoot%\artifacts || (exit /b)
10001039

10011040
goto :eof

0 commit comments

Comments
 (0)