Merge branch 'microsoft:master' into add_osqp

microsoft · Nov 8, 2024 · 951f714 · 951f714
2 parents 08f2daa + 6046e48
commit 951f714
Show file tree

Hide file tree

Showing 694 changed files with 6,943 additions and 4,747 deletions.
diff --git a/.github/workflows/check_issues.yml b/.github/workflows/check_issues.yml
@@ -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]});
@@ -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.";
@@ -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});
+            }
diff --git a/.github/workflows/test_modified_ports.yml b/.github/workflows/test_modified_ports.yml
@@ -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'
diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt
@@ -149,16 +149,6 @@ target_sources(7zip PRIVATE
     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/7zip/Common/CreateCoder.cpp
     CPP/7zip/Common/CWrappers.cpp
     CPP/7zip/Common/InBuffer.cpp
@@ -302,6 +292,20 @@ target_sources(7zip PRIVATE
     C/Util/LzmaLib/LzmaLib.def
 )
 
+if(WIN32)
+    target_sources(7zip PRIVATE
+        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
+    )
+endif()
+
 # 7zCrcOpt
 if(VCPKG_TARGET_IS_WINDOWS)
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")

diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "7zip",
   "version-string": "24.08",
+  "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",

diff --git a/ports/aliyun-oss-cpp-sdk/0001-dependency-and-targets.patch b/ports/aliyun-oss-cpp-sdk/0001-dependency-and-targets.patch
@@ -9,7 +9,7 @@ index ea0d8d6..2a853a0 100644
 -	include(FindCURL)
 -	include(FindOpenSSL)
 +	find_package(CURL CONFIG REQUIRED)
-+	find_package(OpenSSL CONFIG REQUIRED)
++	find_package(OpenSSL REQUIRED)
 
  	if(NOT CURL_FOUND)
  		message(FATAL_ERROR "Could not find curl")

diff --git a/ports/aliyun-oss-cpp-sdk/vcpkg.json b/ports/aliyun-oss-cpp-sdk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "aliyun-oss-cpp-sdk",
   "version": "1.10.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.",
   "homepage": "https://github.com/aliyun/aliyun-oss-cpp-sdk",
   "license": "Apache-2.0",

diff --git a/ports/allegro5/minimp3-fix.patch b/ports/allegro5/minimp3-fix.patch
@@ -0,0 +1,17 @@
+diff --git a/addons/acodec/CMakeLists.txt b/addons/acodec/CMakeLists.txt
+index 6906a99..7896989 100644
+--- a/addons/acodec/CMakeLists.txt
++++ b/addons/acodec/CMakeLists.txt
+@@ -394,9 +394,10 @@ acodec_summary(" - Opus" SUPPORT_OPUS)
+ # MP3
+ #
+ if(WANT_MP3)
+-    find_package(MiniMP3)
++    find_path(MINIMP3_INCLUDE_DIRS "minimp3/minimp3.h")
++    set(MINIMP3_FOUND true)
+     if(MINIMP3_FOUND)
+-        include_directories(SYSTEM ${MINIMP3_INCLUDE_DIRS})
++        include_directories(SYSTEM ${MINIMP3_INCLUDE_DIRS}/minimp3)
+         set(ALLEGRO_CFG_ACODEC_MP3 1)
+         list(APPEND ACODEC_SOURCES mp3.c)
+     endif(MINIMP3_FOUND)
diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
         do-not-copy-pdbs-to-lib.patch
         msvc-arm64-atomic.patch
+        minimp3-fix.patch
 )
 
 if(VCPKG_TARGET_IS_ANDROID AND NOT ENV{ANDROID_HOME})
@@ -43,7 +44,7 @@ vcpkg_cmake_configure(
         -DWANT_GLES3=ON
         -DWANT_IMAGE_FREEIMAGE=OFF
         -DWANT_MODAUDIO=OFF # Not available on vcpkg right now
-        -DWANT_MP3=OFF
+        -DWANT_MP3=ON
         -DWANT_OPENSL=OFF # Not yet available on vcpkg
         -DWANT_POPUP_EXAMPLES=OFF
         -DWANT_TESTS=OFF

diff --git a/ports/allegro5/vcpkg.json b/ports/allegro5/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "allegro5",
-  "version": "5.2.9.1",
+  "version": "5.2.9.2",
   "description": "Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.",
   "homepage": "https://liballeg.org/",
   "license": "BSD-3-Clause AND Zlib",
@@ -24,6 +24,7 @@
       "name": "libwebp",
       "default-features": false
     },
