@@ -853,11 +853,11 @@ function Build-CMark($Arch) {
853
853
Build-CMakeProject `
854
854
- Src $SourceCache \cmark `
855
855
- Bin " $ ( $Arch.BinaryCache ) \cmark-gfm-0.29.0.gfm.13" `
856
- - InstallTo " $LibraryRoot \cmark-0.29.0.gfm.13 \usr" `
856
+ - InstallTo " $ ( $Arch .ToolchainInstallRoot ) \usr" `
857
857
- Arch $Arch `
858
858
- BuildTargets default `
859
859
- Defines @ {
860
- BUILD_SHARED_LIBS = " NO " ;
860
+ BUILD_SHARED_LIBS = " YES " ;
861
861
BUILD_TESTING = " NO" ;
862
862
CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP = " YES" ;
863
863
}
@@ -913,8 +913,7 @@ function Build-Compilers() {
913
913
914
914
Isolate- EnvVars {
915
915
if ($TestClang -or $TestLLD -or $TestLLDB -or $TestLLVM -or $TestSwift ) {
916
- $LibdispatchBinDir = " $BinaryCache \1\tools\swift\libdispatch-windows-$ ( $Arch.LLVMName ) -prefix\bin"
917
- $env: Path = " $LibdispatchBinDir ;$BinaryCache \1\bin;$env: Path ;$VSInstallRoot \DIA SDK\bin\$ ( $HostArch.VSName ) ;$UnixToolsBinDir "
916
+ $env: Path = " $ ( $HostArch.BinaryCache ) \cmark-gfm-0.29.0.gfm.13\src;$BinaryCache \1\tools\swift\libdispatch-windows-$ ( $Arch.LLVMName ) -prefix\bin;$BinaryCache \1\bin;$env: Path ;$VSInstallRoot \DIA SDK\bin\$ ( $HostArch.VSName ) ;$UnixToolsBinDir "
918
917
$Targets = @ ()
919
918
$TestingDefines = @ {
920
919
SWIFT_BUILD_DYNAMIC_SDK_OVERLAY = " YES" ;
@@ -1159,18 +1158,19 @@ function Build-Runtime($Arch) {
1159
1158
$LLVMBinaryCache = Get-ProjectBinaryCache $Arch 0
1160
1159
1161
1160
Isolate- EnvVars {
1162
- $env: Path = " $ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
1161
+ $env: Path = " $ ( $HostArch .BinaryCache ) \cmark-gfm-0.29.0.gfm.13\src; $ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
1163
1162
1164
1163
Build-CMakeProject `
1165
1164
- Src $SourceCache \swift `
1166
1165
- Bin (Get-ProjectBinaryCache $Arch 1 ) `
1167
1166
- InstallTo " $ ( $Arch.SDKInstallRoot ) \usr" `
1168
1167
- Arch $Arch `
1169
1168
- CacheScript $SourceCache \swift\cmake\caches\Runtime- Windows- $ ($Arch.LLVMName ).cmake `
1170
- - UseBuiltCompilers C, CXX `
1169
+ - UseBuiltCompilers C, CXX, Swift `
1171
1170
- BuildTargets default `
1172
1171
- Defines @ {
1173
1172
CMAKE_Swift_COMPILER_TARGET = $Arch.LLVMTarget ;
1173
+ CMAKE_Swift_COMPILER_WORKS = " YES" ;
1174
1174
LLVM_DIR = " $LLVMBinaryCache \lib\cmake\llvm" ;
1175
1175
SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY = " YES" ;
1176
1176
SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP = " YES" ;
@@ -1606,10 +1606,45 @@ function Build-PackageManager($Arch) {
1606
1606
}
1607
1607
}
1608
1608
1609
+ function Build-Markdown ($Arch ) {
1610
+ Build-CMakeProject `
1611
+ - Src $SourceCache \swift- markdown `
1612
+ - Bin $BinaryCache \13 `
1613
+ - InstallTo " $ ( $Arch.ToolchainInstallRoot ) \usr" `
1614
+ - Arch $Arch `
1615
+ - UseBuiltCompilers Swift `
1616
+ - SwiftSDK $SDKInstallRoot `
1617
+ - BuildTargets default `
1618
+ - Defines @ {
1619
+ BUILD_SHARED_LIBS = " NO" ;
1620
+ ArgumentParser_DIR = " $BinaryCache \6\cmake\modules" ;
1621
+ " cmark-gfm_DIR" = " $ ( $Arch.BinaryCache ) \cmark-gfm-0.29.0.gfm.13" ;
1622
+ }
1623
+ }
1624
+
1625
+ function Build-Format ($Arch ) {
1626
+ Build-CMakeProject `
1627
+ - Src $SourceCache \swift- format `
1628
+ - Bin $BinaryCache \14 `
1629
+ - InstallTo " $ ( $Arch.ToolchainInstallRoot ) \usr" `
1630
+ - Arch $Arch `
1631
+ - UseMSVCCompilers C `
1632
+ - UseBuiltCompilers Swift `
1633
+ - SwiftSDK $SDKInstallRoot `
1634
+ - BuildTargets default `
1635
+ - Defines @ {
1636
+ BUILD_SHARED_LIBS = " YES" ;
1637
+ ArgumentParser_DIR = " $BinaryCache \6\cmake\modules" ;
1638
+ SwiftSyntax_DIR = " $BinaryCache \1\cmake\modules" ;
1639
+ " cmark-gfm_DIR" = " $ ( $Arch.BinaryCache ) \cmark-gfm-0.29.0.gfm.13" ;
1640
+ SwiftMarkdown_DIR = " $BinaryCache \13\cmake\modules" ;
1641
+ }
1642
+ }
1643
+
1609
1644
function Build-IndexStoreDB ($Arch ) {
1610
1645
Build-CMakeProject `
1611
1646
- Src $SourceCache \indexstore- db `
1612
- - Bin $BinaryCache \13 `
1647
+ - Bin $BinaryCache \15 `
1613
1648
- Arch $Arch `
1614
1649
- UseBuiltCompilers C, CXX, Swift `
1615
1650
- SwiftSDK $SDKInstallRoot `
@@ -1624,7 +1659,7 @@ function Build-IndexStoreDB($Arch) {
1624
1659
function Build-SourceKitLSP ($Arch ) {
1625
1660
Build-CMakeProject `
1626
1661
- Src $SourceCache \sourcekit- lsp `
1627
- - Bin $BinaryCache \14 `
1662
+ - Bin $BinaryCache \16 `
1628
1663
- InstallTo " $ ( $Arch.ToolchainInstallRoot ) \usr" `
1629
1664
- Arch $Arch `
1630
1665
- UseBuiltCompilers C, Swift `
@@ -1639,7 +1674,7 @@ function Build-SourceKitLSP($Arch) {
1639
1674
SwiftCrypto_DIR = " $BinaryCache \8\cmake\modules" ;
1640
1675
SwiftCollections_DIR = " $BinaryCache \9\cmake\modules" ;
1641
1676
SwiftPM_DIR = " $BinaryCache \12\cmake\modules" ;
1642
- IndexStoreDB_DIR = " $BinaryCache \13 \cmake\modules" ;
1677
+ IndexStoreDB_DIR = " $BinaryCache \15 \cmake\modules" ;
1643
1678
}
1644
1679
}
1645
1680
@@ -1675,18 +1710,6 @@ function Build-Inspect() {
1675
1710
}
1676
1711
}
1677
1712
1678
- function Build-Format () {
1679
- $OutDir = Join-Path - Path $HostArch.BinaryCache - ChildPath swift- format
1680
-
1681
- Isolate- EnvVars {
1682
- $env: SWIFTCI_USE_LOCAL_DEPS = 1
1683
- Build-SPMProject `
1684
- - Src $SourceCache \swift- format `
1685
- - Bin $OutDir `
1686
- - Arch $HostArch
1687
- }
1688
- }
1689
-
1690
1713
function Build-DocC () {
1691
1714
$OutDir = Join-Path - Path $HostArch.BinaryCache - ChildPath swift- docc
1692
1715
@@ -1813,6 +1836,8 @@ if (-not $SkipBuild) {
1813
1836
Invoke-BuildStep Build-ASN1 $HostArch
1814
1837
Invoke-BuildStep Build-Certificates $HostArch
1815
1838
Invoke-BuildStep Build-PackageManager $HostArch
1839
+ Invoke-BuildStep Build-Markdown $HostArch
1840
+ Invoke-BuildStep Build-Format $HostArch
1816
1841
Invoke-BuildStep Build-IndexStoreDB $HostArch
1817
1842
Invoke-BuildStep Build-SourceKitLSP $HostArch
1818
1843
}
@@ -1821,7 +1846,6 @@ Install-HostToolchain
1821
1846
1822
1847
if (-not $SkipBuild ) {
1823
1848
Invoke-BuildStep Build-Inspect $HostArch
1824
- Invoke-BuildStep Build-Format $HostArch
1825
1849
Invoke-BuildStep Build-DocC $HostArch
1826
1850
}
1827
1851
0 commit comments