Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Browse files Browse the repository at this point in the history 
…LilyWang/issue40845

Please enter a commit message to explain why this merge is necessary,
  • Loading branch information
@LilyWangLL
LilyWangLL committed Jan 15, 2025
2 parents bf0a03a + d4f3e12 commit d2e5b61
Show file tree
Hide file tree
Showing 3,900 changed files with 43,281 additions and 310,439 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
34 changes: 20 additions & 14 deletions .github/workflows/check_issues.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
repo: context.repo.repo
};
let issue = await github.rest.issues.get(issue_query)
let issue_body = issue.data.body.replaceAll("\r\n", "\n");
let commentLabelClose = async (comment, label) => {
await github.rest.issues.removeAllLabels(issue_query);
await github.rest.issues.setLabels({...issue_query, labels: [label]});
Expand All @@ -29,7 +30,7 @@ jobs:
// missing-windows-sdk-issue
let reg = /RC Pass 1: command "rc .*" failed \(exit code 0\) with the following output:/;
if (reg.test(issue.data.body)){
if (reg.test(issue_body)){
let body = "Thanks for posting this issue. Please make sure you have the following installed.\n" +
"- Visual Studio Desktop development with C++.\n" +
"- Windows 10 SDK or Windows 11 SDK.";
Expand All @@ -38,41 +39,46 @@ jobs:
// msys2 download fails => old vcpkg version
reg = /error: https:\/\/repo\.msys2\.org\/.*: failed: status code 404/;
if (reg.test(issue.data.body)){
if (reg.test(issue_body)){
let body = "Try updating your vcpkg version via `git pull` to resolve this issue. MSYS2 downloads are removed from the upstream servers from time to time, so using an up-to-date vcpkg version is necessary."
return await commentLabelClose(body, "category:question");
}
regs = []
// Issue text is: Copy issue body from .../issue_body.md
reg = /^Copy issue body from .*issue_body.md$/;
if (reg.test(issue.data.body)){
let body = "Please see #30604 for how to report a build failure."
return await commentLabelClose(body, "requires:more-information");
}
regs.push( /^Copy issue body from .*issue_body.md$/ );
// Issue to short like #36592 or #36668
reg = /^error: building.* BUILD_FAILED\r\nElapsed time.*\r\nPlease ensure.*(\r\nThen check .*\r\n.*)?$/;
if (reg.test(issue.data.body)){
regs.push( /^error: building.* BUILD_FAILED\r\nElapsed time.*\r\nPlease ensure.*(\r\nThen check .*\r\n.*)?$/ );
// Issues with only the default error message like #41813
regs.push( /^error: building.* BUILD_FAILED\r\n[\s\S]*issue_body.md$/ );
if (regs.some(reg => reg.test(issue_body))) {
let body = "Please see #30604 for how to report a build failure."
return await commentLabelClose(body, "requires:more-information");
}
// pkg-config/ not found issues like #36011
reg = /CMake Error at scripts\/cmake\/vcpkg_find_acquire_program.*\r\n(.*Please install it via your package manager:[\s\S]+)Call Stack/;
match = issue.data.body.match(reg)
reg = /CMake Error at scripts\/cmake\/vcpkg_find_acquire_program.*\n(.*Please install it via your package manager:[\s\S]+)Call Stack/;
match = issue_body.match(reg)
if (match){
let body = "From the log:\n```\n" + match[1] + "```\n"
return await commentLabelClose(body, "category:question");
}
// MSVC internal compiler error like #36628
if (issue.data.body.indexOf("fatal error C1001: Internal compiler error") !== -1){
if (issue_body.indexOf("fatal error C1001: Internal compiler error") !== -1){
let body = "The build failed due to an internal compiler error. Please update your compiler or revert to an old version."
return await commentLabelClose(body, "category:question");
}
// configure: error: 'autoconf-archive' is missing like #37013
if (issue.data.body.indexOf("configure: error: 'autoconf-archive' is missing") !== -1){
if (issue_body.indexOf("configure: error: 'autoconf-archive' is missing") !== -1){
let body = "Please install `autoconf-archive` via `brew install autoconf-archive` (macos) or `sudo apt-get install autoconf-archive` (linux)"
return await commentLabelClose(body, "category:question");
}
// Wrong formatted issues like #36086
const containsCopyHint = issue_body.indexOf("Copy issue body from") !== -1 || issue_body.indexOf("%2Fissue_body.md") !== -1;
if (containsCopyHint && issue_body.indexOf("```") === -1){
let body = "Please see #30604 for how to properly report a build failure."
return await github.rest.issues.createComment({...issue_query, body: body});
}
23 changes: 23 additions & 0 deletions .github/workflows/test_modified_ports.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Test Modified Ports
on:
push:
branches:
- onboard-actions
jobs:
Windows:
runs-on:
- self-hosted
- "1ES.Pool=vcpkg-windows-wus"
steps:
- name: Checkout
uses: actions/checkout@v4
with:
# fetch-depth 50 tries to ensure we capture the whole history of the branch
fetch-depth: 50

- name: Bootstrap
run: ./bootstrap-vcpkg.sh

- name: Example
shell: pwsh
run: Write-Host 'Running on 1ES Hosted GitHub Runners'
28 changes: 18 additions & 10 deletions ports/7zip/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ target_sources(7zip PRIVATE
C/XzCrc64.c
C/Xxh64.c
C/ZstdDec.c
C/Md5.c
C/Sha3.c
C/Sha512.c
C/Sha512Opt.c

CPP/Common/CRC.cpp
CPP/Common/CrcReg.cpp
Expand All @@ -148,16 +152,10 @@ target_sources(7zip PRIVATE
CPP/Common/XzCrc64Init.cpp
CPP/Common/XzCrc64Reg.cpp
CPP/Common/Xxh64Reg.cpp

CPP/Windows/FileDir.cpp
CPP/Windows/FileFind.cpp
CPP/Windows/FileIO.cpp
CPP/Windows/FileName.cpp
CPP/Windows/PropVariant.cpp
CPP/Windows/PropVariantUtils.cpp
CPP/Windows/Synchronization.cpp
CPP/Windows/System.cpp
CPP/Windows/TimeUtils.cpp
CPP/Common/Md5Reg.cpp
CPP/Common/Sha3Reg.cpp
CPP/Common/Sha512Prepare.cpp
CPP/Common/Sha512Reg.cpp

CPP/7zip/Common/CreateCoder.cpp
CPP/7zip/Common/CWrappers.cpp
Expand All @@ -181,6 +179,16 @@ target_sources(7zip PRIVATE
CPP/7zip/Common/UniqBlocks.cpp
CPP/7zip/Common/VirtThread.cpp

CPP/Windows/FileDir.cpp
CPP/Windows/FileFind.cpp
CPP/Windows/FileIO.cpp
CPP/Windows/FileName.cpp
CPP/Windows/PropVariant.cpp
CPP/Windows/PropVariantUtils.cpp
CPP/Windows/Synchronization.cpp
CPP/Windows/System.cpp
CPP/Windows/TimeUtils.cpp

CPP/7zip/Archive/ApmHandler.cpp
CPP/7zip/Archive/ArHandler.cpp
CPP/7zip/Archive/ArjHandler.cpp
Expand Down
13 changes: 13 additions & 0 deletions ports/7zip/fix_timespec_get_broken_on_android.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CPP/Windows/TimeUtils.cpp b/CPP/Windows/TimeUtils.cpp
index bbd79ba..8df3ea3 100644
--- a/CPP/Windows/TimeUtils.cpp
+++ b/CPP/Windows/TimeUtils.cpp
@@ -259,7 +259,7 @@ bool GetSecondsSince1601(unsigned year, unsigned month, unsigned day,
Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.3,
Cygwin 2.9, mingw, MSVC 14, Android 9.0.
*/
-#if defined(TIME_UTC)
+#if defined(TIME_UTC) && (!defined(__ANDROID__) || __ANDROID_API__ >= 29)
#define ZIP7_USE_timespec_get
// #pragma message("ZIP7_USE_timespec_get")
#elif defined(CLOCK_REALTIME)
4 changes: 3 additions & 1 deletion ports/7zip/portfile.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ip7z/7zip
REF "${VERSION}"
SHA512 5aa2a32a1d2ea81b0ee487e07efc444fda69967a67fb3a7d6e8fd06d32ebf9be76948ea23d258feade89877be698d09e1ef2ba79bbeda83752fdbb50a007af6c
SHA512 dc0241ed96907965445550912d1171fe32230a52997b089558a4cc73a662fc6a17940db8dcb0794b805268964899d9e5a48ddb444e92b56fd243bbaa17c20a1c
HEAD_REF main
PATCHES
fix_timespec_get_broken_on_android.patch
)

file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
Expand Down
3 changes: 2 additions & 1 deletion ports/7zip/vcpkg.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "7zip",
"version-string": "24.08",
"version-string": "24.09",
"port-version": 1,
"description": "Library for archiving file with a high compression ratio.",
"homepage": "https://www.7-zip.org",
"license": "LGPL-2.1-or-later",
Expand Down
8 changes: 4 additions & 4 deletions ports/ace/portfile.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ if("tao" IN_LIST FEATURES)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz"
FILENAME "ACE-TAO-${VERSION}.tar.gz"
SHA512 ee46897e13ba943c48d7b04c0792cef8ff48403b048af4eeced4bbfd874dece5ec1130a18216fd31fdbd610e3947673e56e306ab52ee3f1124975b1adaf21838
SHA512 11707f5c4c3a67b437ed2112612640d19a5d11c3909597dae2ce60a34979578e3376871a698d43f9c4236a26d37b301f2148314535f66242444a0849c42fedbe
)
else()
# Don't change to vcpkg_from_github! This points to a release and not an archive
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz"
FILENAME "ACE-src-${VERSION}.tar.gz"
SHA512 a29f8009e8f9e12c7c6d4ad9f39f76a62245baeb9fcfe08e346c1a004aedb5ab9d808a2390cde2dc71013be1b0de2ddd9d0dea26144536061e6416554233f547
SHA512 208b6101c1415ee64f7a9a99c1fe53a3b51078408809716ea9bf744667f853c86e7656e02c49c55e6866218033336de4ed8bfbd39254bf94f8a332861ea6e97f
)
endif()

Expand Down Expand Up @@ -346,7 +346,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
)
endif()
endif()

if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
message(STATUS "Building ${TARGET_TRIPLET}-rel")
vcpkg_execute_build_process(
Expand Down Expand Up @@ -381,7 +381,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
endif()
message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
endif()

# Restore `PWD` environment variable
set($ENV{PWD} _prev_env)

Expand Down
2 changes: 1 addition & 1 deletion ports/ace/vcpkg.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ace",
"version": "8.0.0",
"version": "8.0.2",
"maintainers": "Johnny Willemsen <[email protected]>",
"description": "The ADAPTIVE Communication Environment",
"homepage": "https://github.com/DOCGroup/ACE_TAO",
Expand Down
4 changes: 2 additions & 2 deletions ports/activemq-cpp/vcpkg.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "activemq-cpp",
"version-semver": "3.9.5",
"port-version": 16,
"port-version": 17,
"description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
"license": "Apache-2.0",
"supports": "!(uwp | osx)",
"supports": "(windows & !uwp & (x86 | x64)) | (!windows & !osx)",
"dependencies": [
"apr",
{
Expand Down
2 changes: 1 addition & 1 deletion ports/ada-url/portfile.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ada-url/ada
REF "v${VERSION}"
SHA512 74bad3f234dfe7b72e2057583e077e6a0f78f34b9c699751972d079b8027ef2dc34e6ef07c0dedeb923d8979f91c58a8a90473e69152c89e76baaa3659fa575b
SHA512 bc876db537153d6b0599215ca8be8261bceca6d213fcc63af5fda13c1b32876496cb8d4e98c787f17317cf8ffd1940431551513807f1a18f9ce993fad35f5ec6
HEAD_REF main
PATCHES
no-cpm.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/ada-url/vcpkg.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ada-url",
"version": "2.9.1",
"version": "2.9.2",
"description": "WHATWG-compliant and fast URL parser written in modern C++",
"homepage": "https://ada-url.com/",
"license": "MIT",
Expand Down
9 changes: 7 additions & 2 deletions ports/aklomp-base64/portfile.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aklomp/base64
REF "v${VERSION}"
SHA512 d63c6b36c99abcdfadf3730096c3a7cd36593526dd3dae815035ce196d3354ece7da1d92ecec800a81e1ab5e1d878b24f0b1de62b7aca516170d06a07c1b42a2
SHA512 9f8ca8a6e9feb8ad98158d675ec3331e83c77401d2633de0e43b62e794682a9d63c03e1c2599981ad3cdb249e263964f6a79084dbdf2ca19a1e1eed6195a98f4
HEAD_REF master
)

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBASE64_BUILD_CLI=OFF
-DBASE64_REGENERATE_TABLES=OFF
-DBASE64_WERROR=OFF
-DBASE64_WITH_OpenMP=OFF
)

vcpkg_cmake_install()
Expand Down
2 changes: 1 addition & 1 deletion ports/aklomp-base64/vcpkg.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aklomp-base64",
"version": "0.5.1",
"version": "0.5.2",
"description": "Implementation of a base64 stream encoding/decoding library in C99 with SIMD (AVX2, AVX512, NEON, AArch64/NEON, SSSE3, SSE4.1, SSE4.2, AVX) and OpenMP acceleration",
"homepage": "https://github.com/aklomp/base64",
"license": "BSD-2-Clause",
Expand Down
30 changes: 0 additions & 30 deletions ports/alembic/fix-runtime-destination.patch
View file

This file was deleted.

4 changes: 1 addition & 3 deletions ports/alembic/portfile.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO alembic/alembic
REF "${VERSION}"
SHA512 6371b830242be90d4ea833248df5fd42d9e713e305d15eb1383d04410319acdae5743d48d65e8f75f1cedce777d2af7d969cde095f678b17322c19f1c69f477b
SHA512 02b7bf5782e83efb08a8653f130b02565fa997e857dbd8d0523e1b218ff58d929fbf9690db0980e8101a31f01a67341b6000af8794538890ef7d759fe0289e2f
HEAD_REF master
PATCHES
fix-runtime-destination.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ALEMBIC_SHARED_LIBS)
Expand Down
2 changes: 1 addition & 1 deletion ports/alembic/vcpkg.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alembic",
"version": "1.8.6",
"version": "1.8.8",
"description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.",
"homepage": "https://alembic.io/",
"supports": "!(windows & x86) & !uwp",
Expand Down
Loading

0 comments on commit d2e5b61

Please sign in to comment.