Skip to content

Update path to runtime msi wixproj in the Windows build #67654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
compnerd merged 3 commits into from
Aug 5, 2023
Merged

Update path to runtime msi wixproj in the Windows build #67654

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
804ec3c
Update path to runtime msi wixproj in the Windows build
tristanlabelle Aug 1, 2023
fc987cd
Refactor wix output paths
tristanlabelle Aug 2, 2023
2e09edf
Fixed line endings?
tristanlabelle Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 15 additions & 29 deletions utils/build-windows-toolchain.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,9 +932,7 @@ setlocal enableextensions enabledelayedexpansion
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bld\bld.wixproj ^
-restore ^
-p:Configuration=Release ^
-p:IntermediateOutputPath=%PackageRoot%\bld\ ^
-p:OutputPath=%PackageRoot%\bld\ ^
-p:RunWixToolsOutOfProc=true ^
-p:BaseOutputPath=%PackageRoot%\bld\ ^
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
:: TODO(compnerd) actually perform the code-signing
Expand All @@ -944,9 +942,7 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bld\bld.wixproj ^
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\cli\cli.wixproj ^
-restore ^
-p:Configuration=Release ^
-p:IntermediateOutputPath=%PackageRoot%\cli\ ^
-p:OutputPath=%PackageRoot%\cli\ ^
-p:RunWixToolsOutOfProc=true ^
-p:BaseOutputPath=%PackageRoot%\cli\ ^
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
:: TODO(compnerd) actually perform the code-signing
Expand All @@ -956,9 +952,7 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\cli\cli.wixproj ^
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\dbg\dbg.wixproj ^
-restore ^
-p:Configuration=Release ^
-p:IntermediateOutputPath=%PackageRoot%\dbg\ ^
-p:OutputPath=%PackageRoot%\dbg\ ^
-p:RunWixToolsOutOfProc=true ^
-p:BaseOutputPath=%PackageRoot%\dbg\ ^
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
:: TODO(compnerd) actually perform the code-signing
Expand All @@ -968,9 +962,7 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\dbg\dbg.wixproj ^
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\ide\ide.wixproj ^
-restore ^
-p:Configuration=Release ^
-p:IntermediateOutputPath=%PackageRoot%\ide\ ^
-p:OutputPath=%PackageRoot%\ide\ ^
-p:RunWixToolsOutOfProc=true ^
-p:BaseOutputPath=%PackageRoot%\ide\ ^
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
:: TODO(compnerd) actually perform the code-signing
Expand All @@ -980,40 +972,34 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\ide\ide.wixproj ^
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\sdk\sdk.wixproj ^
-restore ^
-p:Configuration=Release ^
-p:IntermediateOutputPath=%PackageRoot%\sdk\ ^
-p:OutputPath=%PackageRoot%\sdk\ ^
-p:RunWixToolsOutOfProc=true ^
-p:BaseOutputPath=%PackageRoot%\sdk\ ^
-p:PLATFORM_ROOT=%PlatformRoot%\ ^
-p:SDK_ROOT=%SDKInstallRoot%\
:: TODO(compnerd) actually perform the code-signing
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\sdk\sdk.msi

:: Package runtime.msi
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\runtime\runtime.wixproj ^
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\runtimemsi\runtimemsi.wixproj ^
-restore ^
-p:Configuration=Release ^
-p:IntermediateOutputPath=%PackageRoot%\runtime\ ^
-p:OutputPath=%PackageRoot%\runtime\ ^
-p:RunWixToolsOutOfProc=true ^
-p:BaseOutputPath=%PackageRoot%\runtime\ ^
-p:SDK_ROOT=%SDKInstallRoot%\
:: TODO(compnerd) actually perform the code-signing
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\runtime\runtime.msi

:: Collate MSIs
move %PackageRoot%\bld\bld.msi %PackageRoot% || (exit /b)
move %PackageRoot%\cli\cli.msi %PackageRoot% || (exit /b)
move %PackageRoot%\dbg\dbg.msi %PackageRoot% || (exit /b)
move %PackageRoot%\ide\ide.msi %PackageRoot% || (exit /b)
move %PackageRoot%\sdk\sdk.msi %PackageRoot% || (exit /b)
move %PackageRoot%\runtime\runtime.msi %PackageRoot% || (exit /b)
move %PackageRoot%\bld\Release\amd64\bld.msi %PackageRoot% || (exit /b)
move %PackageRoot%\cli\Release\amd64\cli.msi %PackageRoot% || (exit /b)
move %PackageRoot%\dbg\Release\amd64\dbg.msi %PackageRoot% || (exit /b)
move %PackageRoot%\ide\Release\amd64\ide.msi %PackageRoot% || (exit /b)
move %PackageRoot%\sdk\Release\amd64\sdk.msi %PackageRoot% || (exit /b)
move %PackageRoot%\runtime\Release\amd64\runtime.msi %PackageRoot% || (exit /b)

:: Build Installer
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.wixproj ^
-restore ^
-p:Configuration=Release ^
-p:IntermediateOutputPath=%PackageRoot%\installer\ ^
-p:OutputPath=%PackageRoot%\installer\ ^
-p:RunWixToolsOutOfProc=true ^
-p:BaseOutputPath=%PackageRoot%\installer\ ^
-p:MSI_LOCATION=%PackageRoot%\
:: TODO(compnerd) actually perform the code-signing
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\installer\installer.exe
Expand All @@ -1035,7 +1021,7 @@ move %PackageRoot%\sdk.msi %BuildRoot%\artifacts || (exit /b)
:: runtime
move %PackageRoot%\runtime.msi %BuildRoot%\artifacts || (exit /b)
:: installer
move %PackageRoot%\installer\installer.exe %BuildRoot%\artifacts || (exit /b)
move %PackageRoot%\installer\Release\amd64\installer.exe %BuildRoot%\artifacts || (exit /b)

goto :eof
endlocal
Expand Down