mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 19:42:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Update vcpkg tools (#18817)

Browse Source 
* [perl/nuget] Update to latest release

* Update nuget to 5.10.0 in vcpkgTools.xml

* Update git aria2 scons go doxygen ruby bazel python3

* Update clang

* Update meson to 5.8.1

* Update the baseline verison

* Update vswhere to 2.8.4

* Update gsutil, add x86 nodejs on windows

* Update git to 2.32.0.2

* Update the doc

* Revert changes for adding nodejs

Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
This commit is contained in:
Phoebe 2021-07-23 06:50:23 +08:00 committed by GitHub
parent dad6d64276
commit 16aeda9c21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 80 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/tool-meson/vcpkg.json
View File

@ -1,6 +1,6 @@
{ {
"name": "tool-meson", "name": "tool-meson",
"version": "0.58.0", "version": "0.58.1",
"description": "Meson build system", "description": "Meson build system",
"homepage": "https://github.com/mesonbuild/meson" "homepage": "https://github.com/mesonbuild/meson"
} }

77
scripts/cmake/vcpkg_find_acquire_program.cmake
View File

@ -66,7 +66,7 @@ function(vcpkg_find_acquire_program VAR)
if(VAR MATCHES "PERL") if(VAR MATCHES "PERL")
set(PROGNAME perl) set(PROGNAME perl)
set(PERL_VERSION 5.30.0.1) set(PERL_VERSION 5.32.1.1)
set(SUBDIR ${PERL_VERSION}) set(SUBDIR ${PERL_VERSION})
set(PATHS ${DOWNLOADS}/tools/perl/${SUBDIR}/perl/bin) set(PATHS ${DOWNLOADS}/tools/perl/${SUBDIR}/perl/bin)
set(BREW_PACKAGE_NAME "perl") set(BREW_PACKAGE_NAME "perl")
@ -75,7 +75,7 @@ function(vcpkg_find_acquire_program VAR)
"https://strawberryperl.com/download/${PERL_VERSION}/strawberry-perl-${PERL_VERSION}-32bit.zip" "https://strawberryperl.com/download/${PERL_VERSION}/strawberry-perl-${PERL_VERSION}-32bit.zip"
) )
set(ARCHIVE "strawberry-perl-${PERL_VERSION}-32bit.zip") set(ARCHIVE "strawberry-perl-${PERL_VERSION}-32bit.zip")
set(HASH d353d3dc743ebdc6d1e9f6f2b7a6db3c387c1ce6c890bae8adc8ae5deae8404f4c5e3cf249d1e151e7256d4c5ee9cd317e6c41f3b6f244340de18a24b938e0c4) set(HASH 936381254fea2e596db6a16c23b08ced25c4081fda484e1b8c4356755016e4b956bd00f3d2ee651d5f41a7695e9998f6c1ac3f4a237212b9c55aca8c5fea14e9)
elseif(VAR MATCHES "NASM") elseif(VAR MATCHES "NASM")
set(PROGNAME nasm) set(PROGNAME nasm)
set(NASM_VERSION 2.15.05) set(NASM_VERSION 2.15.05)
@ -102,11 +102,12 @@ function(vcpkg_find_acquire_program VAR)
elseif(VAR MATCHES "GIT") elseif(VAR MATCHES "GIT")
set(PROGNAME git) set(PROGNAME git)
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(GIT_VERSION 2.26.2) set(GIT_BASE_VERSION 2.32.0)
set(SUBDIR "git-${GIT_VERSION}-1-windows") set(GIT_VERSION 2.32.0.2)
set(URL "https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.1/PortableGit-${GIT_VERSION}-32-bit.7z.exe") set(SUBDIR "git-${GIT_VERSION}-2-windows")
set(URL "https://github.com/git-for-windows/git/releases/download/v${GIT_BASE_VERSION}.windows.2/PortableGit-${GIT_VERSION}-32-bit.7z.exe")
set(ARCHIVE "PortableGit-${GIT_VERSION}-32-bit.7z.exe") set(ARCHIVE "PortableGit-${GIT_VERSION}-32-bit.7z.exe")
set(HASH d3cb60d62ca7b5d05ab7fbed0fa7567bec951984568a6c1646842a798c4aaff74bf534cf79414a6275c1927081a11b541d09931c017bf304579746e24fe57b36) set(HASH 867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348)
set(PATHS set(PATHS
"${DOWNLOADS}/tools/${SUBDIR}/mingw32/bin" "${DOWNLOADS}/tools/${SUBDIR}/mingw32/bin"
"${DOWNLOADS}/tools/git/${SUBDIR}/mingw32/bin") "${DOWNLOADS}/tools/git/${SUBDIR}/mingw32/bin")
@ -138,13 +139,13 @@ function(vcpkg_find_acquire_program VAR)
set(ARCHIVE "gn-${GN_PLATFORM}.zip") set(ARCHIVE "gn-${GN_PLATFORM}.zip")
elseif(VAR MATCHES "GO") elseif(VAR MATCHES "GO")
set(PROGNAME go) set(PROGNAME go)
set(SUBDIR 1.13.1.windows-386) set(SUBDIR 1.16.6.windows-386)
set(PATHS ${DOWNLOADS}/tools/go/${SUBDIR}/go/bin) set(PATHS ${DOWNLOADS}/tools/go/${SUBDIR}/go/bin)
set(BREW_PACKAGE_NAME "go") set(BREW_PACKAGE_NAME "go")
set(APT_PACKAGE_NAME "golang-go") set(APT_PACKAGE_NAME "golang-go")
set(URL "https://dl.google.com/go/go${SUBDIR}.zip") set(URL "https://dl.google.com/go/go${SUBDIR}.zip")
set(ARCHIVE "go${SUBDIR}.zip") set(ARCHIVE "go${SUBDIR}.zip")
set(HASH 2ab0f07e876ad98d592351a8808c2de42351ab387217e088bc4c5fa51d6a835694c501e2350802323b55a27dc0157f8b70045597f789f9e50f5ceae50dea3027) set(HASH 2a1e539ed628c0cca5935d24d22cf3a7165f5c80e12a4003ac184deae6a6d0aa31f582f3e8257b0730adfc09aeec3a0e62f4732e658c312d5382170bcd8c94d8)
elseif(VAR MATCHES "PYTHON3") elseif(VAR MATCHES "PYTHON3")
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(PROGNAME python) set(PROGNAME python)
@ -193,10 +194,11 @@ function(vcpkg_find_acquire_program VAR)
endif() endif()
elseif(VAR MATCHES "RUBY") elseif(VAR MATCHES "RUBY")
set(PROGNAME "ruby") set(PROGNAME "ruby")
set(PATHS ${DOWNLOADS}/tools/ruby/rubyinstaller-2.6.3-1-x86/bin) set(RUBY_VERSION 2.7.4-1)
set(URL https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.3-1/rubyinstaller-2.6.3-1-x86.7z) set(PATHS ${DOWNLOADS}/tools/ruby/rubyinstaller-${RUBY_VERSION}-x86/bin)
set(ARCHIVE rubyinstaller-2.6.3-1-x86.7z) set(URL https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-${RUBY_VERSION}/rubyinstaller-${RUBY_VERSION}-x86.7z)
set(HASH 4322317dd02ce13527bf09d6e6a7787ca3814ea04337107d28af1ac360bd272504b32e20ed3ea84eb5b21dae7b23bfe5eb0e529b6b0aa21a1a2bbb0a542d7aec) set(ARCHIVE rubyinstaller-${RUBY_VERSION}-x86.7z)
set(HASH 4bf459c987b407bdda328c52d95060bf6ad48fc3e5ed5f64d4b205c5b4153c7a00cb6f9da6c0bcd5f2e001e9dc3dda0b72269ec4afdeffd658b93c085cd1d859)
elseif(VAR MATCHES "JOM") elseif(VAR MATCHES "JOM")
set(PROGNAME jom) set(PROGNAME jom)
set(SUBDIR "jom-1.1.3") set(SUBDIR "jom-1.1.3")
@ -241,29 +243,29 @@ function(vcpkg_find_acquire_program VAR)
set(VERSION_CMD --version) set(VERSION_CMD --version)
elseif(VAR MATCHES "NUGET") elseif(VAR MATCHES "NUGET")
set(PROGNAME nuget) set(PROGNAME nuget)
set(SUBDIR "5.5.1") set(SUBDIR "5.10.0")
set(PATHS "${DOWNLOADS}/tools/nuget-${SUBDIR}-windows") set(PATHS "${DOWNLOADS}/tools/nuget-${SUBDIR}-windows")
set(BREW_PACKAGE_NAME "nuget") set(BREW_PACKAGE_NAME "nuget")
set(URL "https://dist.nuget.org/win-x86-commandline/v5.5.1/nuget.exe") set(URL "https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe")
set(_vfa_RENAME "nuget.exe") set(_vfa_RENAME "nuget.exe")
set(ARCHIVE "nuget.5.5.1.exe") set(ARCHIVE "nuget.5.10.0.exe")
set(NOEXTRACT ON) set(NOEXTRACT ON)
set(HASH 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619) set(HASH c4b7375e46cdb843096ce491b9809e0dc86773ba7b6333f13d49ec414b2953112df82ee8b833fd31be0cc7fe0fff1af88f3c07aa9553ad03f7f6c5a6eec2057e)
elseif(VAR MATCHES "MESON") elseif(VAR MATCHES "MESON")
set(MESON_VERSION 0.58.0) set(MESON_VERSION 0.58.1)
set(PROGNAME meson) set(PROGNAME meson)
set(REQUIRED_INTERPRETER PYTHON3) set(REQUIRED_INTERPRETER PYTHON3)
set(APT_PACKAGE_NAME "meson") set(APT_PACKAGE_NAME "meson")
set(BREW_PACKAGE_NAME "meson") set(BREW_PACKAGE_NAME "meson")
set(SCRIPTNAME meson meson.py) set(SCRIPTNAME meson meson.py)
set(REF 753954be868ed78b3e339e8811fd1d29eb2af237) set(REF aeda7f249c4a5dbbecc52e44f382246a2377b5b0)
set(PATHS ${DOWNLOADS}/tools/meson/meson-${REF}) set(PATHS ${DOWNLOADS}/tools/meson/meson-${REF})
set(URL "https://github.com/mesonbuild/meson/archive/${REF}.tar.gz") set(URL "https://github.com/mesonbuild/meson/archive/${REF}.tar.gz")
set(ARCHIVE "meson-${REF}.tar.gz") set(ARCHIVE "meson-${REF}.tar.gz")
#set(PATHS ${DOWNLOADS}/tools/meson/meson-${MESON_VERSION}) #set(PATHS ${DOWNLOADS}/tools/meson/meson-${MESON_VERSION})
#set(URL "https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz") #set(URL "https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz")
#set(ARCHIVE "meson-${MESON_VERSION}.tar.gz") #set(ARCHIVE "meson-${MESON_VERSION}.tar.gz")
set(HASH 1e5b5ac216cb41af40b3e72240f3cb319772a02aaea39f672085aafb41c3c732c932c9d0c4e8deb5b4b1ec1112860e6a3ddad59898bebbd165ed7876c87728b3) set(HASH 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2)
set(_vfa_SUPPORTED ON) set(_vfa_SUPPORTED ON)
set(VERSION_CMD --version) set(VERSION_CMD --version)
elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON") elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON")
@ -298,7 +300,8 @@ function(vcpkg_find_acquire_program VAR)
endif() endif()
elseif(VAR MATCHES "CLANG") elseif(VAR MATCHES "CLANG")
set(PROGNAME clang) set(PROGNAME clang)
set(SUBDIR "clang-10.0.0") set(SUBDIR "clang-12.0.0")
set(LLVM_VERSION 12.0.0)
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(PATHS set(PATHS
# Support LLVM in Visual Studio 2019 # Support LLVM in Visual Studio 2019
@ -316,13 +319,13 @@ function(vcpkg_find_acquire_program VAR)
endif() endif()
if(HOST_ARCH_ MATCHES "64") if(HOST_ARCH_ MATCHES "64")
set(URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe") set(URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/LLVM-${LLVM_VERSION}-win64.exe")
set(ARCHIVE "LLVM-10.0.0-win64.7z.exe") set(ARCHIVE "LLVM-${LLVM_VERSION}-win64.7z.exe")
set(HASH 3603a4be3548dabc7dda94f3ed4384daf8a94337e44ee62c0d54776c79f802b0cb98fc106e902409942e841c39bc672cc6d61153737ad1cc386b609ef25db71c) set(HASH 67a9b54abad5143fa5f79f0cfc184be1394c9fc894fa9cee709943cb6ccbde8f0ea6003d8fcc20eccf035631abe4009cc0f694ac84e7879331cebba8125e4c7f)
else() else()
set(URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win32.exe") set(URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/LLVM-${LLVM_VERSION}-win32.exe")
set(ARCHIVE "LLVM-10.0.0-win32.7z.exe") set(ARCHIVE "LLVM-${LLVM_VERSION}-win32.7z.exe")
set(HASH 8494922b744ca0dc8d075a1d3a35a0db5a9287544afd5c4984fa328bc26f291209f6030175896b4895019126f5832045e06d8ad48072b549916df29a2228348b) set(HASH 92fa5252fd08c1414ee6d71e2544cd2c44872124c47225f8d98b3af711d20e699f2888bc30642dfd00e005013da1607a593674fb4878951cc434694f9a119199)
endif() endif()
endif() endif()
set(BREW_PACKAGE_NAME "llvm") set(BREW_PACKAGE_NAME "llvm")
@ -354,13 +357,13 @@ function(vcpkg_find_acquire_program VAR)
set(HASH 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516) set(HASH 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516)
elseif(VAR MATCHES "SCONS") elseif(VAR MATCHES "SCONS")
set(PROGNAME scons) set(PROGNAME scons)
set(SCONS_VERSION 3.0.1) set(SCONS_VERSION 4.1.0)
set(SUBDIR ${SCONS_VERSION}) set(SUBDIR ${SCONS_VERSION})
set(REQUIRED_INTERPRETER PYTHON2) set(REQUIRED_INTERPRETER PYTHON2)
set(SCRIPTNAME "scons.py") set(SCRIPTNAME "scons.py")
set(URL "https://sourceforge.net/projects/scons/files/scons-local-${SCONS_VERSION}.zip/download") set(URL "https://sourceforge.net/projects/scons/files/scons-local-${SCONS_VERSION}.zip/download")
set(ARCHIVE "scons-local-${SCONS_VERSION}.zip") set(ARCHIVE "scons-local-${SCONS_VERSION}.zip")
set(HASH fe121b67b979a4e9580c7f62cfdbe0c243eba62a05b560d6d513ac7f35816d439b26d92fc2d7b7d7241c9ce2a49ea7949455a17587ef53c04a5f5125ac635727) set(HASH b173176ce8aca25039c64fcc68ec1b9ad31e03a926fd545e7631b3f9b374d914adffc593f505e3e7e2867b0ffe85e8deb0b39afe314edf05d02974ce5db1badb)
elseif(VAR MATCHES "SWIG") elseif(VAR MATCHES "SWIG")
set(SWIG_VERSION 4.0.2) set(SWIG_VERSION 4.0.2)
set(PROGNAME swig) set(PROGNAME swig)
@ -381,19 +384,19 @@ function(vcpkg_find_acquire_program VAR)
elseif(VAR MATCHES "DOXYGEN") elseif(VAR MATCHES "DOXYGEN")
set(PROGNAME doxygen) set(PROGNAME doxygen)
set(DOXYGEN_VERSION 1.8.17) set(DOXYGEN_VERSION 1.9.1)
set(SOURCEFORGE_ARGS set(SOURCEFORGE_ARGS
REPO doxygen REPO doxygen
REF rel-${DOXYGEN_VERSION} REF rel-${DOXYGEN_VERSION}
FILENAME "doxygen-${DOXYGEN_VERSION}.windows.bin.zip" FILENAME "doxygen-${DOXYGEN_VERSION}.windows.bin.zip"
SHA512 6bac47ec552486783a70cc73b44cf86b4ceda12aba6b52835c2221712bd0a6c845cecec178c9ddaa88237f5a781f797add528f47e4ed017c7888eb1dd2bc0b4b SHA512 c3eeb6b9fa4eab70fb6b0864fbbf94fb8050f3fee38d117cf470921a80e3569cc1c8b0272604d6731e05f01790cfaa70e159bec5d0882fc4f2d8ae4a5d52a21b
NO_REMOVE_ONE_LEVEL NO_REMOVE_ONE_LEVEL
WORKING_DIRECTORY "${DOWNLOADS}/tools/doxygen" WORKING_DIRECTORY "${DOWNLOADS}/tools/doxygen"
) )
set(SUBDIR 6bac47ec55-25c819fd77) set(SUBDIR c3eeb6b9fa-76d69c6db5)
elseif(VAR MATCHES "BAZEL") elseif(VAR MATCHES "BAZEL")
set(PROGNAME bazel) set(PROGNAME bazel)
set(BAZEL_VERSION 3.7.0) set(BAZEL_VERSION 4.1.0)
set(_vfa_RENAME "bazel") set(_vfa_RENAME "bazel")
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
set(_vfa_SUPPORTED ON) set(_vfa_SUPPORTED ON)
@ -401,27 +404,27 @@ function(vcpkg_find_acquire_program VAR)
set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${SUBDIR}-x86_64") set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${SUBDIR}-x86_64")
set(ARCHIVE "bazel-${SUBDIR}-x86_64") set(ARCHIVE "bazel-${SUBDIR}-x86_64")
set(NOEXTRACT ON) set(NOEXTRACT ON)
set(HASH 1118eb939627cc5570616f7bd41c72a90df9bb4a3c802eb8149b5b2eebf27090535c029590737557e270c5a8556267b8c1843eb0ff55dc9e4b82581a64e07ec1) set(HASH 50aa0894dbeedb9189a56f17baa8cecfa55c5f9c1f93a61b9ab5e10984754a400884fc9802b4979f536778e15f813a72807396b4b47694e4c05eadb841361c69)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
set(_vfa_SUPPORTED ON) set(_vfa_SUPPORTED ON)
set(SUBDIR ${BAZEL_VERSION}-darwin) set(SUBDIR ${BAZEL_VERSION}-darwin)
set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${SUBDIR}-x86_64") set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${SUBDIR}-x86_64")
set(ARCHIVE "bazel-${SUBDIR}-x86_64") set(ARCHIVE "bazel-${SUBDIR}-x86_64")
set(NOEXTRACT ON) set(NOEXTRACT ON)
set(HASH e2d792f0fc03a4a57a4c2c8345141d86a2dc25a09757f26cb18534426f73d10b4de021e2a3d439956a92d2a712aae9ad75357db24d02f9b0890cc643615a997c) set(HASH 3500560c9d49d37a1ead2d2777d673c6f1874582883e141ecd5b3991005b1b6b8aab5f255c187133d771497c2a956f5c1e0dfad04dc453525634537e65b649af)
else() else()
set(SUBDIR ${BAZEL_VERSION}-windows) set(SUBDIR ${BAZEL_VERSION}-windows)
set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${SUBDIR}-x86_64.zip") set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${SUBDIR}-x86_64.zip")
set(ARCHIVE "bazel-${SUBDIR}-x86_64.zip") set(ARCHIVE "bazel-${SUBDIR}-x86_64.zip")
set(HASH 410b6788f624b3b0b9f13f5b4d12c1b24447f133210a68e2f110aff8d95bb954e40ea1d863a8cc3473402d1c2f15c38042e6af0cb207056811e4cc7bd0b9ca00) set(HASH 3954ab54b465d62eef397767dac7ce21d06ac8ea3e1571d0e7b1f0ea8b5c2cf44eea5d252b85a63a1e1a08dbe9a219783cc23c2888673c35e2df03edfdc9e5a7)
endif() endif()
elseif(VAR MATCHES "ARIA2") elseif(VAR MATCHES "ARIA2")
set(PROGNAME aria2c) set(PROGNAME aria2c)
set(ARIA2_VERSION 1.34.0) set(ARIA2_VERSION 1.35.0)
set(PATHS ${DOWNLOADS}/tools/aria2c/aria2-${ARIA2_VERSION}-win-32bit-build1) set(PATHS ${DOWNLOADS}/tools/aria2c/aria2-${ARIA2_VERSION}-win-32bit-build1)
set(URL "https://github.com/aria2/aria2/releases/download/release-${ARIA2_VERSION}/aria2-${ARIA2_VERSION}-win-32bit-build1.zip") set(URL "https://github.com/aria2/aria2/releases/download/release-${ARIA2_VERSION}/aria2-${ARIA2_VERSION}-win-32bit-build1.zip")
set(ARCHIVE "aria2-${ARIA2_VERSION}-win-32bit-build1.zip") set(ARCHIVE "aria2-${ARIA2_VERSION}-win-32bit-build1.zip")
set(HASH 2a5480d503ac6e8203040c7e516a3395028520da05d0ebf3a2d56d5d24ba5d17630e8f318dd4e3cc2094cc4668b90108fb58e8b986b1ffebd429995058063c27) set(HASH 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4)
elseif(VAR MATCHES "PKGCONFIG") elseif(VAR MATCHES "PKGCONFIG")
set(PROGNAME pkg-config) set(PROGNAME pkg-config)
if(ENV{PKG_CONFIG}) if(ENV{PKG_CONFIG})