+    "minimp3",
     "openal-soft",
     "opus",
     "opusfile",

diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arma
     FILENAME "armadillo-${VERSION}.tar.xz"
-    SHA512 567ed608098258749cf133022810c9296985ddd9d4dcce4eb00a938cbe8e767774d96cd030ba8c719e62895913e294b17299e4e8c064103b1f6f051021ee9e57
+    SHA512 55ee45be41ca240783edfd61f647401b0a32826850be82f5e957873c18de0dce87fc39d35e5f6363475ed912c3b1d08ff31151f25378d262d840aa6f15163ac8
     PATCHES
         cmake-config.patch
         dependencies.patch
@@ -23,7 +23,6 @@ vcpkg_cmake_configure(
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DALLOW_FLEXIBLAS_LINUX=OFF
-        -DDETECT_HDF5=OFF
         "-DREQUIRES_PRIVATE=${REQUIRES_PRIVATE}"
 )
 

diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "armadillo",
-  "version": "12.8.4",
-  "port-version": 1,
+  "version": "14.0.3",
   "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use",
   "homepage": "https://arma.sourceforge.net/",
   "license": "Apache-2.0",

diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_download_distfile(
     ARCHIVE_PATH
     URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz"
     FILENAME apache-arrow-${VERSION}.tar.gz
-    SHA512 4e2a617b8deeb9f94ee085653a721904a75696f0827bcba82b535cc7f4f723066a09914c7fa83c593e51a8a4031e8bf99e563cac1ebb1d89604cb406975d4864
+    SHA512 4df30ab5561da695eaa864422626b9898555d86ca56835c3b8a8ca93a1dbaf081582bb36e2440d1daf7e1dd48c76941f1152a4f25ce0dbcc1c2abe244a00c05e
 )
 vcpkg_extract_source_archive(
     SOURCE_PATH

diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "arrow",
-  "version": "17.0.0",
+  "version": "18.0.0",
   "description": "Cross-language development platform for in-memory analytics",
   "homepage": "https://arrow.apache.org",
   "license": "Apache-2.0",

diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake
@@ -1,8 +1,10 @@
+set(VCPKG_BUILD_TYPE release) # header-only
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tradias/asio-grpc
     REF "v${VERSION}"
-    SHA512 c94ffd8270728d15e60a2605413ec703fa8426088b0b0fea152e462fb7016eac3309deeb830ef7251a024b05884f7c8268974c84233701da0aeecd325aa42344
+    SHA512 4736b5e4e3e891417391374e21f06a51b135791ced82f7f1c4c0f0d6ead275ea81f8f97812a9570376463f4a18c8a43b73d6f75db624c19337b6553cedf8f2b3
     HEAD_REF master
 )
 

diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "asio-grpc",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Asynchronous gRPC with Asio/unified executors",
   "homepage": "https://github.com/Tradias/asio-grpc",
   "license": "Apache-2.0",

diff --git a/ports/asio/CMakeLists.txt b/ports/asio/CMakeLists.txt
@@ -1,8 +1,13 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.10)
 project(asio)
 
 add_library(asio INTERFACE)
 
