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