66
scripts/vcpkgTools.xml
View File

@ -29,11 +29,11 @@
<archiveName>cmake-3.20.2-linux-x86_64.tar.gz</archiveName> <archiveName>cmake-3.20.2-linux-x86_64.tar.gz</archiveName>
</tool> </tool>
<tool name="git" os="windows"> <tool name="git" os="windows">
<version>2.26.2-1</version> <version>2.32.0.2</version>
<exeRelativePath>mingw32\bin\git.exe</exeRelativePath> <exeRelativePath>mingw32\bin\git.exe</exeRelativePath>
<url>https://github.com/git-for-windows/git/releases/download/v2.26.2.windows.1/PortableGit-2.26.2-32-bit.7z.exe</url> <url>https://github.com/git-for-windows/git/releases/download/v2.32.0.windows.2/PortableGit-2.32.0.2-32-bit.7z.exe</url>
<sha512>d3cb60d62ca7b5d05ab7fbed0fa7567bec951984568a6c1646842a798c4aaff74bf534cf79414a6275c1927081a11b541d09931c017bf304579746e24fe57b36</sha512> <sha512>867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348</sha512>
<archiveName>PortableGit-2.26.2-32-bit.7z.exe</archiveName> <archiveName>PortableGit-2.32.0.2-32-bit.7z.exe</archiveName>
</tool> </tool>
<tool name="git" os="linux"> <tool name="git" os="linux">
<version>2.7.4</version> <version>2.7.4</version>
@ -54,49 +54,49 @@
<sha512></sha512> <sha512></sha512>
</tool> </tool>
<tool name="gsutil" os="windows"> <tool name="gsutil" os="windows">
<version>4.59</version> <version>4.65</version>
<exeRelativePath>google-cloud-sdk\bin\gsutil.cmd</exeRelativePath> <exeRelativePath>google-cloud-sdk\bin\gsutil.cmd</exeRelativePath>
<url>https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-343.0.0-windows-x86_64-bundled-python.zip</url> <url>https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-347.0.0-windows-x86_64-bundled-python.zip</url>
<sha512>349db6743e70c1940b3d0c8ffdf629608437b6fa4e5896143c610e9ce97b28b8a32cf35ee3c669eeec2158788d7ff2fe618ea6bc411f9ca8de6311eee0d36569</sha512> <sha512>e2792e17b132aad77f7c0b9fd26faf415e9437923d9227a9e6d253554e6843d29a6ddad0a7fb5e9aea4a130fd4c521e6ece8844fd4a4f9e8d580348775425389</sha512>
<archiveName>google-cloud-sdk-343.0.0-windows-x86_64-bundled-python.zip</archiveName> <archiveName>google-cloud-sdk-347.0.0-windows-x86_64-bundled-python.zip</archiveName>
</tool> </tool>
<tool name="gsutil" os="osx"> <tool name="gsutil" os="osx">
<version>4.59</version> <version>4.65</version>
<exeRelativePath>gsutil/gsutil</exeRelativePath> <exeRelativePath>gsutil/gsutil</exeRelativePath>
<url>https://storage.googleapis.com/pub/gsutil_4.59.tar.gz</url> <url>https://storage.googleapis.com/pub/gsutil_4.65.tar.gz</url>
<sha512>c86b957a2630f3a80869e3105c0baa7bf1297b84698e756fed28b28adf36345cf1dd28d4216ec395de6bfee5b118dd70040ff964a2938f22d8af15a5c3485c48</sha512> <sha512>2c5c9dea48147f97180a491bbb9e24e8cbcd4f3452620e2f80338b781e4dfc90bb754e3bbfa05e1b990e44bff52d990d8c2dd51bc83d112339d8e6096a2f21c8</sha512>
<archiveName>gsutil_4.59.tar.gz</archiveName> <archiveName>gsutil_4.65.tar.gz</archiveName>
</tool> </tool>
<tool name="gsutil" os="linux"> <tool name="gsutil" os="linux">
<version>4.59</version> <version>4.65</version>
<exeRelativePath>gsutil/gsutil</exeRelativePath> <exeRelativePath>gsutil/gsutil</exeRelativePath>
<url>https://storage.googleapis.com/pub/gsutil_4.59.tar.gz</url> <url>https://storage.googleapis.com/pub/gsutil_4.65.tar.gz</url>
<sha512>c86b957a2630f3a80869e3105c0baa7bf1297b84698e756fed28b28adf36345cf1dd28d4216ec395de6bfee5b118dd70040ff964a2938f22d8af15a5c3485c48</sha512> <sha512>2c5c9dea48147f97180a491bbb9e24e8cbcd4f3452620e2f80338b781e4dfc90bb754e3bbfa05e1b990e44bff52d990d8c2dd51bc83d112339d8e6096a2f21c8</sha512>
<archiveName>gsutil_4.59.tar.gz</archiveName> <archiveName>gsutil_4.65.tar.gz</archiveName>
</tool> </tool>
<tool name="vswhere" os="windows"> <tool name="vswhere" os="windows">
<version>2.4.1</version> <version>2.8.4</version>
<exeRelativePath>vswhere.exe</exeRelativePath> <exeRelativePath>vswhere.exe</exeRelativePath>
<url>https://github.com/Microsoft/vswhere/releases/download/2.4.1/vswhere.exe</url> <url>https://github.com/Microsoft/vswhere/releases/download/2.8.4/vswhere.exe</url>
<sha512>f477842d0cebefcd6bf9c6d536ab8ea20ec5b0aa967ee963ab6a101aeff9df8742ca600d35f39e2e7158d76d8231f1ed2bef6104dce84d2bf8d6b07d17d706a1</sha512> <sha512>1a98beebd1bb6929cbe98b86a3b77fb1ae4508b86cdcb64696b20c3a3336a2b5c8518e19a21092f1c98a46202c048dba819dc52bef122485ac34b888b77e59b2</sha512>
</tool> </tool>
<tool name="nuget" os="windows"> <tool name="nuget" os="windows">
<version>5.9.1</version> <version>5.10.0</version>
<exeRelativePath>nuget.exe</exeRelativePath> <exeRelativePath>nuget.exe</exeRelativePath>
<url>https://dist.nuget.org/win-x86-commandline/v5.9.1/nuget.exe</url> <url>https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe</url>
<sha512>d7acca2b1271bfd3d6f7c7088bceee7a5a5e860d38c05a159f59b1f4bf935e963fde183a769db944df8f6dd44177bb91942578c86eef204cffa119d3d68e97fc</sha512> <sha512>c4b7375e46cdb843096ce491b9809e0dc86773ba7b6333f13d49ec414b2953112df82ee8b833fd31be0cc7fe0fff1af88f3c07aa9553ad03f7f6c5a6eec2057e</sha512>
</tool> </tool>
<tool name="nuget" os="linux"> <tool name="nuget" os="linux">
<version>5.9.1</version> <version>5.10.0</version>
<exeRelativePath>nuget.exe</exeRelativePath> <exeRelativePath>nuget.exe</exeRelativePath>
<url>https://dist.nuget.org/win-x86-commandline/v5.9.1/nuget.exe</url> <url>https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe</url>
<sha512>d7acca2b1271bfd3d6f7c7088bceee7a5a5e860d38c05a159f59b1f4bf935e963fde183a769db944df8f6dd44177bb91942578c86eef204cffa119d3d68e97fc</sha512> <sha512>c4b7375e46cdb843096ce491b9809e0dc86773ba7b6333f13d49ec414b2953112df82ee8b833fd31be0cc7fe0fff1af88f3c07aa9553ad03f7f6c5a6eec2057e</sha512>
</tool> </tool>
<tool name="nuget" os="osx"> <tool name="nuget" os="osx">
<version>5.9.1</version> <version>5.10.0</version>
<exeRelativePath>nuget.exe</exeRelativePath> <exeRelativePath>nuget.exe</exeRelativePath>
<url>https://dist.nuget.org/win-x86-commandline/v5.9.1/nuget.exe</url> <url>https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe</url>
<sha512>d7acca2b1271bfd3d6f7c7088bceee7a5a5e860d38c05a159f59b1f4bf935e963fde183a769db944df8f6dd44177bb91942578c86eef204cffa119d3d68e97fc</sha512> <sha512>c4b7375e46cdb843096ce491b9809e0dc86773ba7b6333f13d49ec414b2953112df82ee8b833fd31be0cc7fe0fff1af88f3c07aa9553ad03f7f6c5a6eec2057e</sha512>
</tool> </tool>
<tool name="installerbase" os="windows"> <tool name="installerbase" os="windows">
<version>3.1.81</version> <version>3.1.81</version>
@ -113,11 +113,11 @@
<archiveName>7-zip.commandline.18.1.0.nupkg</archiveName> <archiveName>7-zip.commandline.18.1.0.nupkg</archiveName>
</tool> </tool>
<tool name="aria2" os="windows"> <tool name="aria2" os="windows">
<version>18.01.0</version> <version>1.35.0</version>
<exeRelativePath>aria2-1.34.0-win-32bit-build1\aria2c.exe</exeRelativePath> <exeRelativePath>aria2-1.35.0-win-32bit-build1\aria2c.exe</exeRelativePath>
<url>https://github.com/aria2/aria2/releases/download/release-1.34.0/aria2-1.34.0-win-32bit-build1.zip</url> <url>https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0-win-32bit-build1.zip</url>
<sha512>2a5480d503ac6e8203040c7e516a3395028520da05d0ebf3a2d56d5d24ba5d17630e8f318dd4e3cc2094cc4668b90108fb58e8b986b1ffebd429995058063c27</sha512> <sha512>933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4</sha512>
<archiveName>aria2-1.33.1-win-32bit-build1.zip</archiveName> <archiveName>aria2-1.35.0-win-32bit-build1.zip</archiveName>
</tool> </tool>
<tool name="ninja" os="windows"> <tool name="ninja" os="windows">
<version>1.10.2</version> <version>1.10.2</version>

2
versions/baseline.json
View File

@ -6361,7 +6361,7 @@
"port-version": 0 "port-version": 0
}, },
"tool-meson": { "tool-meson": {
"baseline": "0.58.0", "baseline": "0.58.1",
"port-version": 0 "port-version": 0
}, },
"torch-th": { "torch-th": {

5
versions/t-/tool-meson.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "7faddc68a615d0902938f8dd18182586f9e2363a",
"version": "0.58.1",
"port-version": 0
},
{ {
"git-tree": "3abddc8b29ae6e5c0265237a8c3f3e8ec8348710", "git-tree": "3abddc8b29ae6e5c0265237a8c3f3e8ec8348710",
"version": "0.58.0", "version": "0.58.0",