[many ports] Fix port installation conflicts (#40567)

2024-11-23 23:38:59 +08:00 · 2024-08-23 09:19:15 +00:00 · 2024-08-23 09:19:15 +00:00 · f154f23a6d
commit f154f23a6d
parent de45a8fe0b
26 changed files with 90 additions and 30 deletions
--- a/ports/dbg-macro/portfile.cmake
+++ b/ports/dbg-macro/portfile.cmake
@ -8,7 +8,7 @@ vcpkg_from_github(
    HEAD_REF master
 )

-file(COPY "${SOURCE_PATH}/dbg.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(COPY "${SOURCE_PATH}/dbg.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/dbg-macro")

 # Handle copyright
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/dbg-macro/vcpkg.json
+++ b/ports/dbg-macro/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "dbg-macro",
  "version": "0.5.1",
+  "port-version": 1,
  "description": "A dbg(...) macro for C++",
  "homepage": "https://github.com/sharkdp/dbg-macro",
  "license": "MIT"
--- a/ports/ijg-libjpeg/portfile.cmake
+++ b/ports/ijg-libjpeg/portfile.cmake
@ -1,4 +1,4 @@
-if(EXISTS ${CURRENT_INSTALLED_DIR}/share/libturbo-jpeg/copyright)
+if(EXISTS ${CURRENT_INSTALLED_DIR}/share/libjpeg-turbo/copyright)
    message(FATAL_ERROR "'${PORT}' conflicts with 'libturbo-jpeg'. Please remove libturbo-jpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
 endif()
 if(EXISTS ${CURRENT_INSTALLED_DIR}/share/mozjpeg/copyright)
@ -41,7 +41,7 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()

 # There is no LICENSE file, but README containes some legal text.
-file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/README")

 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
--- a/ports/ijg-libjpeg/vcpkg.json
+++ b/ports/ijg-libjpeg/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "ijg-libjpeg",
  "version-string": "9e",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Independent JPEG Group's JPEG software",
  "homepage": "http://www.ijg.org/",
  "license": null,
--- a/ports/libjpeg-turbo/portfile.cmake
+++ b/ports/libjpeg-turbo/portfile.cmake
@ -1,7 +1,9 @@
 if(EXISTS "${CURRENT_INSTALLED_DIR}/share/mozjpeg/copyright")
    message(FATAL_ERROR "Can't build ${PORT} if mozjpeg is installed. Please remove mozjpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
 endif()
-
+if(EXISTS "${CURRENT_INSTALLED_DIR}/share/ijg-libjpeg/copyright")
+    message(FATAL_ERROR "Can't build ${PORT} if ijg-libjpeg is installed. Please remove ijg-libjpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
+endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO libjpeg-turbo/libjpeg-turbo
--- a/ports/libjpeg-turbo/vcpkg.json
+++ b/ports/libjpeg-turbo/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "libjpeg-turbo",
  "version": "3.0.3",
+  "port-version": 1,
  "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.",
  "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo",
  "license": "BSD-3-Clause",
--- a/ports/microsoft-signalr/portfile.cmake
+++ b/ports/microsoft-signalr/portfile.cmake
@ -1,3 +1,6 @@
+if(EXISTS ${CURRENT_INSTALLED_DIR}/share/signalrclient/copyright)
+    message(FATAL_ERROR "'${PORT}' conflicts with 'signalrclient'. Please remove signalrclient:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
+endif()
 vcpkg_download_distfile(PATCH_FIX_GCC_13_COMPILATION
    URLS https://github.com/aspnet/SignalR-Client-Cpp/commit/66458704cf588eae28b490b73bbc8261bf04f31a.diff?full_index=1
    SHA512 e8b6edbc84f9f6fd1fe5f0f63a1b66004d562c3926ab9130a2ce4fa7137e6b1d4d5c407b95f2867e452863578ffd03ca3be3326dac19d14baf77416c71e237c9
--- a/ports/microsoft-signalr/vcpkg.json
+++ b/ports/microsoft-signalr/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "microsoft-signalr",
  "version": "0.1.0-alpha4",
-  "port-version": 10,
+  "port-version": 11,
  "description": "C++ Client for ASP.NET Core SignalR.",
  "homepage": "https://github.com/aspnet/SignalR-Client-Cpp",
  "dependencies": [
--- a/ports/mozjpeg/portfile.cmake
+++ b/ports/mozjpeg/portfile.cmake
@ -1,6 +1,9 @@
 if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libjpeg-turbo/copyright")
    message(FATAL_ERROR "Can't build ${PORT} if libjpeg-turbo is installed. Please remove libjpeg-turbo:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
 endif()
+if(EXISTS "${CURRENT_INSTALLED_DIR}/share/ijg-libjpeg/copyright")
+    message(FATAL_ERROR "Can't build ${PORT} if ijg-libjpeg is installed. Please remove ijg-libjpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
+endif()

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
@ -57,4 +60,4 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()

 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
--- a/ports/mozjpeg/vcpkg.json
+++ b/ports/mozjpeg/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "mozjpeg",
  "version": "4.1.5",
+  "port-version": 1,
  "description": "MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg.",
  "homepage": "https://github.com/mozilla/mozjpeg",
  "license": "IJG AND BSD-3-Clause AND Zlib",
--- a/ports/range-v3-vs2015/portfile.cmake
+++ b/ports/range-v3-vs2015/portfile.cmake
@ -1,3 +1,6 @@
+if(EXISTS ${CURRENT_INSTALLED_DIR}/share/range-v3/copyright)
+    message(FATAL_ERROR "'${PORT}' conflicts with 'range-v3'. Please remove range-v3:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
+endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Microsoft/Range-V3-VS2015
@ -6,7 +9,7 @@ vcpkg_from_github(
    HEAD_REF master
 )

-file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/range-v3-vs2015)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3-vs2015/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3-vs2015/copyright)
 file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp")
 vcpkg_copy_pdbs()
--- a/ports/range-v3-vs2015/vcpkg.json
+++ b/ports/range-v3-vs2015/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "range-v3-vs2015",
  "version": "20151130-vcpkg5",
-  "port-version": 2,
+  "port-version": 3,
  "description": "Range library for C++11/14/17.",
  "homepage": "https://github.com/Microsoft/Range-V3-VS2015"
 }
--- a/ports/range-v3/portfile.cmake
+++ b/ports/range-v3/portfile.cmake
@ -1,3 +1,6 @@
+if(EXISTS ${CURRENT_INSTALLED_DIR}/share/range-v3-vs2015/copyright)
+    message(FATAL_ERROR "'${PORT}' conflicts with 'range-v3-vs2015'. Please remove range-v3-vs2015:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
+endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO ericniebler/range-v3
@ -23,4 +26,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib

 vcpkg_copy_pdbs()

-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
--- a/ports/range-v3/vcpkg.json
+++ b/ports/range-v3/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "range-v3",
  "version": "0.12.0",
-  "port-version": 2,
+  "port-version": 3,
  "description": "Range library for C++14/17/20, basis for C++20's std::ranges",
  "homepage": "https://github.com/ericniebler/range-v3",
  "license": "BSL-1.0 AND MIT AND (NCSA OR MIT)",
--- a/ports/signalrclient/portfile.cmake
+++ b/ports/signalrclient/portfile.cmake
@ -1,3 +1,6 @@
+if(EXISTS ${CURRENT_INSTALLED_DIR}/share/microsoft-signalr/copyright)
+    message(FATAL_ERROR "'${PORT}' conflicts with 'microsoft-signalr'. Please remove microsoft-signalr:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
+endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO SignalR/SignalR-Client-Cpp
@ -25,4 +28,4 @@ vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

 # copy license
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
--- a/ports/signalrclient/vcpkg.json
+++ b/ports/signalrclient/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "signalrclient",
  "version": "1.0.0-beta1-9",
-  "port-version": 5,
+  "port-version": 6,
  "description": "C++ client for SignalR.",
  "homepage": "https://github.com/SignalR/SignalR-Client-Cpp",
  "dependencies": [
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@ -281,9 +281,9 @@ czmq:x64-android=fail
 darknet:arm-neon-android=fail
 darknet:arm64-android=fail
 darknet:x64-android=fail
-dbg-macro:arm-neon-android=fail
-dbg-macro:arm64-android=fail
-dbg-macro:x64-android=fail
+dbg-macro:arm-neon-android=skip
+dbg-macro:arm64-android=skip
+dbg-macro:x64-android=skip
 # Since pipeline cannot automatically install dbghelp dependency, skip this detection
 dbghelp:arm64-uwp=skip
 dbghelp:arm64-windows=skip
@ -475,12 +475,12 @@ ignition-msgs6:x64-android=fail
 ignition-tools:arm-neon-android=fail
 ignition-tools:arm64-android=fail
 ignition-tools:x64-android=fail
-ijg-libjpeg:arm-neon-android=fail
+ijg-libjpeg:arm-neon-android=skip
 ijg-libjpeg:arm64-uwp            = skip
-ijg-libjpeg:arm64-android=fail
+ijg-libjpeg:arm64-android=skip
 ijg-libjpeg:arm64-osx          = skip
 ijg-libjpeg:arm64-windows      = skip
-ijg-libjpeg:x64-android=fail
+ijg-libjpeg:x64-android=skip
 ijg-libjpeg:x64-linux          = skip
 ijg-libjpeg:x64-osx            = skip
 ijg-libjpeg:x64-uwp            = skip
@ -968,11 +968,11 @@ qwt-qt6:x64-osx=fail
 rabit:arm-neon-android=fail
 rabit:arm64-android=fail
 rabit:x64-android=fail
-range-v3-vs2015:arm-neon-android=fail
-range-v3-vs2015:arm64-android=fail
+range-v3-vs2015:arm-neon-android=skip
+range-v3-vs2015:arm64-android=skip
 range-v3-vs2015:arm64-windows      = skip
 range-v3-vs2015:arm64-uwp            = skip
-range-v3-vs2015:x64-android=fail
+range-v3-vs2015:x64-android=skip
 range-v3-vs2015:x64-linux          = skip
 range-v3-vs2015:x64-osx            = skip
 range-v3-vs2015:arm64-osx          = skip
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2206,7 +2206,7 @@
    },
    "dbg-macro": {
      "baseline": "0.5.1",
-      "port-version": 0
+      "port-version": 1
    },
    "dbghelp": {
      "baseline": "0",
@ -3622,7 +3622,7 @@
    },
    "ijg-libjpeg": {
      "baseline": "9e",
-      "port-version": 1
+      "port-version": 2
    },
    "im3d": {
      "baseline": "2022-10-11",
@ -4622,7 +4622,7 @@
    },
    "libjpeg-turbo": {
      "baseline": "3.0.3",
-      "port-version": 0
+      "port-version": 1
    },
    "libjuice": {
      "baseline": "1.5.2",
@ -5806,7 +5806,7 @@
    },
    "microsoft-signalr": {
      "baseline": "0.1.0-alpha4",
-      "port-version": 10
+      "port-version": 11
    },
    "mikktspace": {
      "baseline": "2020-10-06",
@ -5942,7 +5942,7 @@
    },
    "mozjpeg": {
      "baseline": "4.1.5",
-      "port-version": 0
+      "port-version": 1
    },
    "mp-units": {
      "baseline": "2.2.0",
@ -7662,11 +7662,11 @@
    },
    "range-v3": {
      "baseline": "0.12.0",
-      "port-version": 2
+      "port-version": 3
    },
    "range-v3-vs2015": {
      "baseline": "20151130-vcpkg5",
-      "port-version": 2
+      "port-version": 3
    },
    "rapidcheck": {
      "baseline": "2023-12-14",
@ -8222,7 +8222,7 @@
    },
    "signalrclient": {
      "baseline": "1.0.0-beta1-9",
-      "port-version": 5
+      "port-version": 6
    },
    "sigslot": {
      "baseline": "1.0.0",
--- a/versions/d-/dbg-macro.json
+++ b/versions/d-/dbg-macro.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "ffd8edac6f123077ff3d8db1b712d7eb829305f5",
+      "version": "0.5.1",
+      "port-version": 1
+    },
    {
      "git-tree": "d2182df6402c97759e95b4b0f1f506e8df6e42fb",
      "version": "0.5.1",
--- a/versions/i-/ijg-libjpeg.json
+++ b/versions/i-/ijg-libjpeg.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "4a22e20a63c3679dab4839e7a87566b411cf023c",
+      "version-string": "9e",
+      "port-version": 2
+    },
    {
      "git-tree": "e5d413cf2a1c70df27136df1328ba1c344eb935a",
      "version-string": "9e",
--- a/versions/l-/libjpeg-turbo.json
+++ b/versions/l-/libjpeg-turbo.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "191ba1685e900d722a9ddc0be6bdd939990f0984",
+      "version": "3.0.3",
+      "port-version": 1
+    },
    {
      "git-tree": "92dfeb0598eab9d20f4512111e795009a9bc7f00",
      "version": "3.0.3",
--- a/versions/m-/microsoft-signalr.json
+++ b/versions/m-/microsoft-signalr.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "2b29ee52721e3f9ba79a0348a731d9f8a26ef89a",
+      "version": "0.1.0-alpha4",
+      "port-version": 11
+    },
    {
      "git-tree": "dbcb170bce41778a732fcc2655b82d4d3cb7b06c",
      "version": "0.1.0-alpha4",
--- a/versions/m-/mozjpeg.json
+++ b/versions/m-/mozjpeg.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "1d4da761babeb3bdc96cbc5f6261ee8e49840b12",
+      "version": "4.1.5",
+      "port-version": 1
+    },
    {
      "git-tree": "6d5cda3e9c9c8f0ed895897d457afaf8d9604363",
      "version": "4.1.5",
--- a/versions/r-/range-v3-vs2015.json
+++ b/versions/r-/range-v3-vs2015.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "ad11ff1674f1db018ff9b5001fea3c95ef62cc16",
+      "version": "20151130-vcpkg5",
+      "port-version": 3
+    },
    {
      "git-tree": "0f067993520ed7aa3241b7af46d6e3b9120b9950",
      "version": "20151130-vcpkg5",
--- a/versions/r-/range-v3.json
+++ b/versions/r-/range-v3.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "6c5cc9ec0604083c62d9f92276a0751076f28c0d",
+      "version": "0.12.0",
+      "port-version": 3
+    },
    {
      "git-tree": "7e6294e4a64a35e87443969f304bab2a7542f25e",
      "version": "0.12.0",
--- a/versions/s-/signalrclient.json
+++ b/versions/s-/signalrclient.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "57e4e8378a7aa7f0fb2d3459054462e0bacffa94",
+      "version": "1.0.0-beta1-9",
+      "port-version": 6
+    },
    {
      "git-tree": "28135a6a807825f1fdfbb1e086c10569d385482c",
      "version": "1.0.0-beta1-9",