@@ -849,11 +849,11 @@ function Build-CMark($Arch) {
849
849
Build-CMakeProject `
850
850
- Src $SourceCache \cmark `
851
851
- Bin " $ ( $Arch.BinaryCache ) \cmark-gfm-0.29.0.gfm.13" `
852
- - InstallTo " $LibraryRoot \cmark-0.29.0.gfm.13 \usr" `
852
+ - InstallTo " $ ( $Arch .ToolchainInstallRoot ) \usr" `
853
853
- Arch $Arch `
854
854
- BuildTargets default `
855
855
- Defines @ {
856
- BUILD_SHARED_LIBS = " NO " ;
856
+ BUILD_SHARED_LIBS = " YES " ;
857
857
BUILD_TESTING = " NO" ;
858
858
CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP = " YES" ;
859
859
}
@@ -1602,10 +1602,45 @@ function Build-PackageManager($Arch) {
1602
1602
}
1603
1603
}
1604
1604
1605
+ function Build-Markdown ($Arch ) {
1606
+ Build-CMakeProject `
1607
+ - Src $SourceCache \swift- markdown `
1608
+ - Bin $BinaryCache \13 `
1609
+ - InstallTo " $ ( $Arch.ToolchainInstallRoot ) \usr" `
1610
+ - Arch $Arch `
1611
+ - UseBuiltCompilers Swift `
1612
+ - SwiftSDK $SDKInstallRoot `
1613
+ - BuildTargets default `
1614
+ - Defines @ {
1615
+ BUILD_SHARED_LIBS = " NO" ;
1616
+ ArgumentParser_DIR = " $BinaryCache \6\cmake\modules" ;
1617
+ " cmark-gfm_DIR" = " $ ( $Arch.BinaryCache ) \cmark-gfm-0.29.0.gfm.13" ;
1618
+ }
1619
+ }
1620
+
1621
+ function Build-Format ($Arch ) {
1622
+ Build-CMakeProject `
1623
+ - Src $SourceCache \swift- format `
1624
+ - Bin $BinaryCache \14 `
1625
+ - InstallTo " $ ( $Arch.ToolchainInstallRoot ) \usr" `
1626
+ - Arch $Arch `
1627
+ - UseMSVCCompilers C `
1628
+ - UseBuiltCompilers Swift `
1629
+ - SwiftSDK $SDKInstallRoot `
1630
+ - BuildTargets default `
1631
+ - Defines @ {
1632
+ BUILD_SHARED_LIBS = " YES" ;
1633
+ ArgumentParser_DIR = " $BinaryCache \6\cmake\modules" ;
1634
+ SwiftSyntax_DIR = " $BinaryCache \1\cmake\modules" ;
1635
+ " cmark-gfm_DIR" = " $ ( $Arch.BinaryCache ) \cmark-gfm-0.29.0.gfm.13" ;
1636
+ SwiftMarkdown_DIR = " $BinaryCache \13\cmake\modules" ;
1637
+ }
1638
+ }
1639
+
1605
1640
function Build-IndexStoreDB ($Arch ) {
1606
1641
Build-CMakeProject `
1607
1642
- Src $SourceCache \indexstore- db `
1608
- - Bin $BinaryCache \13 `
1643
+ - Bin $BinaryCache \15 `
1609
1644
- Arch $Arch `
1610
1645
- UseBuiltCompilers C, CXX, Swift `
1611
1646
- SwiftSDK $SDKInstallRoot `
@@ -1620,7 +1655,7 @@ function Build-IndexStoreDB($Arch) {
1620
1655
function Build-SourceKitLSP ($Arch ) {
1621
1656
Build-CMakeProject `
1622
1657
- Src $SourceCache \sourcekit- lsp `
1623
- - Bin $BinaryCache \14 `
1658
+ - Bin $BinaryCache \16 `
1624
1659
- InstallTo " $ ( $Arch.ToolchainInstallRoot ) \usr" `
1625
1660
- Arch $Arch `
1626
1661
- UseBuiltCompilers C, Swift `
@@ -1635,7 +1670,7 @@ function Build-SourceKitLSP($Arch) {
1635
1670
SwiftCrypto_DIR = " $BinaryCache \8\cmake\modules" ;
1636
1671
SwiftCollections_DIR = " $BinaryCache \9\cmake\modules" ;
1637
1672
SwiftPM_DIR = " $BinaryCache \12\cmake\modules" ;
1638
- IndexStoreDB_DIR = " $BinaryCache \13 \cmake\modules" ;
1673
+ IndexStoreDB_DIR = " $BinaryCache \15 \cmake\modules" ;
1639
1674
}
1640
1675
}
1641
1676
@@ -1671,18 +1706,6 @@ function Build-Inspect() {
1671
1706
}
1672
1707
}
1673
1708
1674
- function Build-Format () {
1675
- $OutDir = Join-Path - Path $HostArch.BinaryCache - ChildPath swift- format
1676
-
1677
- Isolate- EnvVars {
1678
- $env: SWIFTCI_USE_LOCAL_DEPS = 1
1679
- Build-SPMProject `
1680
- - Src $SourceCache \swift- format `
1681
- - Bin $OutDir `
1682
- - Arch $HostArch
1683
- }
1684
- }
1685
-
1686
1709
function Build-DocC () {
1687
1710
$OutDir = Join-Path - Path $HostArch.BinaryCache - ChildPath swift- docc
1688
1711
@@ -1801,6 +1824,8 @@ if (-not $SkipBuild) {
1801
1824
Invoke-BuildStep Build-ASN1 $HostArch
1802
1825
Invoke-BuildStep Build-Certificates $HostArch
1803
1826
Invoke-BuildStep Build-PackageManager $HostArch
1827
+ Invoke-BuildStep Build-Markdown $HostArch
1828
+ Invoke-BuildStep Build-Format $HostArch
1804
1829
Invoke-BuildStep Build-IndexStoreDB $HostArch
1805
1830
Invoke-BuildStep Build-SourceKitLSP $HostArch
1806
1831
}
@@ -1809,7 +1834,6 @@ Install-HostToolchain
1809
1834
1810
1835
if (-not $SkipBuild ) {
1811
1836
Invoke-BuildStep Build-Inspect $HostArch
1812
- Invoke-BuildStep Build-Format $HostArch
1813
1837
Invoke-BuildStep Build-DocC $HostArch
1814
1838
}
1815
1839
0 commit comments