Skip to content

Commit 2d2ba14

Browse files
committed
build: prepare for versioning of the toolchain
Pass along the version information for the toolchain which is finally resolving the version information handling as part of the toolchain install location to permit parallel installation of different releases.
1 parent b43ed62 commit 2d2ba14

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

utils/build-windows-toolchain.bat

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
setlocal enableextensions enabledelayedexpansion
1212
path %PATH%;%PYTHON_HOME%
1313

14+
:: Versioning
15+
set ProductVersion=5.9.0
16+
set ProductTag=
17+
1418
:: Identify the SourceRoot
1519
:: Normalize the SourceRoot to make it easier to read the output.
1620
cd %~dp0\..\..
@@ -929,6 +933,7 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\toolchain.wixproj
929933
-restore ^
930934
-p:RunWixToolsOutOfProc=true ^
931935
-p:OutputPath=%PackageRoot%\toolchain\ ^
936+
-p:ProductVersion=%ProductVersion% ^
932937
-p:IntermediateOutputPath=%PackageRoot%\toolchain\ ^
933938
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
934939
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
@@ -940,6 +945,7 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\sdk.wixproj ^
940945
-restore ^
941946
-p:RunWixToolsOutOfProc=true ^
942947
-p:OutputPath=%PackageRoot%\sdk\ ^
948+
-p:ProductVersion=%ProductVersion% ^
943949
-p:IntermediateOutputPath=%PackageRoot%\sdk\ ^
944950
-p:PLATFORM_ROOT=%PlatformRoot%\ ^
945951
-p:SDK_ROOT=%SDKInstallRoot%\
@@ -951,6 +957,7 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\runtime.wixproj ^
951957
-restore ^
952958
-p:RunWixToolsOutOfProc=true ^
953959
-p:OutputPath=%PackageRoot%\runtime\ ^
960+
-p:ProductVersion=%ProductVersion% ^
954961
-p:IntermediateOutputPath=%PackageRoot%\runtime\ ^
955962
-p:SDK_ROOT=%SDKInstallRoot%\
956963
:: TODO(compnerd) actually perform the code-signing
@@ -961,6 +968,7 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\devtools.wixproj
961968
-restore ^
962969
-p:RunWixToolsOutOfProc=true ^
963970
-p:OutputPath=%PackageRoot%\devtools\ ^
971+
-p:ProductVersion=%ProductVersion% ^
964972
-p:IntermediateOutputPath=%PackageRoot%\devtools\ ^
965973
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain
966974
:: TODO(compnerd) actually perform the code-signing
@@ -977,6 +985,7 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\installer.wixproj
977985
-restore ^
978986
-p:RunWixToolsOutOfProc=true ^
979987
-p:OutputPath=%PackageRoot%\installer\ ^
988+
-p:ProductVersion=%ProductVersion%%ProductTag% ^
980989
-p:IntermediateOutputPath=%PackageRoot%\installer\ ^
981990
-p:MSI_LOCATION=%PackageRoot%\
982991
:: TODO(compnerd) actually perform the code-signing

0 commit comments

Comments
 (0)