From d1657f4c9b0dedbfd917fc3ffba16f0e106b9fb5 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 8 Sep 2021 12:41:40 +0800 Subject: [PATCH] [arcus/any-lite/aixlog] Update to the latest version (#19977) * [arcus/any-lite/aixlog] Update to the latest version * update version * Apply requested changes * update version * update vcpkg.json * update version --- ports/aixlog/CONTROL | 3 --- ports/aixlog/portfile.cmake | 17 +++++++++++------ ports/aixlog/vcpkg.json | 11 +++++++++++ ports/any-lite/CONTROL | 3 --- ports/any-lite/portfile.cmake | 24 ++++++++---------------- ports/any-lite/vcpkg.json | 15 +++++++++++++++ ports/arcus/CONTROL | 6 ------ ports/arcus/portfile.cmake | 15 +++++++-------- ports/arcus/vcpkg.json | 18 ++++++++++++++++++ versions/a-/aixlog.json | 5 +++++ versions/a-/any-lite.json | 5 +++++ versions/a-/arcus.json | 5 +++++ versions/baseline.json | 6 +++--- 13 files changed, 88 insertions(+), 45 deletions(-) delete mode 100644 ports/aixlog/CONTROL create mode 100644 ports/aixlog/vcpkg.json delete mode 100644 ports/any-lite/CONTROL create mode 100644 ports/any-lite/vcpkg.json delete mode 100644 ports/arcus/CONTROL create mode 100644 ports/arcus/vcpkg.json diff --git a/ports/aixlog/CONTROL b/ports/aixlog/CONTROL deleted file mode 100644 index d0b7edb2f9..0000000000 --- a/ports/aixlog/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: aixlog -Version: 1.4.0 -Description: Header-only C++ logging library diff --git a/ports/aixlog/portfile.cmake b/ports/aixlog/portfile.cmake index c1e2789475..5249e4d23d 100644 --- a/ports/aixlog/portfile.cmake +++ b/ports/aixlog/portfile.cmake @@ -1,11 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO badaix/aixlog - REF c268f271ef7e7181389205e985740f29e6744a8c # v1.4.0 - SHA512 7014d22a0bdbaf85191d18652531af6e0c8ff6d8041bf92a80d51994cfbdf0d9d63c4f8836b9bba16d1895ffa03ad0749a42bd11706eb5f3cde1dcbe76746c24 + REF fd4a341740ee840092963de852584ec8ff811c4f # v1.5.0 + SHA512 10ab07dcb1e67064c0d69ddcf9289d79d914c70fe6922f32179f9ac38d5c682a4ebe08b686d8160c699a6b966bc7aa2fd7d0268664570a10ce146850e78b292d ) - -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aixlog/vcpkg.json b/ports/aixlog/vcpkg.json new file mode 100644 index 0000000000..978c86f3f6 --- /dev/null +++ b/ports/aixlog/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "aixlog", + "version-semver": "1.5.0", + "description": "Header-only C++ logging library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/any-lite/CONTROL b/ports/any-lite/CONTROL deleted file mode 100644 index 6eaf3d1670..0000000000 --- a/ports/any-lite/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: any-lite -Version: 0.2.0 -Description: A C++17-like any, a type-safe container for single values of any type for C++98, C++11 and later in a single-file header-only library diff --git a/ports/any-lite/portfile.cmake b/ports/any-lite/portfile.cmake index 22809839c2..a1b509d658 100644 --- a/ports/any-lite/portfile.cmake +++ b/ports/any-lite/portfile.cmake @@ -1,29 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/any-lite - REF v0.2.0 - SHA512 703900d7bac96d41f903b6cabba4bce15ef3cf7ef0a6a66de76230498ededff110e43d68d4a3fd6996869b2edd001f69bd53039a214d06b774ce99518f384a68 + REF d45a83b8e49d09ff5e5b66c10a56c997946436d9 #v0.4.0 + SHA512 b73fe2d1e6de24e143337ef72f71949bf2ae4157a58a5c7e45dd0e9412dd798da6ef929fa09d104305483e769a603b37babd7ba65ab854a33483ab3ec8a921ec ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DANY_LITE_OPT_BUILD_TESTS=OFF -DANY_LITE_OPT_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( - CONFIG_PATH lib/cmake/${PORT} -) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file( REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file( INSTALL - ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright -) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/any-lite/vcpkg.json b/ports/any-lite/vcpkg.json new file mode 100644 index 0000000000..31f836c51d --- /dev/null +++ b/ports/any-lite/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "any-lite", + "version-semver": "0.4.0", + "description": "A C++17-like any, a type-safe container for single values of any type for C++98, C++11 and later in a single-file header-only library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/arcus/CONTROL b/ports/arcus/CONTROL deleted file mode 100644 index 297d3b0555..0000000000 --- a/ports/arcus/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: arcus -Version: 4.8.0 -Homepage: https://github.com/Ultimaker/libArcus -Description: This library contains C++ bindings for creating a socket in a thread and using this socket to send and receive messages based on the Protocol Buffers library. -Supports: !uwp -Build-Depends: protobuf diff --git a/ports/arcus/portfile.cmake b/ports/arcus/portfile.cmake index a149c16964..d22a64d30b 100644 --- a/ports/arcus/portfile.cmake +++ b/ports/arcus/portfile.cmake @@ -3,28 +3,27 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ultimaker/libArcus - REF 4.8.0 - SHA512 44db9b48ab6be08c30f2121d68197a7347eaf3ee255649969a773afbe45ec2433e2cc082aa72f6d40dad7ea28345da858471fff9a129365a4e848df8c8c07689 + REF 617f6f71572090f73cb44592b12f49567b539e5b #v4.10.0 + SHA512 cf0954d8b10d9f94165aa5c086d0e58c2925464f9fbe4252535c36d7e6bb12b767d89efb816c9e642f9cd7f0ec0d66d61ca21c5121a05340499d38d5d851f73b HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_PYTHON=OFF -DBUILD_EXAMPLES=OFF -DBUILD_STATIC=${ENABLE_STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Arcus TARGET_PATH share/arcus) +vcpkg_cmake_config_fixup(PACKAGE_NAME Arcus CONFIG_PATH lib/cmake/Arcus) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/arcus/copyright" COPYONLY) \ No newline at end of file +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) \ No newline at end of file diff --git a/ports/arcus/vcpkg.json b/ports/arcus/vcpkg.json new file mode 100644 index 0000000000..bb3d46b35c --- /dev/null +++ b/ports/arcus/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "arcus", + "version-semver": "4.10.0", + "description": "This library contains C++ bindings for creating a socket in a thread and using this socket to send and receive messages based on the Protocol Buffers library.", + "homepage": "https://github.com/Ultimaker/libArcus", + "supports": "!uwp", + "dependencies": [ + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/aixlog.json b/versions/a-/aixlog.json index ce2a415ade..203715084b 100644 --- a/versions/a-/aixlog.json +++ b/versions/a-/aixlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca812db174980bd0007da672c5ec4dd52134bf73", + "version-semver": "1.5.0", + "port-version": 0 + }, { "git-tree": "b75ca5f2a37de51c0e0b369a124fb0ae5a05d323", "version-string": "1.4.0", diff --git a/versions/a-/any-lite.json b/versions/a-/any-lite.json index 50b9920160..1ad1fa100c 100644 --- a/versions/a-/any-lite.json +++ b/versions/a-/any-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80479a956ce0c1547469f0b887278b07ac8de0c0", + "version-semver": "0.4.0", + "port-version": 0 + }, { "git-tree": "cf16580f5d27b67f0fca4ebf3eba27ad70925859", "version-string": "0.2.0", diff --git a/versions/a-/arcus.json b/versions/a-/arcus.json index 1c8f915e0a..c222d1ef0e 100644 --- a/versions/a-/arcus.json +++ b/versions/a-/arcus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76f86c7d5993d59f58a0863b9e2ca439db88efba", + "version-semver": "4.10.0", + "port-version": 0 + }, { "git-tree": "60c6c8f7ebf7b481fba071481b60e89085093e87", "version-string": "4.8.0", diff --git a/versions/baseline.json b/versions/baseline.json index 13a56e3e4a..528f2b2d16 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -33,7 +33,7 @@ "port-version": 0 }, "aixlog": { - "baseline": "1.4.0", + "baseline": "1.5.0", "port-version": 0 }, "akali": { @@ -89,7 +89,7 @@ "port-version": 0 }, "any-lite": { - "baseline": "0.2.0", + "baseline": "0.4.0", "port-version": 0 }, "anyrpc": { @@ -121,7 +121,7 @@ "port-version": 0 }, "arcus": { - "baseline": "4.8.0", + "baseline": "4.10.0", "port-version": 0 }, "argagg": {