@@ -707,14 +707,14 @@ enum Project {
707
707
ClangBuiltins
708
708
ClangRuntime
709
709
SwiftInspect
710
- ExperimentalRuntime
711
- ExperimentalOverlay
712
- ExperimentalStringProcessing
713
- ExperimentalSynchronization
714
- ExperimentalDistributed
715
- ExperimentalObservation
716
- ExperimentalDispatch
717
- ExperimentalFoundation
710
+ ExperimentalStaticRuntime
711
+ ExperimentalStaticOverlay
712
+ ExperimentalStaticStringProcessing
713
+ ExperimentalStaticSynchronization
714
+ ExperimentalStaticDistributed
715
+ ExperimentalStaticObservation
716
+ ExperimentalStaticDispatch
717
+ ExperimentalStaticFoundation
718
718
}
719
719
720
720
function Get-ProjectBinaryCache ([Hashtable ] $Platform , [Project ] $Project ) {
@@ -2452,7 +2452,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2452
2452
2453
2453
Build-CMakeProject `
2454
2454
- Src $SourceCache \swift\Runtimes\Core `
2455
- - Bin (Get-ProjectBinaryCache $Platform ExperimentalRuntime ) `
2455
+ - Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) `
2456
2456
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2457
2457
- Platform $Platform `
2458
2458
- UseBuiltCompilers C, CXX, Swift `
@@ -2481,7 +2481,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2481
2481
2482
2482
Build-CMakeProject `
2483
2483
- Src $SourceCache \swift\Runtimes\Overlay `
2484
- - Bin (Get-ProjectBinaryCache $Platform ExperimentalOverlay ) `
2484
+ - Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay ) `
2485
2485
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2486
2486
- Platform $Platform `
2487
2487
- UseBuiltCompilers C, CXX, Swift `
@@ -2495,12 +2495,12 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2495
2495
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2496
2496
CMAKE_SYSTEM_NAME = $Platform.OS.ToString ();
2497
2497
2498
- SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalRuntime ) \cmake\SwiftCore" ;
2498
+ SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \cmake\SwiftCore" ;
2499
2499
}
2500
2500
2501
2501
Build-CMakeProject `
2502
2502
- Src $SourceCache \swift\Runtimes\Supplemental\StringProcessing `
2503
- - Bin (Get-ProjectBinaryCache $Platform ExperimentalStringProcessing ) `
2503
+ - Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticStringProcessing ) `
2504
2504
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2505
2505
- Platform $Platform `
2506
2506
- UseBuiltCompilers C, Swift `
@@ -2514,12 +2514,12 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2514
2514
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2515
2515
CMAKE_SYSTEM_NAME = $Platform.OS.ToString ();
2516
2516
2517
- SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalRuntime ) \cmake\SwiftCore" ;
2517
+ SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \cmake\SwiftCore" ;
2518
2518
}
2519
2519
2520
2520
Build-CMakeProject `
2521
2521
- Src $SourceCache \swift\Runtimes\Supplemental\Synchronization `
2522
- - Bin (Get-ProjectBinaryCache $Platform ExperimentalSynchronization ) `
2522
+ - Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticSynchronization ) `
2523
2523
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2524
2524
- Platform $Platform `
2525
2525
- UseBuiltCompilers C, Swift `
@@ -2533,13 +2533,13 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2533
2533
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2534
2534
CMAKE_SYSTEM_NAME = $Platform.OS.ToString ();
2535
2535
2536
- SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalRuntime ) \cmake\SwiftCore" ;
2537
- SwiftOverlay_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalOverlay ) \cmake\SwiftOverlay" ;
2536
+ SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \cmake\SwiftCore" ;
2537
+ SwiftOverlay_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay ) \cmake\SwiftOverlay" ;
2538
2538
}
2539
2539
2540
2540
Build-CMakeProject `
2541
2541
- Src $SourceCache \swift\Runtimes\Supplemental\Distributed `
2542
- - Bin (Get-ProjectBinaryCache $Platform ExperimentalDistributed ) `
2542
+ - Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticDistributed ) `
2543
2543
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2544
2544
- Platform $Platform `
2545
2545
- UseBuiltCompilers C, CXX, Swift `
@@ -2548,19 +2548,19 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2548
2548
- Defines @ {
2549
2549
BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2550
2550
CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2551
- CMAKE_CXX_FLAGS = @ (" -I$ ( Get-ProjectBinaryCache $Platform ExperimentalRuntime ) \include" );
2551
+ CMAKE_CXX_FLAGS = @ (" -I$ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \include" );
2552
2552
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2553
2553
CMAKE_Swift_COMPILER_WORKS = " YES" ;
2554
2554
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2555
2555
CMAKE_SYSTEM_NAME = $Platform.OS.ToString ();
2556
2556
2557
- SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalRuntime ) \cmake\SwiftCore" ;
2558
- SwiftOverlay_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalOverlay ) \cmake\SwiftOverlay" ;
2557
+ SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \cmake\SwiftCore" ;
2558
+ SwiftOverlay_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay ) \cmake\SwiftOverlay" ;
2559
2559
}
2560
2560
2561
2561
Build-CMakeProject `
2562
2562
- Src $SourceCache \swift\Runtimes\Supplemental\Observation `
2563
- - Bin (Get-ProjectBinaryCache $Platform ExperimentalObservation ) `
2563
+ - Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticObservation ) `
2564
2564
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2565
2565
- Platform $Platform `
2566
2566
- UseBuiltCompilers CXX, Swift `
@@ -2569,14 +2569,14 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2569
2569
- Defines @ {
2570
2570
BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2571
2571
CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2572
- CMAKE_CXX_FLAGS = @ (" -I$ ( Get-ProjectBinaryCache $Platform ExperimentalRuntime ) \include" );
2572
+ CMAKE_CXX_FLAGS = @ (" -I$ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \include" );
2573
2573
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2574
2574
CMAKE_Swift_COMPILER_WORKS = " YES" ;
2575
2575
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2576
2576
CMAKE_SYSTEM_NAME = $Platform.OS.ToString ();
2577
2577
2578
- SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalRuntime ) \cmake\SwiftCore" ;
2579
- SwiftOverlay_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalOverlay ) \cmake\SwiftOverlay" ;
2578
+ SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \cmake\SwiftCore" ;
2579
+ SwiftOverlay_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay ) \cmake\SwiftOverlay" ;
2580
2580
}
2581
2581
}
2582
2582
}
@@ -2661,7 +2661,7 @@ function Build-Foundation {
2661
2661
)
2662
2662
2663
2663
$FoundationBinaryCache = if ($Static ) {
2664
- Get-ProjectBinaryCache $Platform ExperimentalFoundation
2664
+ Get-ProjectBinaryCache $Platform ExperimentalStaticFoundation
2665
2665
} else {
2666
2666
Get-ProjectBinaryCache $Platform DynamicFoundation
2667
2667
}
@@ -2685,7 +2685,7 @@ function Build-Foundation {
2685
2685
}
2686
2686
2687
2687
$DispatchCMakeModules = if ($Static ) {
2688
- Get-ProjectCMakeModules $Platform ExperimentalDispatch
2688
+ Get-ProjectCMakeModules $Platform ExperimentalStaticDispatch
2689
2689
} else {
2690
2690
Get-ProjectCMakeModules $Platform Dispatch
2691
2691
}
@@ -2907,7 +2907,7 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
2907
2907
$env: Path = " $ ( Get-CMarkBinaryCache $Platform ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
2908
2908
Build-CMakeProject `
2909
2909
- Src $SourceCache \swift- corelibs- libdispatch `
2910
- - Bin (Get-ProjectBinaryCache $Platform ExperimentalDispatch ) `
2910
+ - Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticDispatch ) `
2911
2911
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2912
2912
- Platform $Platform `
2913
2913
- UseBuiltCompilers C, CXX, Swift `
0 commit comments