Merge pull request #85995 from swiftlang/revert-85542-revert-85534-revert-71422-docc

Revert "Revert "Revert "build: setup a CMake based build for DocC"""

utils/build.ps1

@@ -4067,38 +4067,13 @@ function Build-Inspect([Hashtable] $Platform) {
     }
 }
 
-function Build-SymbolKit([hashtable] $Platform) {
-  Build-CMakeProject `
-    -Src $SourceCache\swift-docc-symbolkit `
-    -Bin $(Get-ProjectBinaryCache $Platform SymbolKit) `
-    -BuildTargets default `
-    -Platform $Platform `
-    -UseBuiltCompilers C,Swift `
-    -SwiftSDK (Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK) `
-    -Defines @{
-      CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
-    }
-}
-
-function Build-DocC([hashtable] $Platform) {
-  Build-CMakeProject `
+function Build-DocC() {
+  Build-SPMProject `
+    -Action Build `
     -Src $SourceCache\swift-docc `
-    -Bin (Get-ProjectBinaryCache $BuildPlatform DocC) `
-    -InstallTo "$($Platform.ToolchainInstallRoot)\usr" `
-    -Platform $Platform `
-    -UseBuiltCompilers C,Swift `
-    -SwiftSDK (Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK) `
-    -Defines @{
-      BUILD_SHARED_LIBS = "YES";
-      CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
-      ArgumentParser_DIR = (Get-ProjectCMakeModules $Platform ArgumentParser);
-      SwiftASN1_DIR = (Get-ProjectCMakeModules $Platform ASN1);
-      SwiftCrypto_DIR = (Get-ProjectCMakeModules $Platform Crypto);
-      SwiftMarkdown_DIR = (Get-ProjectCMakeModules $Platform Markdown);
-      LMDB_DIR = (Get-ProjectCMakeModules $Platform LMDB);
-      SymbolKit_DIR = (Get-ProjectCMakeModules $Platform SymbolKit);
-      "cmark-gfm_DIR" = "$($Platform.ToolchainInstallRoot)\usr\lib\cmake";
-    }
+    -Bin $(Get-ProjectBinaryCache $BuildPlatform DocC) `
+    -Platform $BuildPlatform `
+    --product docc
 }
 
 function Test-PackageManager() {
@@ -4473,8 +4448,7 @@ if (-not $SkipBuild -and $IncludeNoAsserts) {
   Build-NoAssertsToolchain
 }
 
-if (-not $SkipBuild) {
-  Invoke-BuildStep Build-SymbolKit $HostPlatform
+if (-not $SkipBuild -and -not $IsCrossCompiling) {
   Invoke-BuildStep Build-DocC $HostPlatform
 }