Skip to content

Commit 33a6543

Browse files
authored
Revert "Revert "build: setup a CMake based build for DocC""
1 parent b4d2f8a commit 33a6543

File tree

1 file changed

+33
-7
lines changed

1 file changed

+33
-7
lines changed

utils/build.ps1

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4080,13 +4080,38 @@ function Build-Inspect([Hashtable] $Platform) {
40804080
}
40814081
}
40824082

4083-
function Build-DocC() {
4084-
Build-SPMProject `
4085-
-Action Build `
4083+
function Build-SymbolKit([hashtable] $Platform) {
4084+
Build-CMakeProject `
4085+
-Src $SourceCache\swift-docc-symbolkit `
4086+
-Bin $(Get-ProjectBinaryCache $Platform SymbolKit) `
4087+
-BuildTargets default `
4088+
-Platform $Platform `
4089+
-UseBuiltCompilers C,Swift `
4090+
-SwiftSDK (Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK) `
4091+
-Defines @{
4092+
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
4093+
}
4094+
}
4095+
4096+
function Build-DocC([hashtable] $Platform) {
4097+
Build-CMakeProject `
40864098
-Src $SourceCache\swift-docc `
4087-
-Bin $(Get-ProjectBinaryCache $BuildPlatform DocC) `
4088-
-Platform $BuildPlatform `
4089-
--product docc
4099+
-Bin (Get-ProjectBinaryCache $BuildPlatform DocC) `
4100+
-InstallTo "$($Platform.ToolchainInstallRoot)\usr" `
4101+
-Platform $Platform `
4102+
-UseBuiltCompilers C,Swift `
4103+
-SwiftSDK (Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK) `
4104+
-Defines @{
4105+
BUILD_SHARED_LIBS = "YES";
4106+
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
4107+
ArgumentParser_DIR = (Get-ProjectCMakeModules $Platform ArgumentParser);
4108+
SwiftASN1_DIR = (Get-ProjectCMakeModules $Platform ASN1);
4109+
SwiftCrypto_DIR = (Get-ProjectCMakeModules $Platform Crypto);
4110+
SwiftMarkdown_DIR = (Get-ProjectCMakeModules $Platform Markdown);
4111+
LMDB_DIR = (Get-ProjectCMakeModules $Platform LMDB);
4112+
SymbolKit_DIR = (Get-ProjectCMakeModules $Platform SymbolKit);
4113+
"cmark-gfm_DIR" = "$($Platform.ToolchainInstallRoot)\usr\lib\cmake";
4114+
}
40904115
}
40914116

40924117
function Test-PackageManager() {
@@ -4461,7 +4486,8 @@ if (-not $SkipBuild -and $IncludeNoAsserts) {
44614486
Build-NoAssertsToolchain
44624487
}
44634488

4464-
if (-not $SkipBuild -and -not $IsCrossCompiling) {
4489+
if (-not $SkipBuild) {
4490+
Invoke-BuildStep Build-SymbolKit $HostPlatform
44654491
Invoke-BuildStep Build-DocC $HostPlatform
44664492
}
44674493

0 commit comments

Comments
 (0)