8000 Remove all references to cmake for the builds in this repo by TravisEz13 · Pull Request #16578 · PowerShell/PowerShell · GitHub
[go: up one dir, main page]
Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 26, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
beafd4e
remove all references to cmake for the builds in this repo
TravisEz13 Dec 8, 2021
b170f59
remove native arm depenecies
TravisEz13 Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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' }
Expand All @@ -2009,9 +2005,6 @@ function Start-PSBootstrap {
$PackageManager = "$sudo port"
}

# Build tools
$Deps += "cmake"

# wget for downloading dotnet
$Deps += "wget"

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

Start-NativeExecution {
Invoke-Expression "apk add $Deps"
Expand Down
4 changes: 1 addition & 3 deletions docs/building/linux.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/building/macos.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
11 changes: 4 additions & 7 deletions test/perf/benchmarks/assets/compiler.test.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,7 @@ function Start-PSBootstrap {
$Deps = @()
if ($environment.IsLinux -and $environment.IsUbuntu) {
# Build tools
$Deps += "curl", "g++", "cmake", "make"
$Deps += "curl", "g++", "make"

if ($BuildLinuxArm) {
$Deps += "gcc-arm-linux-gnueabihf", "g++-arm-linux-gnueabihf"
Expand Down Expand Up @@ -1179,7 +1179,7 @@ function Start-PSBootstrap {
}
} elseif ($environment.IsLinux -and $environment.IsRedHatFamily) {
# Build tools
$Deps += "which", "curl", "gcc-c++", "cmake", "make"
$Deps += "which", "curl", "gcc-c++", "make"

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

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

# Build tools
$Deps += "cmake"

# .NET Core required runtime libraries
$Deps += "openssl"

# Install dependencies
# 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', 'clang', 'build-base', 'git', 'curl'

Start-NativeExecution {
Invoke-Expression "apk add $Deps"
Expand Down
14 changes: 0 additions & 14 deletions tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile
View file
Open in desktop

This file was deleted.

0