+find_package(Threads)
+if(Threads_FOUND)
+    target_link_libraries(asio INTERFACE Threads::Threads)
+endif()
+
 # Export target
 install(TARGETS asio
     EXPORT asio
@@ -12,6 +17,7 @@ install(TARGETS asio
 install(EXPORT asio
     DESTINATION "share/asio"
     FILE asio-targets.cmake
+    NAMESPACE asio::
 )
 
 install(DIRECTORY
@@ -26,3 +32,8 @@ install(FILES
     asio/include/asio.hpp
     DESTINATION include/
 )
+
+set(exec_prefix [[${prefix}]])
+set(package_name [[asio]])
+configure_file(asio/asio.pc.in "${PROJECT_BINARY_DIR}/asio.pc" @ONLY)
+install(FILES "${PROJECT_BINARY_DIR}/asio.pc" DESTINATION share/pkgconfig)
diff --git a/ports/asio/asio-config.cmake b/ports/asio/asio-config.cmake
@@ -1,9 +1,9 @@
-include ("${CMAKE_CURRENT_LIST_DIR}/asio-targets.cmake")
+find_package(Threads)
 
-if(NOT TARGET asio::asio)
-    add_library(asio::asio INTERFACE IMPORTED)
-    target_link_libraries(asio::asio INTERFACE asio)
+include("${CMAKE_CURRENT_LIST_DIR}/asio-targets.cmake")
+
+if(NOT TARGET asio)
+    add_library(asio ALIAS asio::asio)
 endif()
 
-get_target_property(_ASIO_INCLUDE_DIR asio INTERFACE_INCLUDE_DIRECTORIES)
-set(ASIO_INCLUDE_DIR "${_ASIO_INCLUDE_DIR}")
+get_target_property(ASIO_INCLUDE_DIR asio::asio INTERFACE_INCLUDE_DIRECTORIES)
diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake
@@ -1,29 +1,27 @@
-#header-only library
+set(VCPKG_BUILD_TYPE release) # header-only
 
+string(REPLACE "." "-" ref "asio-${VERSION}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO chriskohlhoff/asio
-    REF asio-1-31-0
-    SHA512 505c3f4e4043cd73be1a28ab611d7f61046d6b60f80c08aaceea892a76ce7f51056d39516d7b4e836611a9974c227de52c0434122af0ea8539ceb57363a82b62
+    REF "${ref}"
+    SHA512 9374ff97bd4af7b5b41754970b2bcb468f450fee46a80c9c3344f732c64091f2ac5a73ebf4ac1831c623793c08a3c109ae90b601273c40d062bfd4f026f1d94d
     HEAD_REF master
 )
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 # Always use "ASIO_STANDALONE" to avoid boost dependency
 vcpkg_replace_string("${SOURCE_PATH}/asio/include/asio/detail/config.hpp" "defined(ASIO_STANDALONE)" "!defined(VCPKG_DISABLE_ASIO_STANDALONE)")
 
-# CMake install
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DPACKAGE_VERSION=${VERSION}
 )
 vcpkg_cmake_install()
-
+vcpkg_fixup_pkgconfig()
+
 vcpkg_cmake_config_fixup()
-file(INSTALL
-    "${CMAKE_CURRENT_LIST_DIR}/asio-config.cmake"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-)
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/asio-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-# Handle copyright
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/asio/LICENSE_1_0.txt")
diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "asio",
-  "version": "1.31.0",
+  "version": "1.32.0",
   "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.",
-  "homepage": "https://github.com/chriskohlhoff/asio",
-  "documentation": "https://think-async.com/Asio/asio-1.28.0/doc/",
+  "homepage": "https://think-async.com/Asio/",
+  "documentation": "https://think-async.com/Asio/Documentation.html",
   "license": "BSL-1.0",
   "dependencies": [
     {

diff --git a/ports/asyncplusplus/portfile.cmake b/ports/asyncplusplus/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Amanieu/asyncplusplus
-    REF 172ca3f8e0df1b3f7f5ee8b8244e4ac67258b0d8 # v1.1
-    SHA512 fd95b3349ceed4cab5cb0e146d2ccfe77c85318303015cf513037fc69c1ade7cfdb3dc81de8a90846c4387c5e31f5a70a64da770547c201dfe24d2c181be1933
+    REF v1.2
+    SHA512 4b59ef805d4683631ef2ba51039deb210d9ba28b35021489560b0f2da6f75a68da8cb676807f9831047c997673556f69fdca0ae2081996274015e708fd6ff55e
     HEAD_REF master
 )
 

diff --git a/ports/asyncplusplus/vcpkg.json b/ports/asyncplusplus/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "asyncplusplus",
-  "version": "1.1",
-  "port-version": 2,
+  "version": "1.2",
   "description": "Async++ is a lightweight concurrency framework for C++11",
   "license": "MIT",
   "supports": "!uwp",