Skip to content
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.

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

[system-dependencies] Remove the cmake dependency. #21375

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,6 @@ MIN_MONO_URL=https://download.mono-project.com/archive/6.12.0/macos-10-universal
# Minimum Mono version for Xamarin.Mac apps using the system mono
MIN_XM_MONO_VERSION=6.4.0.94

# Minimum CMake version
MIN_CMAKE_URL=https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.dmg
MIN_CMAKE_VERSION=2.8.8

# ObjectiveSharpie min/max versions
MIN_SHARPIE_VERSION=3.5.115
MAX_SHARPIE_VERSION=3.5.999
Expand Down
49 changes: 1 addition & 48 deletions system-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ while ! test -z $1; do
unset IGNORE_MONO
shift
;;
--provision-cmake)
PROVISION_CMAKE=1
unset IGNORE_CMAKE
shift
;;
--provision-7z)
PROVISION_7Z=1
unset IGNORE_7Z
Expand Down Expand Up @@ -103,8 +98,6 @@ while ! test -z $1; do
unset IGNORE_VISUAL_STUDIO
PROVISION_XCODE=1
unset IGNORE_XCODE
PROVISION_CMAKE=1
unset IGNORE_CMAKE
PROVISION_7Z=1
unset IGNORE_7Z
PROVISION_HOMEBREW=1
Expand All @@ -130,7 +123,6 @@ while ! test -z $1; do
IGNORE_MONO=1
IGNORE_VISUAL_STUDIO=1
IGNORE_XCODE=1
IGNORE_CMAKE=1
IGNORE_7Z=1
IGNORE_HOMEBREW=1
IGNORE_SHARPIE=1
Expand Down Expand Up @@ -165,10 +157,6 @@ while ! test -z $1; do
IGNORE_PYTHON3=1
shift
;;
--ignore-cmake)
IGNORE_CMAKE=1
shift
;;
--ignore-7z)
IGNORE_7Z=1
shift
Expand Down Expand Up @@ -787,40 +775,6 @@ function check_checkout_dir () {
ok "Checkout location will not result in test problems."
}


function install_cmake () {
if ! brew --version >& /dev/null; then
fail "Asked to install cmake, but brew is not installed."
return
fi

brew install cmake
}

function check_cmake () {
if ! test -z $IGNORE_CMAKE; then return; fi

local MIN_CMAKE_VERSION=`grep MIN_CMAKE_VERSION= Make.config | sed 's/.*=//'`
local CMAKE_URL=`grep CMAKE_URL= Make.config | sed 's/.*=//'`

if ! cmake --version &> /dev/null; then
if ! test -z $PROVISION_CMAKE; then
install_cmake
else
fail "You must install CMake ($CMAKE_URL)"
fi
return
fi

ACTUAL_CMAKE_VERSION=$(cmake --version | grep "cmake version" | sed 's/cmake version //')
if ! is_at_least_version $ACTUAL_CMAKE_VERSION $MIN_CMAKE_VERSION; then
fail "You must have at least CMake $MIN_CMAKE_VERSION (found $ACTUAL_CMAKE_VERSION)"
return
fi

ok "Found CMake $ACTUAL_CMAKE_VERSION (at least $MIN_CMAKE_VERSION is required)"
}

function install_7z () {
if ! brew --version >& /dev/null; then
fail "Asked to install 7z, but brew is not installed."
Expand Down Expand Up @@ -861,7 +815,7 @@ IFS='
HOMEBREW_VERSION=($(brew --version 2>/dev/null))
log "Installed Homebrew ($HOMEBREW_VERSION)"
else
warn "Could not find Homebrew. Homebrew is required to auto-provision some dependencies (cmake), but not required otherwise."
warn "Could not find Homebrew. Homebrew is required to auto-provision some dependencies (p7zip), but not required otherwise."
fi
IFS=$IFS_tmp
}
Expand Down Expand Up @@ -1012,7 +966,6 @@ check_shellcheck
check_yamllint
check_python3
check_mono
check_cmake
check_7z
check_objective_sharpie
check_old_simulators
Expand Down
2 changes: 1 addition & 1 deletion tests/test-dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -ex

cd "$(dirname "$0")"
./system-dependencies.sh --provision-mono --ignore-xamarin-studio --ignore-xcode --ignore-osx --ignore-cmake --ignore-dotnet --ignore-shellcheck --ignore-yamllint
./system-dependencies.sh --provision-mono --ignore-xamarin-studio --ignore-xcode --ignore-osx --ignore-dotnet --ignore-shellcheck --ignore-yamllint
1 change: 0 additions & 1 deletion tools/devops/provision-shared.in.csx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ void ProvisionBrewPackages ()
BrewPackages (
"shellcheck",
"yamllint",
"cmake",
"p7zip",
"msitools",
"wget",
Expand Down