@@ -640,72 +640,7 @@ python -c "import plistlib; print(str(plistlib.dumps({ 'DefaultProperties': { 'D
640640:: TODO(compnerd) match the XCTest installation name
641641python -c " import plistlib; print(str(plistlib.dumps({ 'DefaultProperties': { 'XCTEST_VERSION': 'development' } }), encoding='utf-8'))" > %PlatformRoot% \Info.plist
642642
643- :: Package toolchain.msi
644- msbuild %SourceRoot% \swift-installer-scripts\platforms\Windows\toolchain.wixproj ^
645- -p:RunWixToolsOutOfProc=true ^
646- -p:OutputPath=%PackageRoot% \toolchain\ ^
647- -p:IntermediateOutputPath=%PackageRoot% \toolchain\ ^
648- -p:DEVTOOLS_ROOT=%BuildRoot% \Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
649- -p:TOOLCHAIN_ROOT=%BuildRoot% \Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
650- :: TODO(compnerd) actually perform the code-signing
651- :: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\toolchain\toolchain.msi
652-
653- :: Package sdk.msi
654- msbuild %SourceRoot% \swift-installer-scripts\platforms\Windows\CustomActions\SwiftInstaller\SwiftInstaller.vcxproj -t:restore
655- msbuild %SourceRoot% \swift-installer-scripts\platforms\Windows\sdk.wixproj ^
656- -p:RunWixToolsOutOfProc=true ^
657- -p:OutputPath=%PackageRoot% \sdk\ ^
658- -p:IntermediateOutputPath=%PackageRoot% \sdk\ ^
659- -p:PLATFORM_ROOT=%PlatformRoot% \ ^
660- -p:SDK_ROOT=%SDKInstallRoot% \ ^
661- -p:SWIFT_SOURCE_DIR=%SourceRoot% \swift\ ^
662- -p:PlatformToolset=v142
663- :: TODO(compnerd) actually perform the code-signing
664- :: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\sdk\sdk.msi
665-
666- :: Package runtime.msi
667- msbuild %SourceRoot% \swift-installer-scripts\platforms\Windows\runtime.wixproj ^
668- -p:RunWixToolsOutOfProc=true ^
669- -p:OutputPath=%PackageRoot% \runtime\ ^
670- -p:IntermediateOutputPath=%PackageRoot% \runtime\ ^
671- -p:SDK_ROOT=%SDKInstallRoot% \
672- :: TODO(compnerd) actually perform the code-signing
673- :: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\runtime\runtime.msi
674-
675- :: Package devtools.msi
676- msbuild %SourceRoot% \swift-installer-scripts\platforms\Windows\devtools.wixproj ^
677- -p:RunWixToolsOutOfProc=true ^
678- -p:OutputPath=%PackageRoot% \devtools\ ^
679- -p:IntermediateOutputPath=%PackageRoot% \devtools\ ^
680- -p:DEVTOOLS_ROOT=%BuildRoot% \Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
681- :: TODO(compnerd) actually perform the code-signing
682- :: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\devtools\devtools.msi
683-
684- :: Collate MSIs
685- move %PackageRoot% \toolchain\toolchain.msi %PackageRoot% || (exit /b)
686- move %PackageRoot% \sdk\sdk.msi %PackageRoot% || (exit /b)
687- move %PackageRoot% \runtime\runtime.msi %PackageRoot% || (exit /b)
688- move %PackageRoot% \devtools\devtools.msi %PackageRoot% || (exit /b)
689-
690- :: Build Installer
691- msbuild %SourceRoot% \swift-installer-scripts\platforms\Windows\installer.wixproj ^
692- -p:RunWixToolsOutOfProc=true ^
693- -p:OutputPath=%PackageRoot% \installer\ ^
694- -p:IntermediateOutputPath=%PackageRoot% \installer\ ^
695- -p:MSI_LOCATION=%PackageRoot% \
696- :: TODO(compnerd) actually perform the code-signing
697- :: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\installer\installer.exe
698-
699- :: Stage Artifacts
700- md %BuildRoot% \artifacts
701- :: Redistributable libraries for developers
702- move %PackageRoot% \runtime.msi %BuildRoot% \artifacts || (exit /b)
703- :: Toolchain
704- move %PackageRoot% \toolchain.msi %BuildRoot% \artifacts || (exit /b)
705- :: SDK
706- move %PackageRoot% \sdk.msi %BuildRoot% \artifacts || (exit /b)
707- :: Installer
708- move %PackageRoot% \installer\installer.exe %BuildRoot% \artifacts || (exit /b)
643+ IF NOT " %SKIP_PACKAGING% " == " 1" call :PackageToolchain
709644
710645:: TODO(compnerd) test LLVM
711646
@@ -886,4 +821,78 @@ cmake --build %BuildRoot%\5 --target check-xctest || (exit /b)
886821goto :eof
887822endlocal
888823
824+ :PackageToolchain
825+ setlocal enableextensions enabledelayedexpansion
826+
827+ :: Package toolchain.msi
828+ msbuild %SourceRoot% \swift-installer-scripts\platforms\Windows\toolchain.wixproj ^
829+ -p:RunWixToolsOutOfProc=true ^
830+ -p:OutputPath=%PackageRoot% \toolchain\ ^
831+ -p:IntermediateOutputPath=%PackageRoot% \toolchain\ ^
832+ -p:DEVTOOLS_ROOT=%BuildRoot% \Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
833+ -p:TOOLCHAIN_ROOT=%BuildRoot% \Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
834+ :: TODO(compnerd) actually perform the code-signing
835+ :: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\toolchain\toolchain.msi
836+
837+ :: Package sdk.msi
838+ msbuild %SourceRoot% \swift-installer-scripts\platforms\Windows\CustomActions\SwiftInstaller\SwiftInstaller.vcxproj -t:restore
839+ msbuild %SourceRoot% \swift-installer-scripts\platforms\Windows\sdk.wixproj ^
840+ -p:RunWixToolsOutOfProc=true ^
841+ -p:OutputPath=%PackageRoot% \sdk\ ^
842+ -p:IntermediateOutputPath=%PackageRoot% \sdk\ ^
843+ -p:PLATFORM_ROOT=%PlatformRoot% \ ^
844+ -p:SDK_ROOT=%SDKInstallRoot% \ ^
845+ -p:SWIFT_SOURCE_DIR=%SourceRoot% \swift\ ^
846+ -p:PlatformToolset=v142
847+ :: TODO(compnerd) actually perform the code-signing
848+ :: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\sdk\sdk.msi
849+
850+ :: Package runtime.msi
851+ msbuild %SourceRoot% \swift-installer-scripts\platforms\Windows\runtime.wixproj ^
852+ -p:RunWixToolsOutOfProc=true ^
853+ -p:OutputPath=%PackageRoot% \runtime\ ^
854+ -p:IntermediateOutputPath=%PackageRoot% \runtime\ ^
855+ -p:SDK_ROOT=%SDKInstallRoot% \
856+ :: TODO(compnerd) actually perform the code-signing
857+ :: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\runtime\runtime.msi
858+
859+ :: Package devtools.msi
860+ msbuild %SourceRoot% \swift-installer-scripts\platforms\Windows\devtools.wixproj ^
861+ -p:RunWixToolsOutOfProc=true ^
862+ -p:OutputPath=%PackageRoot% \devtools\ ^
863+ -p:IntermediateOutputPath=%PackageRoot% \devtools\ ^
864+ -p:DEVTOOLS_ROOT=%BuildRoot% \Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
865+ :: TODO(compnerd) actually perform the code-signing
866+ :: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\devtools\devtools.msi
867+
868+ :: Collate MSIs
869+ move %PackageRoot% \toolchain\toolchain.msi %PackageRoot% || (exit /b)
870+ move %PackageRoot% \sdk\sdk.msi %PackageRoot% || (exit /b)
871+ move %PackageRoot% \runtime\runtime.msi %PackageRoot% || (exit /b)
872+ move %PackageRoot% \devtools\devtools.msi %PackageRoot% || (exit /b)
873+
874+ :: Build Installer
875+ msbuild %SourceRoot% \swift-installer-scripts\platforms\Windows\installer.wixproj ^
876+ -p:RunWixToolsOutOfProc=true ^
877+ -p:OutputPath=%PackageRoot% \installer\ ^
878+ -p:IntermediateOutputPath=%PackageRoot% \installer\ ^
879+ -p:MSI_LOCATION=%PackageRoot% \
880+ :: TODO(compnerd) actually perform the code-signing
881+ :: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\installer\installer.exe
882+
883+ :: Stage Artifacts
884+ md %BuildRoot% \artifacts
885+
886+ :: Redistributable libraries for developers
887+ move %PackageRoot% \runtime.msi %BuildRoot% \artifacts || (exit /b)
888+ :: Toolchain
889+ move %PackageRoot% \toolchain.msi %BuildRoot% \artifacts || (exit /b)
890+ :: SDK
891+ move %PackageRoot% \sdk.msi %BuildRoot% \artifacts || (exit /b)
892+ :: Installer
893+ move %PackageRoot% \installer\installer.exe %BuildRoot% \artifacts || (exit /b)
894+
895+ goto :eof
896+ endlocal
897+
889898:end
0 commit comments