8000 Remove all references to `cmake` for the builds in this repo (#16578) · daxian-dbw/PowerShell@96bdcfc · GitHub
[go: up one dir, main page]

Skip to content

Commit 96bdcfc

Browse files
committed
Remove all references to cmake for the builds in this repo (PowerShell#16578)
# Conflicts: # build.psm1 # test/perf/benchmarks/assets/compiler.test.ps1 # Conflicts: # docs/building/linux.md # Conflicts: # build.psm1
1 parent 8f73463 commit 96bdcfc

File tree

4 files changed

+9
-29
lines changed

4 files changed

+9
-29
lines changed

build.psm1

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1751,11 +1751,7 @@ function Start-PSBootstrap {
17511751
$Deps = @()
17521752
if ($Environment.IsUbuntu) {
17531753
# Build tools
1754-
$Deps += "curl", "g++", "cmake", "make"
1755-
1756-
if ($BuildLinuxArm) {
1757-
$Deps += "gcc-arm-linux-gnueabihf", "g++-arm-linux-gnueabihf"
1758-
}
1754+
$Deps += "curl", "wget"
17591755

17601756
# .NET Core required runtime libraries
17611757
$Deps += "libunwind8"
@@ -1781,7 +1777,7 @@ function Start-PSBootstrap {
17811777
}
17821778
} elseif ($Environment.IsRedHatFamily) {
17831779
# Build tools
1784-
$Deps += "which", "curl", "gcc-c++", "cmake", "make"
1780+
$Deps += "which", "curl", "wget"
17851781

17861782
# .NET Core required runtime libraries
17871783
$Deps += "libicu", "libunwind"
@@ -1805,7 +1801,7 @@ function Start-PSBootstrap {
18051801
}
18061802
} elseif ($Environment.IsSUSEFamily) {
18071803
# Build tools
1808-
$Deps += "gcc", "cmake", "make"
1804+
$Deps += "wget"
18091805

18101806
# Packaging tools
18111807
if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff", 'libffi-devel' }
@@ -1830,8 +1826,8 @@ function Start-PSBootstrap {
18301826
$PackageManager = "$sudo port"
18311827
}
18321828

1833-
# Build tools
1834-
$Deps += "cmake"
1829+
# wget for downloading dotnet
1830+
$Deps += "wget"
18351831

18361832
# .NET Core required runtime libraries
18371833
$Deps += "openssl"
@@ -1840,7 +1836,7 @@ function Start-PSBootstrap {
18401836
# ignore exitcode, because they may be already installed
18411837
Start-NativeExecution ([ScriptBlock]::Create("$PackageManager install $Deps")) -IgnoreExitcode
18421838
} elseif ($Environment.IsAlpine) {
1843-
$Deps += 'libunwind', 'libcurl', 'bash', 'cmake', 'clang', 'build-base', 'git', 'curl'
1839+
$Deps += 'libunwind', 'libcurl', 'bash', 'build-base', 'git', 'curl', 'wget'
18441840

18451841
Start-NativeExecution {
18461842
Invoke-Expression "apk add $Deps"

docs/building/linux.md

Lines changed: 2 additions & 4 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.
@@ -54,8 +53,7 @@ The `Start-PSBootstrap` function does the following:
5453

5554
If you want to use `dotnet` outside of `Start-PSBuild`, add `~/.dotnet` to your `PATH` environment variable.
5655

57-
[dotnet-cli]: https://github.com/dotnet/cli
58-
[CMake]: https://cmake.org/cmake/help/v2.8.12/cmake.html
56+
[dotnet-cli]: https://docs.microsoft.com/dotnet/core/tools/
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

tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile

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

0 commit comments

Comments
 (0)
0