@@ -1182,7 +1182,7 @@ function Build-CMakeProject {
1182
1182
}
1183
1183
1184
1184
if ($UseBuiltCompilers.Contains (" Swift" )) {
1185
- $env: Path = " $ ( $BuildArch.SDKInstallRoot ) \usr\bin;$ ( $BuildArch .BinaryCache ) \cmark-gfm-0.29.0.gfm.13 \src;$ ( $BuildArch.ToolchainInstallRoot ) \usr\bin;${env: Path} "
1185
+ $env: Path = " $ ( $BuildArch.SDKInstallRoot ) \usr\bin;$ ( Get-CMark - BinaryCache( $Arch ) ) \src;$ ( $BuildArch.ToolchainInstallRoot ) \usr\bin;${env: Path} "
1186
1186
} elseif ($UsePinnedCompilers.Contains (" Swift" )) {
1187
1187
$env: Path = " $ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
1188
1188
}
@@ -1326,12 +1326,15 @@ function Build-WiXProject() {
1326
1326
Invoke-Program $msbuild @MSBuildArgs
1327
1327
}
1328
1328
1329
+ function Get-CMark-BinaryCache ($Arch ) {
1330
+ return " $ ( $Arch.BinaryCache ) \cmark-gfm-0.29.0.gfm.13"
1331
+ }
1329
1332
function Build-CMark ($Arch ) {
1330
1333
$ArchName = $Arch.LLVMName
1331
1334
1332
1335
Build-CMakeProject `
1333
1336
- Src $SourceCache \cmark `
1334
- - Bin " $ ( $Arch.BinaryCache ) \cmark-gfm-0.29.0.gfm.13 " `
1337
+ - Bin ( Get-CMark - BinaryCache( $Arch )) `
1335
1338
- InstallTo " $ ( $Arch.ToolchainInstallRoot ) \usr" `
1336
1339
- Arch $Arch `
1337
1340
- Defines @ {
@@ -1400,7 +1403,7 @@ function Build-Compilers() {
1400
1403
$BuildTools = Join-Path - Path (Get-BuildProjectBinaryCache BuildTools) - ChildPath bin
1401
1404
1402
1405
if ($TestClang -or $TestLLD -or $TestLLDB -or $TestLLVM -or $TestSwift ) {
1403
- $env: Path = " $ ( $HostArch .BinaryCache ) \cmark-gfm-0.29.0.gfm.13 \src;$CompilersBinaryCache \tools\swift\libdispatch-windows-$ ( $Arch.LLVMName ) -prefix\bin;$CompilersBinaryCache \bin;$env: Path ;$VSInstallRoot \DIA SDK\bin\$ ( $HostArch.VSName ) ;$UnixToolsBinDir "
1406
+ $env: Path = " $ ( Get-CMark - BinaryCache( $Arch ) ) \src;$CompilersBinaryCache \tools\swift\libdispatch-windows-$ ( $Arch.LLVMName ) -prefix\bin;$CompilersBinaryCache \bin;$env: Path ;$VSInstallRoot \DIA SDK\bin\$ ( $HostArch.VSName ) ;$UnixToolsBinDir "
1404
1407
$Targets = @ ()
1405
1408
$TestingDefines = @ {
1406
1409
SWIFT_BUILD_DYNAMIC_SDK_OVERLAY = " YES" ;
@@ -1745,7 +1748,7 @@ function Build-Runtime([Platform]$Platform, $Arch) {
1745
1748
1746
1749
1747
1750
Isolate- EnvVars {
1748
- $env: Path = " $ ( $BuildArch .BinaryCache ) \cmark-gfm-0.29.0.gfm.13 \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
1751
+ $env: Path = " $ ( Get-CMark - BinaryCache( $Arch ) ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
1749
1752
1750
1753
$CompilersBinaryCache = if ($IsCrossCompiling ) {
1751
1754
Get-BuildProjectBinaryCache Compilers
@@ -2374,6 +2377,41 @@ function Build-Format($Arch) {
2374
2377
}
2375
2378
}
2376
2379
2380
+ function Test-Format {
2381
+ $SwiftPMArguments = @ (
2382
+ # swift-syntax
2383
+ " -Xswiftc" , " -I$ ( Get-HostProjectBinaryCache Compilers) \lib\swift\host" ,
2384
+ " -Xswiftc" , " -L$ ( Get-HostProjectBinaryCache Compilers) \lib\swift\host" ,
2385
+ # swift-argument-parser
2386
+ " -Xswiftc" , " -I$ ( Get-HostProjectBinaryCache ArgumentParser) \swift" ,
2387
+ " -Xlinker" , " -L$ ( Get-HostProjectBinaryCache ArgumentParser) \lib" ,
2388
+ # swift-cmark
2389
+ " -Xswiftc" , " -I$ ( $SourceCache ) \cmark\src\include" ,
2390
+ " -Xswiftc" , " -I$ ( $SourceCache ) \cmark\extensions\include" ,
2391
+ " -Xlinker" , " -I$ ( $SourceCache ) \cmark\extensions\include" ,
2392
+ " -Xlinker" , " $ ( Get-CMark - BinaryCache($HostArch )) \src\cmark-gfm.lib" ,
2393
+ " -Xlinker" , " $ ( Get-CMark - BinaryCache($HostArch )) \extensions\cmark-gfm-extensions.lib" ,
2394
+ # swift-markdown
2395
+ " -Xlinker" , " $ ( Get-HostProjectBinaryCache Markdown) \lib\CAtomic.lib" ,
2396
+ " -Xswiftc" , " -I$ ( $SourceCache ) \swift-markdown\Sources\CAtomic\include" ,
2397
+ " -Xswiftc" , " -I$ ( Get-HostProjectBinaryCache Markdown) \swift" ,
2398
+ " -Xlinker" , " -L$ ( Get-HostProjectBinaryCache Markdown) \lib" ,
2399
+ # swift-format
2400
+ " -Xswiftc" , " -I$ ( Get-HostProjectBinaryCache Format) \swift" ,
2401
+ " -Xlinker" , " -L$ ( Get-HostProjectBinaryCache Format) \lib"
2402
+ )
2403
+
2404
+ Isolate- EnvVars {
2405
+ $env: SWIFTFORMAT_BUILD_ONLY_TESTS = 1
2406
+ Build-SPMProject `
2407
+ - Src " $SourceCache \swift-format" `
2408
+ - Bin (Join-Path - Path $HostArch.BinaryCache - ChildPath swift- format) `
2409
+ - Arch $HostArch `
2410
+ - Test `
2411
+ @SwiftPMArguments
2412
+ }
2413
+ }
2414
+
2377
2415
function Build-IndexStoreDB ($Arch ) {
2378
2416
$SDKInstallRoot = (Get-HostSwiftSDK );
2379
2417
@@ -2744,6 +2782,7 @@ if (-not $IsCrossCompiling) {
2744
2782
}
2745
2783
if ($Test -contains " llbuild" ) { Build-LLBuild $HostArch - Test }
2746
2784
if ($Test -contains " swiftpm" ) { Test-PackageManager $HostArch }
2785
+ if ($Test -contains " swift-format" ) { Test-Format }
2747
2786
}
2748
2787
2749
2788
# Custom exception printing for more detailed exception information
0 commit comments