3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

Update vcpkg tool, add windows-arm64, and download rather than build on some POSIX (#20838)

Browse Source
This commit is contained in:
Billy O'Neal 2021-10-29 22:39:14 -07:00 committed by GitHub
parent d78a0b47bd
commit 5bdb9d6012
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 124 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/bootstrap.ps1
View File

@ -45,7 +45,13 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"
& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-09-10/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" $versionDate = '2021-10-25'
if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') {
& "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe"
} else {
& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
}
Write-Host "" Write-Host ""
if ($LASTEXITCODE -ne 0) if ($LASTEXITCODE -ne 0)

302
scripts/bootstrap.sh
View File

@ -1,34 +1,34 @@
#!/bin/sh #!/bin/sh
# Find .vcpkg-root, which indicates the root of this repo # Find .vcpkg-root.
vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P) vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
while [ "$vcpkgRootDir" != "/" ] && ! [ -e "$vcpkgRootDir/.vcpkg-root" ]; do while [ "$vcpkgRootDir" != "/" ] && ! [ -e "$vcpkgRootDir/.vcpkg-root" ]; do
vcpkgRootDir="$(dirname "$vcpkgRootDir")" vcpkgRootDir="$(dirname "$vcpkgRootDir")"
done done
# Argument parsing # Parse arguments.
vcpkgDisableMetrics="OFF" vcpkgDisableMetrics="OFF"
vcpkgUseSystem=false vcpkgUseSystem=false
vcpkgAllowAppleClang=false vcpkgUseMuslC="OFF"
vcpkgBuildTests="OFF"
for var in "$@" for var in "$@"
do do
if [ "$var" = "-disableMetrics" -o "$var" = "--disableMetrics" ]; then if [ "$var" = "-disableMetrics" -o "$var" = "--disableMetrics" ]; then
vcpkgDisableMetrics="ON" vcpkgDisableMetrics="ON"
elif [ "$var" = "-useSystemBinaries" -o "$var" = "--useSystemBinaries" ]; then elif [ "$var" = "-useSystemBinaries" -o "$var" = "--useSystemBinaries" ]; then
vcpkgUseSystem=true echo "Warning: -useSystemBinaries no longer has any effect; ignored. Note that the VCPKG_USE_SYSTEM_BINARIES environment variable behavior is not changed."
elif [ "$var" = "-allowAppleClang" -o "$var" = "--allowAppleClang" ]; then elif [ "$var" = "-allowAppleClang" -o "$var" = "--allowAppleClang" ]; then
vcpkgAllowAppleClang=true echo "Warning: -allowAppleClang no longer has any effect; ignored."
elif [ "$var" = "-buildTests" ]; then elif [ "$var" = "-buildTests" ]; then
vcpkgBuildTests="ON" echo "Warning: -buildTests no longer has any effect; ignored."
elif [ "$var" = "-musl" ]; then
vcpkgUseMuslC="ON"
elif [ "$var" = "-help" -o "$var" = "--help" ]; then elif [ "$var" = "-help" -o "$var" = "--help" ]; then
echo "Usage: ./bootstrap-vcpkg.sh [options]" echo "Usage: ./bootstrap-vcpkg.sh [options]"
echo echo
echo "Options:" echo "Options:"
echo " -help Display usage help" echo " -help Display usage help"
echo " -disableMetrics Do not build metrics reporting into the executable" echo " -disableMetrics Mark this vcpkg root to disable metrics."
echo " -useSystemBinaries Force use of the system utilities for building vcpkg" echo " -musl Use the musl binary rather than the glibc binary on Linux."
echo " -allowAppleClang Set VCPKG_ALLOW_APPLE_CLANG to build vcpkg in apple with clang anyway"
exit 1 exit 1
else else
echo "Unknown argument $var. Use '-help' for help." echo "Unknown argument $var. Use '-help' for help."
@ -50,6 +50,7 @@ if [ "$unixName" = "MINGW_NT" ]; then
exit 0 exit 0
fi fi
# Determine the downloads directory.
if [ -z ${VCPKG_DOWNLOADS+x} ]; then if [ -z ${VCPKG_DOWNLOADS+x} ]; then
downloadsDir="$vcpkgRootDir/downloads" downloadsDir="$vcpkgRootDir/downloads"
else else
@ -61,34 +62,88 @@ else
fi fi
extractStringBetweenDelimiters() # Check for minimal prerequisites.
{
input=$1;leftDelim=$2;rightDelim=$3
output="${input##*$leftDelim}"
output="${output%%$rightDelim*}"
echo "$output"
}
vcpkgCheckRepoTool() vcpkgCheckRepoTool()
{ {
__tool=$1 __tool=$1
if ! command -v "$__tool" >/dev/null 2>&1 ; then if ! command -v "$__tool" >/dev/null 2>&1 ; then
echo "Could not find $__tool. Please install it (and other dependencies) with:" echo "Could not find $__tool. Please install it (and other dependencies) with:"
echo "sudo apt-get install curl zip unzip tar" echo "On Debian and Ubuntu derivatives:"
echo " sudo apt-get install curl zip unzip tar"
echo "On recent Red Hat and Fedora derivatives:"
echo " sudo dnf install curl zip unzip tar"
echo "On older Red Hat and Fedora derivatives:"
echo " sudo yum install curl zip unzip tar"
echo "On SUSE Linux and derivatives:"
echo " sudo zypper install curl zip unzip tar"
echo "On Alpine:"
echo " apk add build-base cmake ninja zip unzip curl git"
echo " (and export VCPKG_FORCE_SYSTEM_BINARIES=1)"
exit 1 exit 1
fi fi
} }
vcpkgCheckBuildTool() vcpkgCheckRepoTool curl
{ vcpkgCheckRepoTool zip
__tool=$1 vcpkgCheckRepoTool unzip
if ! command -v "$__tool" >/dev/null 2>&1 ; then vcpkgCheckRepoTool tar
echo "Could not find $__tool. Please install it (and other dependencies) with:"
echo "sudo apt-get install cmake ninja-build"
exit 1
fi
}
UNAME="$(uname)"
ARCH="$(uname -m)"
if [ -e /etc/alpine-release ]; then
vcpkgUseSystem="ON"
vcpkgUseMuslC="ON"
fi
if [ "$UNAME" = "OpenBSD" ]; then
vcpkgUseSystem="ON"
if [ -z "$CXX" ]; then
CXX=/usr/bin/clang++
fi
if [ -z "$CC" ]; then
CC=/usr/bin/clang
fi
fi
if [ "$vcpkgUseSystem" = "ON" ]; then
vcpkgCheckRepoTool cmake
vcpkgCheckRepoTool ninja
vcpkgCheckRepoTool git
vcpkgCheckRepoTool gcc
fi
# Determine what we are going to do to bootstrap:
# MacOS -> Download vcpkg-macos
# Linux
# useMuslC -> download vcpkg-muslc
# amd64 -> download vcpkg-glibc
# Otherwise
# Download and build from source
# Choose the vcpkg binary to download
vcpkgDownloadTool="ON"
vcpkgToolReleaseTag="2021-10-25"
if [ "$UNAME" = "Darwin" ]; then
echo "Downloading vcpkg-macos..."
vcpkgToolReleaseSha="09bd5d6bab4d45952f43626562af3e959cb82c96324003f665b902ccf65f4600fa1f1e84cbd54ad1f6e390be99cde5b3a1e640a0c3280aface02fbd1e867773e"
vcpkgToolName="vcpkg-macos"
elif [ "$vcpkgUseMuslC" = "ON" ]; then
echo "Downloading vcpkg-muslc..."
vcpkgToolReleaseSha="a598e37855f72841f3cd36a7b3f67d3cdc25f0577d851cd8dbdd5ff16190972ce5b9d0ca60c6e54ed147d1315bdedcd84005dfabc427fbdaee5b74726a351ec7"
vcpkgToolName="vcpkg-muslc"
elif [ "$ARCH" = "x86_64" ]; then
echo "Downloading vcpkg-glibc..."
vcpkgToolReleaseSha="c8f40cf91512500176ce3f7569ec0c91cfc93693921fac2db04ce8af0a6b65bc9aca880b7ecc44223b814e894fef66147af321c45e1b75a8628a78d499c272a8"
vcpkgToolName="vcpkg-glibc"
else
echo "Unable to determine a binary release of vcpkg; attempting to build from source."
vcpkgDownloadTool="OFF"
vcpkgToolReleaseSha="b12cc1229c93f8745864ac67a76213ecb052fb06a233bad2d6ce7743f40e0e2a72d654660d4dadeae95b9d6dd663a8b6cd83ae723cd90d63e3c795a1f12692bb"
fi
# Do the download or build.
vcpkgCheckEqualFileHash() vcpkgCheckEqualFileHash()
{ {
url=$1; filePath=$2; expectedHash=$3 url=$1; filePath=$2; expectedHash=$3
@ -117,108 +172,26 @@ vcpkgCheckEqualFileHash()
vcpkgDownloadFile() vcpkgDownloadFile()
{ {
url=$1; downloadPath=$2 sha512=$3 url=$1; downloadPath=$2 sha512=$3
vcpkgCheckRepoTool "curl"
rm -rf "$downloadPath.part" rm -rf "$downloadPath.part"
curl -L $url --tlsv1.2 --create-dirs --retry 3 --output "$downloadPath.part" --silent --show-error --fail || exit 1 curl -L $url --tlsv1.2 --create-dirs --retry 3 --output "$downloadPath.part" --silent --show-error --fail || exit 1
vcpkgCheckEqualFileHash $url "$downloadPath.part" $sha512 vcpkgCheckEqualFileHash $url "$downloadPath.part" $sha512
chmod +x "$downloadPath.part"
mv "$downloadPath.part" "$downloadPath" mv "$downloadPath.part" "$downloadPath"
} }
vcpkgExtractArchive() vcpkgExtractTar()
{ {
archive=$1; toPath=$2 archive=$1; toPath=$2
rm -rf "$toPath" "$toPath.partial" rm -rf "$toPath" "$toPath.partial"
mkdir -p "$toPath.partial" mkdir -p "$toPath.partial"
$(cd "$toPath.partial" && tar xzf "$archive")
archiveType="${archive##*.}"
if [ "$archiveType" = "zip" ]; then
vcpkgCheckRepoTool "unzip"
$(cd "$toPath.partial" && unzip -qqo "$archive")
else
vcpkgCheckRepoTool "tar"
$(cd "$toPath.partial" && tar xzf "$archive")
fi
mv "$toPath.partial" "$toPath" mv "$toPath.partial" "$toPath"
} }
fetchTool() if [ "$vcpkgDownloadTool" = "ON" ]; then
{ vcpkgDownloadFile "https://github.com/microsoft/vcpkg-tool/releases/download/$vcpkgToolReleaseTag/$vcpkgToolName" "$vcpkgRootDir/vcpkg" $vcpkgToolReleaseSha
tool=$1; UNAME=$2; __output=$3 else
if [ "$tool" = "" ]; then
echo "No tool name provided"
return 1
fi
if [ "$UNAME" = "Linux" ]; then
os="linux"
elif [ "$UNAME" = "Darwin" ]; then
os="osx"
elif [ "$UNAME" = "FreeBSD" ]; then
os="freebsd"
else
echo "Unknown uname: $UNAME"
return 1
fi
xmlFileAsString=`cat "$vcpkgRootDir/scripts/vcpkgTools.xml"`
toolRegexStart="<tool name=\"$tool\" os=\"$os\">"
toolData="$(extractStringBetweenDelimiters "$xmlFileAsString" "$toolRegexStart" "</tool>")"
case "$toolData" in
"" | "<!xml"*)
echo "No entry for $toolRegexStart in $vcpkgRootDir/scripts/vcpkgTools.xml"
return 1
esac
version="$(extractStringBetweenDelimiters "$toolData" "<version>" "</version>")"
toolPath="$downloadsDir/tools/$tool-$version-$os"
exeRelativePath="$(extractStringBetweenDelimiters "$toolData" "<exeRelativePath>" "</exeRelativePath>")"
exePath="$toolPath/$exeRelativePath"
if [ -e "$exePath" ]; then
eval $__output="'$exePath'"
return 0
fi
isArchive=true
if [ $isArchive = true ]; then
archiveName="$(extractStringBetweenDelimiters "$toolData" "<archiveName>" "</archiveName>")"
downloadPath="$downloadsDir/$archiveName"
else
echo "Non-archives not supported yet"
return 1
fi
url="$(extractStringBetweenDelimiters "$toolData" "<url>" "</url>")"
sha512="$(extractStringBetweenDelimiters "$toolData" "<sha512>" "</sha512>")"
if ! [ -e "$downloadPath" ]; then
echo "Downloading $tool..."
vcpkgDownloadFile $url "$downloadPath" $sha512
echo "Downloading $tool... done."
else
vcpkgCheckEqualFileHash $url "$downloadPath" $sha512
fi
if [ $isArchive = true ]; then
echo "Extracting $tool..."
vcpkgExtractArchive "$downloadPath" "$toolPath"
echo "Extracting $tool... done."
fi
if ! [ -e "$exePath" ]; then
echo "Could not detect or download $tool"
return 1
fi
eval $__output="'$exePath'"
return 0
}
selectCXX()
{
if [ "x$CXX" = "x" ]; then if [ "x$CXX" = "x" ]; then
if which g++-11 >/dev/null 2>&1; then if which g++-11 >/dev/null 2>&1; then
CXX=g++-11 CXX=g++-11
@ -237,81 +210,40 @@ selectCXX()
fi fi
# If we can't find g++, allow CMake to do the look-up # If we can't find g++, allow CMake to do the look-up
fi fi
}
# Preparation vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz"
UNAME="$(uname)" vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball"
ARCH="$(uname -m)" baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg"
buildDir="$baseBuildDir/build"
tarballPath="$downloadsDir/$vcpkgToolReleaseTarball"
srcBaseDir="$baseBuildDir/src"
srcDir="$srcBaseDir/vcpkg-tool-$vcpkgToolReleaseTag"
# Force using system utilities for building vcpkg if host arch is arm, arm64, s390x, or ppc64le. if [ -e "$tarballPath" ]; then
if [ "$ARCH" = "armv7l" -o "$ARCH" = "aarch64" -o "$ARCH" = "s390x" -o "$ARCH" = "ppc64le" ]; then vcpkgCheckEqualFileHash "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha"
vcpkgUseSystem=true
fi
if [ "$UNAME" = "OpenBSD" ]; then
vcpkgUseSystem=true
if [ -z "$CXX" ]; then
CXX=/usr/bin/clang++
fi
if [ -z "$CC" ]; then
CC=/usr/bin/clang
fi
fi
if $vcpkgUseSystem; then
cmakeExe="cmake"
ninjaExe="ninja"
vcpkgCheckBuildTool "$cmakeExe"
vcpkgCheckBuildTool "$ninjaExe"
else
fetchTool "cmake" "$UNAME" cmakeExe || exit 1
fetchTool "ninja" "$UNAME" ninjaExe || exit 1
fi
if [ "$os" = "osx" ]; then
if [ "$vcpkgAllowAppleClang" = "true" ] || [[ $(sw_vers -productVersion | awk -F '.' '{print $1}') -ge 11 ]]; then
CXX=clang++
else else
selectCXX echo "Downloading vcpkg tool sources"
vcpkgDownloadFile "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha"
fi fi
else
selectCXX echo "Building vcpkg-tool..."
rm -rf "$baseBuildDir"
mkdir -p "$buildDir"
vcpkgExtractTar "$tarballPath" "$srcBaseDir"
cmakeConfigOptions="-DCMAKE_BUILD_TYPE=Release -G 'Ninja' -DVCPKG_DEVELOPMENT_WARNINGS=OFF"
if [ "${VCPKG_MAX_CONCURRENCY}" != "" ] ; then
cmakeConfigOptions=" $cmakeConfigOptions '-DCMAKE_JOB_POOL_COMPILE:STRING=compile' '-DCMAKE_JOB_POOL_LINK:STRING=link' '-DCMAKE_JOB_POOLS:STRING=compile=$VCPKG_MAX_CONCURRENCY;link=$VCPKG_MAX_CONCURRENCY' "
fi
(cd "$buildDir" && CXX="$CXX" eval cmake "$srcDir" $cmakeConfigOptions) || exit 1
(cd "$buildDir" && cmake --build .) || exit 1
rm -rf "$vcpkgRootDir/vcpkg"
cp "$buildDir/vcpkg" "$vcpkgRootDir/"
fi fi
# Do the build # Apply the disable-metrics marker file.
vcpkgToolReleaseTag="2021-09-10"
vcpkgToolReleaseSha="0bea4c7bdd91933d44a0214e2202eb5ef988826d32ae7a00a8868e510710e7de0b336b1cc6aa1ea20af2f6e24d92f2ab665046089bb4ec43bc2add94a901d5fc"
vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz"
vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball"
baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg"
buildDir="$baseBuildDir/build"
tarballPath="$downloadsDir/$vcpkgToolReleaseTarball"
srcBaseDir="$baseBuildDir/src"
srcDir="$srcBaseDir/vcpkg-tool-$vcpkgToolReleaseTag"
if [ -e "$tarballPath" ]; then
vcpkgCheckEqualFileHash "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha"
else
echo "Downloading vcpkg tool sources"
vcpkgDownloadFile "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha"
fi
echo "Building vcpkg-tool..."
rm -rf "$baseBuildDir"
mkdir -p "$buildDir"
vcpkgExtractArchive "$tarballPath" "$srcBaseDir"
cmakeConfigOptions="-DCMAKE_BUILD_TYPE=Release -G 'Ninja' -DCMAKE_MAKE_PROGRAM='$ninjaExe'"
if [ "${VCPKG_MAX_CONCURRENCY}" != "" ] ; then
cmakeConfigOptions=" $cmakeConfigOptions '-DCMAKE_JOB_POOL_COMPILE:STRING=compile' '-DCMAKE_JOB_POOL_LINK:STRING=link' '-DCMAKE_JOB_POOLS:STRING=compile=$VCPKG_MAX_CONCURRENCY;link=$VCPKG_MAX_CONCURRENCY' "
fi
(cd "$buildDir" && CXX="$CXX" eval "$cmakeExe" "$srcDir" $cmakeConfigOptions "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1
(cd "$buildDir" && "$cmakeExe" --build .) || exit 1
rm -rf "$vcpkgRootDir/vcpkg"
cp "$buildDir/vcpkg" "$vcpkgRootDir/"
if [ "$vcpkgDisableMetrics" = "ON" ]; then if [ "$vcpkgDisableMetrics" = "ON" ]; then
touch "$vcpkgRootDir/vcpkg.disable-metrics" touch "$vcpkgRootDir/vcpkg.disable-metrics"
elif ! [ -f "$vcpkgRootDir/vcpkg.disable-metrics" ]; then elif ! [ -f "$vcpkgRootDir/vcpkg.disable-metrics" ]; then

2
scripts/ci.baseline.txt
View File

@ -643,8 +643,6 @@ libmpeg2:x64-uwp=fail
libmupdf:x64-osx=fail libmupdf:x64-osx=fail
libmysql:x86-windows=fail libmysql:x86-windows=fail
libmysql:arm64-windows=fail libmysql:arm64-windows=fail
libopenmpt:x64-linux=fail
libopenmpt:x64-osx=fail
libopusenc:arm-uwp=fail libopusenc:arm-uwp=fail
libopusenc:x64-uwp=fail libopusenc:x64-uwp=fail
libosip2:x64-windows-static-md=fail libosip2:x64-windows-static-md=fail