Skip to content

Commit 164cdf2

Browse files
committed
utils: precompute binary cache locations
1 parent 24c13e0 commit 164cdf2

File tree

1 file changed

+52
-16
lines changed

1 file changed

+52
-16
lines changed

utils/build.ps1

Lines changed: 52 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2468,9 +2468,45 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
24682468
Invoke-IsolatingEnvVars {
24692469
$env:Path = "$(Get-CMarkBinaryCache $Platform)\src;$(Get-PinnedToolchainRuntime);${env:Path}"
24702470

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+
24712507
Build-CMakeProject `
24722508
-Src $SourceCache\swift\Runtimes\Core `
2473-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime) `
2509+
-Bin $RuntimeBinaryCache `
24742510
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
24752511
-Platform $Platform `
24762512
-UseBuiltCompilers C,CXX,Swift `
@@ -2498,7 +2534,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
24982534

24992535
Build-CMakeProject `
25002536
-Src $SourceCache\swift\Runtimes\Overlay `
2501-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay) `
2537+
-Bin $OverlayBinaryCache `
25022538
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25032539
-Platform $Platform `
25042540
-UseBuiltCompilers C,CXX,Swift `
@@ -2511,12 +2547,12 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25112547
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25122548
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25132549

2514-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
2550+
SwiftCore_DIR = "${RuntimeBinaryCache}\cmake\SwiftCore";
25152551
}
25162552

25172553
Build-CMakeProject `
25182554
-Src $SourceCache\swift\Runtimes\Supplemental\StringProcessing `
2519-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticStringProcessing) `
2555+
-Bin $StringProcessingBinaryCache `
25202556
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25212557
-Platform $Platform `
25222558
-UseBuiltCompilers C,Swift `
@@ -2529,12 +2565,12 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25292565
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25302566
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25312567

2532-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
2568+
SwiftCore_DIR = "${RuntimeBinaryCache}\cmake\SwiftCore";
25332569
}
25342570

25352571
Build-CMakeProject `
25362572
-Src $SourceCache\swift\Runtimes\Supplemental\Synchronization `
2537-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticSynchronization) `
2573+
-Bin $SynchronizationBinaryCache `
25382574
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25392575
-Platform $Platform `
25402576
-UseBuiltCompilers C,Swift `
@@ -2547,48 +2583,48 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25472583
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25482584
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25492585

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";
25522588
}
25532589

25542590
Build-CMakeProject `
25552591
-Src $SourceCache\swift\Runtimes\Supplemental\Distributed `
2556-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticDistributed) `
2592+
-Bin $DistributedBinaryCache `
25572593
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25582594
-Platform $Platform `
25592595
-UseBuiltCompilers C,CXX,Swift `
25602596
-UseGNUDriver `
25612597
-Defines @{
25622598
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
25632599
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
2564-
CMAKE_CXX_FLAGS = @("-I$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\include");
2600+
CMAKE_CXX_FLAGS = @("-I${RuntimeBinaryCache}\include");
25652601
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
25662602
CMAKE_Swift_COMPILER_WORKS = "YES";
25672603
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25682604
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25692605

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";
25722608
}
25732609

25742610
Build-CMakeProject `
25752611
-Src $SourceCache\swift\Runtimes\Supplemental\Observation `
2576-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticObservation) `
2612+
-Bin $ObservationBinaryCache `
25772613
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25782614
-Platform $Platform `
25792615
-UseBuiltCompilers CXX,Swift `
25802616
-UseGNUDriver `
25812617
-Defines @{
25822618
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
25832619
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
2584-
CMAKE_CXX_FLAGS = @("-I$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\include");
2620+
CMAKE_CXX_FLAGS = @("-I${RuntimeBinaryCache}\include");
25852621
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
25862622
CMAKE_Swift_COMPILER_WORKS = "YES";
25872623
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25882624
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25892625

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";
25922628
}
25932629

25942630
Build-CMakeProject `

0 commit comments

Comments
 (0)