From 404819d78fcb5734ff0c2cfa4ccb028a0b7fb005 Mon Sep 17 00:00:00 2001 From: Lars Glud Date: Tue, 14 Dec 2021 19:46:50 +0100 Subject: [PATCH] [Pcre2] Check if files exists before call vcpkg_replace_string. (#22003) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Check if files exists before call vcpkg_replace_string. * Update per comments. Only guard debug. * Update ports/pcre2/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Bump port-version. Co-authored-by: GLUD Lars Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/pcre2/portfile.cmake | 4 +++- ports/pcre2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pcre2.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake index a1db80085ad084..0568f07a35b999 100644 --- a/ports/pcre2/portfile.cmake +++ b/ports/pcre2/portfile.cmake @@ -56,7 +56,9 @@ if(BUILD_STATIC) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") elseif(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + endif() endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json index 16fe74caccc894..b6a59e074e28a1 100644 --- a/ports/pcre2/vcpkg.json +++ b/ports/pcre2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcre2", "version": "10.39", - "port-version": 1, + "port-version": 2, "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.", "homepage": "https://github.com/PhilipHazel/pcre2", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f85cc13546ca22..f463d82c90188c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5190,7 +5190,7 @@ }, "pcre2": { "baseline": "10.39", - "port-version": 1 + "port-version": 2 }, "pdal": { "baseline": "1.7.1", diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json index fe12a838d228e6..bba977373475ab 100644 --- a/versions/p-/pcre2.json +++ b/versions/p-/pcre2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a15903858198c8a3b890972b5e8c0d2aa3f89f8", + "version": "10.39", + "port-version": 2 + }, { "git-tree": "b25437749e0bcdd96807c66a8fc8764382c55203", "version": "10.39",