Update build.ps1

Author: compnerd

utils/build.ps1

@@ -1590,76 +1590,81 @@ function Build-Installer() {
 
 #-------------------------------------------------------------------
 
-if (-not $SkipBuild) {
-  Ensure-WindowsSDK
-}
-
-if (-not $SkipBuild) {
-  Ensure-SwiftToolchain $HostArch
-  Build-BuildTools $HostArch
-  Build-Compilers $HostArch
-}
-
-foreach ($Arch in $SDKArchs) {
+try {
   if (-not $SkipBuild) {
-    Build-ZLib $Arch
-    Build-XML2 $Arch
-    Build-CURL $Arch
-    Build-ICU $Arch
-    Build-LLVM $Arch
-
-    # Build platform: SDK, Redist and XCTest
-    Build-Runtime $Arch
-    Build-Dispatch $Arch
-    Build-Foundation $Arch
-    Build-XCTest $Arch
+    Ensure-WindowsSDK
   }
-}
-
-if (-not $ToBatch) {
-  if ($HostArch -in $SDKArchs) {
-    Remove-Item -Force -Recurse $RuntimeInstallRoot -ErrorAction Ignore
-    Copy-Directory "$($HostArch.SDKInstallRoot)\usr\bin" "$RuntimeInstallRoot\usr"
+  
+  if (-not $SkipBuild) {
+    Ensure-SwiftToolchain $HostArch
+    Build-BuildTools $HostArch
+    Build-Compilers $HostArch
   }
-
-  Remove-Item -Force -Recurse $PlatformInstallRoot -ErrorAction Ignore
+  
   foreach ($Arch in $SDKArchs) {
-    Install-Platform $Arch
+    if (-not $SkipBuild) {
+      Build-ZLib $Arch
+      Build-XML2 $Arch
+      Build-CURL $Arch
+      Build-ICU $Arch
+      Build-LLVM $Arch
+  
+      # Build platform: SDK, Redist and XCTest
+      Build-Runtime $Arch
+      Build-Dispatch $Arch
+      Build-Foundation $Arch
+      Build-XCTest $Arch
+    }
   }
+  
+  if (-not $ToBatch) {
+    if ($HostArch -in $SDKArchs) {
+      Remove-Item -Force -Recurse $RuntimeInstallRoot -ErrorAction Ignore
+      Copy-Directory "$($HostArch.SDKInstallRoot)\usr\bin" "$RuntimeInstallRoot\usr"
+    }
+  
+    Remove-Item -Force -Recurse $PlatformInstallRoot -ErrorAction Ignore
+    foreach ($Arch in $SDKArchs) {
+      Install-Platform $Arch
+    }
+  }
+  
+  if (-not $SkipBuild) {
+    Build-SQLite $HostArch
+    Build-System $HostArch
+    Build-ToolsSupportCore $HostArch
+    Build-LLBuild $HostArch
+    Build-Yams $HostArch
+    Build-ArgumentParser $HostArch
+    Build-Driver $HostArch
+    Build-Crypto $HostArch
+    Build-Collections $HostArch
+    Build-ASN1 $HostArch
+    Build-Certificates $HostArch
+    Build-PackageManager $HostArch
+    Build-IndexStoreDB $HostArch
+    Build-Syntax $HostArch
+    Build-SourceKitLSP $HostArch
+  }
+  
+  Install-HostToolchain
+  
+  if (-not $SkipBuild) {
+    Build-Inspect $HostArch
+    Build-Format $HostArch
+    Build-DocC $HostArch
+  }
+  
+  if (-not $SkipPackaging) {
+    Build-Installer
+  }
+  
+  if ($Test -contains "swift") { Build-Compilers $HostArch -Test }
+  if ($Test -contains "dispatch") { Build-Dispatch $HostArch -Test }
+  if ($Test -contains "foundation") { Build-Foundation $HostArch -Test }
+  if ($Test -contains "xctest") { Build-XCTest $HostArch -Test }
+  if ($Test -contains "llbuild") { Build-LLBuild $HostArch -Test }
+} catch {
+  Write-Error $_
+  exit 1
 }
-
-if (-not $SkipBuild) {
-  Build-SQLite $HostArch
-  Build-System $HostArch
-  Build-ToolsSupportCore $HostArch
-  Build-LLBuild $HostArch
-  Build-Yams $HostArch
-  Build-ArgumentParser $HostArch
-  Build-Driver $HostArch
-  Build-Crypto $HostArch
-  Build-Collections $HostArch
-  Build-ASN1 $HostArch
-  Build-Certificates $HostArch
-  Build-PackageManager $HostArch
-  Build-IndexStoreDB $HostArch
-  Build-Syntax $HostArch
-  Build-SourceKitLSP $HostArch
-}
-
-Install-HostToolchain
-
-if (-not $SkipBuild) {
-  Build-Inspect $HostArch
-  Build-Format $HostArch
-  Build-DocC $HostArch
-}
-
-if (-not $SkipPackaging) {
-  Build-Installer
-}
-
-if ($Test -contains "swift") { Build-Compilers $HostArch -Test }
-if ($Test -contains "dispatch") { Build-Dispatch $HostArch -Test }
-if ($Test -contains "foundation") { Build-Foundation $HostArch -Test }
-if ($Test -contains "xctest") { Build-XCTest $HostArch -Test }
-if ($Test -contains "llbuild") { Build-LLBuild $HostArch -Test }