@@ -2468,9 +2468,45 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2468
2468
Invoke-IsolatingEnvVars {
2469
2469
$env: Path = " $ ( Get-CMarkBinaryCache $Platform ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
2470
2470
2471
+ $RuntimeBinaryCache = if ($Static ) {
2472
+ Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime
2473
+ } else {
2474
+ throw " dynamic Experimental Runtime is not yet implemented"
2475
+ }
2476
+
2477
+ $OverlayBinaryCache = if ($Static ) {
2478
+ Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay
2479
+ } else {
2480
+ throw " dynamic Experimental Runtime is not yet implemented"
2481
+ }
2482
+
2483
+ $StringProcessingBinaryCache = if ($Static ) {
2484
+ Get-ProjectBinarycache $Platform ExperimentalStaticStringProcessing
2485
+ } else {
2486
+ throw " dynamic Experimental Runtime is not yet implemented"
2487
+ }
2488
+
2489
+ $SynchronizationBinaryCache = if ($Static ) {
2490
+ Get-ProjectBinarycache $Platform ExperimentalStaticSynchronization
2491
+ } else {
2492
+ throw " dynamic Experimental Runtime is not yet implemented"
2493
+ }
2494
+
2495
+ $DistributedBinaryCache = if ($Static ) {
2496
+ Get-ProjectBinarycache $Platform ExperimentalStaticDistributed
2497
+ } else {
2498
+ throw " dynamic Experimental Runtime is not yet implemented"
2499
+ }
2500
+
2501
+ $ObservationBinaryCache = if ($Static ) {
2502
+ Get-ProjectBinarycache $Platform ExperimentalStaticObservation
2503
+ } else {
2504
+ throw " dynamic Experimental Runtime is not yet implemented"
2505
+ }
2506
+
2471
2507
Build-CMakeProject `
2472
2508
- Src $SourceCache \swift\Runtimes\Core `
2473
- - Bin ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime) `
2509
+ - Bin $RuntimeBinaryCache `
2474
2510
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2475
2511
- Platform $Platform `
2476
2512
- UseBuiltCompilers C, CXX, Swift `
@@ -2498,7 +2534,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2498
2534
2499
2535
Build-CMakeProject `
2500
2536
- Src $SourceCache \swift\Runtimes\Overlay `
2501
- - Bin ( Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay) `
2537
+ - Bin $OverlayBinaryCache `
2502
2538
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2503
2539
- Platform $Platform `
2504
2540
- UseBuiltCompilers C, CXX, Swift `
@@ -2511,12 +2547,12 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2511
2547
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2512
2548
CMAKE_SYSTEM_NAME = $Platform.OS.ToString ();
2513
2549
2514
- SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \cmake\SwiftCore" ;
2550
+ SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
2515
2551
}
2516
2552
2517
2553
Build-CMakeProject `
2518
2554
- Src $SourceCache \swift\Runtimes\Supplemental\StringProcessing `
2519
- - Bin ( Get-ProjectBinaryCache $Platform ExperimentalStaticStringProcessing) `
2555
+ - Bin $StringProcessingBinaryCache `
2520
2556
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2521
2557
- Platform $Platform `
2522
2558
- UseBuiltCompilers C, Swift `
@@ -2529,12 +2565,12 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2529
2565
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2530
2566
CMAKE_SYSTEM_NAME = $Platform.OS.ToString ();
2531
2567
2532
- SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \cmake\SwiftCore" ;
2568
+ SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
2533
2569
}
2534
2570
2535
2571
Build-CMakeProject `
2536
2572
- Src $SourceCache \swift\Runtimes\Supplemental\Synchronization `
2537
- - Bin ( Get-ProjectBinaryCache $Platform ExperimentalStaticSynchronization) `
2573
+ - Bin $SynchronizationBinaryCache `
2538
2574
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2539
2575
- Platform $Platform `
2540
2576
- UseBuiltCompilers C, Swift `
@@ -2547,48 +2583,48 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2547
2583
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2548
2584
CMAKE_SYSTEM_NAME = $Platform.OS.ToString ();
2549
2585
2550
- SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \cmake\SwiftCore" ;
2551
- SwiftOverlay_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay ) \cmake\SwiftOverlay" ;
2586
+ SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
2587
+ SwiftOverlay_DIR = " ${OverlayBinaryCache} \cmake\SwiftOverlay" ;
2552
2588
}
2553
2589
2554
2590
Build-CMakeProject `
2555
2591
- Src $SourceCache \swift\Runtimes\Supplemental\Distributed `
2556
- - Bin ( Get-ProjectBinaryCache $Platform ExperimentalStaticDistributed) `
2592
+ - Bin $DistributedBinaryCache `
2557
2593
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2558
2594
- Platform $Platform `
2559
2595
- UseBuiltCompilers C, CXX, Swift `
2560
2596
- UseGNUDriver `
2561
2597
- Defines @ {
2562
2598
BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2563
2599
CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2564
- CMAKE_CXX_FLAGS = @ (" -I$ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \include" );
2600
+ CMAKE_CXX_FLAGS = @ (" -I${RuntimeBinaryCache} \include" );
2565
2601
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2566
2602
CMAKE_Swift_COMPILER_WORKS = " YES" ;
2567
2603
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2568
2604
CMAKE_SYSTEM_NAME = $Platform.OS.ToString ();
2569
2605
2570
- SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \cmake\SwiftCore" ;
2571
- SwiftOverlay_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay ) \cmake\SwiftOverlay" ;
2606
+ SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
2607
+ SwiftOverlay_DIR = " ${OverlayBinaryCache} \cmake\SwiftOverlay" ;
2572
2608
}
2573
2609
2574
2610
Build-CMakeProject `
2575
2611
- Src $SourceCache \swift\Runtimes\Supplemental\Observation `
2576
- - Bin ( Get-ProjectBinaryCache $Platform ExperimentalStaticObservation) `
2612
+ - Bin $ObservationBinaryCache `
2577
2613
- InstallTo " $ ( Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental" ) \usr" `
2578
2614
- Platform $Platform `
2579
2615
- UseBuiltCompilers CXX, Swift `
2580
2616
- UseGNUDriver `
2581
2617
- Defines @ {
2582
2618
BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2583
2619
CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2584
- CMAKE_CXX_FLAGS = @ (" -I$ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \include" );
2620
+ CMAKE_CXX_FLAGS = @ (" -I${RuntimeBinaryCache} \include" );
2585
2621
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2586
2622
CMAKE_Swift_COMPILER_WORKS = " YES" ;
2587
2623
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2588
2624
CMAKE_SYSTEM_NAME = $Platform.OS.ToString ();
2589
2625
2590
- SwiftCore_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime ) \cmake\SwiftCore" ;
2591
- SwiftOverlay_DIR = " $ ( Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay ) \cmake\SwiftOverlay" ;
2626
+ SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
2627
+ SwiftOverlay_DIR = " ${OverlayBinaryCache} \cmake\SwiftOverlay" ;
2592
2628
}
2593
2629
2594
2630
Build-CMakeProject `
0 commit comments