Skip to content

Commit 5e005b8

Browse files
authored
Remove all references to cmake for the builds in this repo (PowerShell#16578)
1 parent 0c60056 commit 5e005b8

File tree

5 files changed

+10
-36
lines changed

5 files changed

+10
-36
lines changed

build.psm1

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1930,11 +1930,7 @@ function Start-PSBootstrap {
19301930
$Deps = @()
19311931
if ($environment.IsLinux -and $environment.IsUbuntu) {
19321932
# Build tools
1933-
$Deps += "curl", "g++", "cmake", "make"
1934-
1935-
if ($BuildLinuxArm) {
1936-
$Deps += "gcc-arm-linux-gnueabihf", "g++-arm-linux-gnueabihf"
1937-
}
1933+
$Deps += "curl", "wget"
19381934

19391935
# .NET Core required runtime libraries
19401936
$Deps += "libunwind8"
@@ -1960,7 +1956,7 @@ function Start-PSBootstrap {
19601956
}
19611957
} elseif ($environment.IsLinux -and $environment.IsRedHatFamily) {
19621958
# Build tools
1963-
$Deps += "which", "curl", "gcc-c++", "cmake", "make"
1959+
$Deps += "which", "curl", "wget"
19641960

19651961
# .NET Core required runtime libraries
19661962
$Deps += "libicu", "libunwind"
@@ -1984,7 +1980,7 @@ function Start-PSBootstrap {
19841980
}
19851981
} elseif ($environment.IsLinux -and $environment.IsSUSEFamily) {
19861982
# Build tools
1987-
$Deps += "gcc", "cmake", "make"
1983+
$Deps += "wget"
19881984

19891985
# Packaging tools
19901986
if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff", 'libffi-devel' }
@@ -2009,9 +2005,6 @@ function Start-PSBootstrap {
20092005
$PackageManager = "$sudo port"
20102006
}
20112007

2012-
# Build tools
2013-
$Deps += "cmake"
2014-
20152008
# wget for downloading dotnet
20162009
$Deps += "wget"
20172010

@@ -2022,7 +2015,7 @@ function Start-PSBootstrap {
20222015
# ignore exitcode, because they may be already installed
20232016
Start-NativeExecution ([ScriptBlock]::Create("$PackageManager install $Deps")) -IgnoreExitcode
20242017
} elseif ($environment.IsLinux -and $environment.IsAlpine) {
2025-
$Deps += 'libunwind', 'libcurl', 'bash', 'cmake', 'clang', 'build-base', 'git', 'curl', 'wget'
2018+
$Deps += 'libunwind', 'libcurl', 'bash', 'build-base', 'git', 'curl', 'wget'
20262019

20272020
Start-NativeExecution {
20282021
Invoke-Expression "apk add $Deps"

docs/building/linux.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ refer to the [Working with the PowerShell Repository](../git/README.md),
1818

1919
### Toolchain Setup
2020

21-
We use the [.NET Command-Line Interface][dotnet-cli] (`dotnet`) to build the managed components,
22-
and [CMake][] to build the native components.
21+
We use the [.NET Command-Line Interface][dotnet-cli] (`dotnet`) to build the managed components.
2322

2423
Installing the toolchain is as easy as running `Start-PSBootstrap` in PowerShell.
2524
Of course, this requires a self-hosted copy of PowerShell on Linux.
@@ -55,7 +54,6 @@ The `Start-PSBootstrap` function does the following:
5554
If you want to use `dotnet` outside of `Start-PSBuild`, add `~/.dotnet` to your `PATH` environment variable.
5655

5756
[dotnet-cli]: https://docs.microsoft.com/dotnet/core/tools/
58-
[CMake]: https://cmake.org/cmake/help/v2.8.12/cmake.html
5957

6058
## Build using our module
6159

docs/building/macos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ From `pwsh.exe`, run `Import-Module ./build.psm1` and use `Start-PSBootstrap` to
1414

1515
The `Start-PSBootstrap` function does the following:
1616

17-
- Uses `brew` or `port` to install CMake, OpenSSL, and GNU WGet
17+
- Uses `brew` or `port` to install OpenSSL, and GNU WGet
1818
- Uninstalls any prior versions of .NET CLI
1919
- Downloads and installs .NET Core SDK to `~/.dotnet`
2020

test/perf/benchmarks/assets/compiler.test.ps1

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ function Start-PSBootstrap {
11491149
$Deps = @()
11501150
if ($environment.IsLinux -and $environment.IsUbuntu) {
11511151
# Build tools
1152-
$Deps += "curl", "g++", "cmake", "make"
1152+
$Deps += "curl", "g++", "make"
11531153

11541154
if ($BuildLinuxArm) {
11551155
$Deps += "gcc-arm-linux-gnueabihf", "g++-arm-linux-gnueabihf"
@@ -1179,7 +1179,7 @@ function Start-PSBootstrap {
11791179
}
11801180
} elseif ($environment.IsLinux -and $environment.IsRedHatFamily) {
11811181
# Build tools
1182-
$Deps += "which", "curl", "gcc-c++", "cmake", "make"
1182+
$Deps += "which", "curl", "gcc-c++", "make"
11831183

11841184
# .NET Core required runtime libraries
11851185
$Deps += "libicu", "libunwind"
@@ -1203,7 +1203,7 @@ function Start-PSBootstrap {
12031203
}
12041204
} elseif ($environment.IsLinux -and $environment.IsSUSEFamily) {
12051205
# Build tools
1206-
$Deps += "gcc", "cmake", "make"
1206+
$Deps += "gcc", "make"
12071207

12081208
# Packaging tools
12091209
if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff", 'libffi-devel' }
@@ -1228,17 +1228,14 @@ function Start-PSBootstrap {
12281228
$PackageManager = "$sudo port"
12291229
}
12301230

1231-
# Build tools
1232-
$Deps += "cmake"
1233-
12341231
# .NET Core required runtime libraries
12351232
$Deps += "openssl"
12361233

12371234
# Install dependencies
12381235
# ignore exitcode, because they may be already installed
12391236
Start-NativeExecution ([ScriptBlock]::Create("$PackageManager install $Deps")) -IgnoreExitcode
12401237
} elseif ($environment.IsLinux -and $environment.IsAlpine) {
1241-
$Deps += 'libunwind', 'libcurl', 'bash', 'cmake', 'clang', 'build-base', 'git', 'curl'
1238+
$Deps += 'libunwind', 'libcurl', 'bash', 'clang', 'build-base', 'git', 'curl'
12421239

12431240
Start-NativeExecution {
12441241
Invoke-Expression "apk add $Deps"

tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)