Remove all references to cmake for the builds in this repo (#16578)

# Conflicts:
#	build.psm1
#	test/perf/benchmarks/assets/compiler.test.ps1
This commit is contained in:
Travis Plunk
2022-03-07 10:12:23 -08:00
committed by travis plunk
parent e6755c0f35
commit 64ff0fc799
4 changed files with 8 additions and 28 deletions
+6 -10
View File
@@ -1930,11 +1930,7 @@ function Start-PSBootstrap {
$Deps = @()
if ($environment.IsLinux -and $environment.IsUbuntu) {
# Build tools
$Deps += "curl", "g++", "cmake", "make"
if ($BuildLinuxArm) {
$Deps += "gcc-arm-linux-gnueabihf", "g++-arm-linux-gnueabihf"
}
$Deps += "curl", "wget"
# .NET Core required runtime libraries
$Deps += "libunwind8"
@@ -1960,7 +1956,7 @@ function Start-PSBootstrap {
}
} elseif ($environment.IsLinux -and $environment.IsRedHatFamily) {
# Build tools
$Deps += "which", "curl", "gcc-c++", "cmake", "make"
$Deps += "which", "curl", "wget"
# .NET Core required runtime libraries
$Deps += "libicu", "libunwind"
@@ -1984,7 +1980,7 @@ function Start-PSBootstrap {
}
} elseif ($environment.IsLinux -and $environment.IsSUSEFamily) {
# Build tools
$Deps += "gcc", "cmake", "make"
$Deps += "wget"
# Packaging tools
if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff", 'libffi-devel' }
@@ -2009,8 +2005,8 @@ function Start-PSBootstrap {
$PackageManager = "$sudo port"
}
# Build tools
$Deps += "cmake"
# wget for downloading dotnet
$Deps += "wget"
# .NET Core required runtime libraries
$Deps += "openssl"
@@ -2019,7 +2015,7 @@ function Start-PSBootstrap {
# ignore exitcode, because they may be already installed
Start-NativeExecution ([ScriptBlock]::Create("$PackageManager install $Deps")) -IgnoreExitcode
} elseif ($environment.IsLinux -and $environment.IsAlpine) {
$Deps += 'libunwind', 'libcurl', 'bash', 'cmake', 'clang', 'build-base', 'git', 'curl'
$Deps += 'libunwind', 'libcurl', 'bash', 'build-base', 'git', 'curl', 'wget'
Start-NativeExecution {
Invoke-Expression "apk add $Deps"
+1 -3
View File
@@ -18,8 +18,7 @@ refer to the [Working with the PowerShell Repository](../git/README.md),
### Toolchain Setup
We use the [.NET Command-Line Interface][dotnet-cli] (`dotnet`) to build the managed components,
and [CMake][] to build the native components.
We use the [.NET Command-Line Interface][dotnet-cli] (`dotnet`) to build the managed components.
Installing the toolchain is as easy as running `Start-PSBootstrap` in PowerShell.
Of course, this requires a self-hosted copy of PowerShell on Linux.
@@ -55,7 +54,6 @@ The `Start-PSBootstrap` function does the following:
If you want to use `dotnet` outside of `Start-PSBuild`, add `~/.dotnet` to your `PATH` environment variable.
[dotnet-cli]: https://docs.microsoft.com/dotnet/core/tools/
[CMake]: https://cmake.org/cmake/help/v2.8.12/cmake.html
## Build using our module
+1 -1
View File
@@ -14,7 +14,7 @@ From `pwsh.exe`, run `Import-Module ./build.psm1` and use `Start-PSBootstrap` to
The `Start-PSBootstrap` function does the following:
- Uses `brew` or `port` to install CMake, OpenSSL, and GNU WGet
- Uses `brew` or `port` to install OpenSSL, and GNU WGet
- Uninstalls any prior versions of .NET CLI
- Downloads and installs .NET Core SDK to `~/.dotnet`
@@ -1,14 +0,0 @@
# Docker image file that describes an Centos7 image with PowerShell installed from Microsoft YUM Repo
FROM mcr.microsoft.com/powershell:alpine-3.12
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
# Install dependencies and clean up
RUN apk update \
&& apk add libunwind libcurl cmake clang build-base git bash curl
COPY PowerShellPackage.ps1 /
ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
ENTRYPOINT [ "pwsh" ]