From 387623e87860fd761f68e99a305a7b17f2f174e8 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 29 Apr 2021 22:02:29 +0200 Subject: [comms, commsdsl] update ports (#16415) * update comms * update versions * commsdsl is dynamic only * update version * fail on static * update version * use version-semver instead of version-string * update versions --- ports/comms/portfile.cmake | 6 +++--- ports/comms/vcpkg.json | 3 +-- ports/commsdsl/portfile.cmake | 5 ++--- ports/commsdsl/vcpkg.json | 5 ++--- versions/baseline.json | 8 ++++---- versions/c-/comms.json | 5 +++++ versions/c-/commsdsl.json | 5 +++++ 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/ports/comms/portfile.cmake b/ports/comms/portfile.cmake index d1526e236..70439417d 100644 --- a/ports/comms/portfile.cmake +++ b/ports/comms/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/comms_champion - REF v3.1.3 - SHA512 80aa3e0e53f3de21b8dcb4f02765f59ff58fc8c1b9e21beb09de26a3dd07fc4d6a3bc9fe78fb1c6cc633caabb1dd088f220d077b4a3a0d534cb1d243959c5a08 + REF v3.1.4 + SHA512 4902f8f165200116fe49bc313fc0808bac820f4e5e9084f9bf4e6c1d74ab71a3a056f4b3614b617e71f62cb37346956c69d83b77eb92dd7d9ad0918f1b5edb33 HEAD_REF master ) @@ -23,4 +23,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) \ No newline at end of file +configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) diff --git a/ports/comms/vcpkg.json b/ports/comms/vcpkg.json index 313580685..9fa1daafe 100644 --- a/ports/comms/vcpkg.json +++ b/ports/comms/vcpkg.json @@ -1,7 +1,6 @@ { "name": "comms", - "version-string": "3.1.3", - "port-version": 1, + "version-semver": "3.1.4", "description": "COMMS is the C++(11) headers only, platform independent library, which makes the implementation of a communication protocol to be an easy and relatively quick process.", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/comms_champion" diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake index df428c0f8..a35c67434 100644 --- a/ports/commsdsl/portfile.cmake +++ b/ports/commsdsl/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/commsdsl - REF v3.6 - SHA512 80fab2e567191a468a079dd9964a651293d8e7996141a973e77d4bdfaa96bfc346156f50ce484be1dc2b3d9e661cccce0e712c70876f7b322bc459f81a328496 + REF v3.6.1 + SHA512 e511aeac7659744dd5a30bd1bff3ee011aa4a3371df9ecb8befbd774b6b7951192fcd3bd21837a864d71126987321b66f0063f9e1ba2d59f9dd283334c363e89 HEAD_REF master ) diff --git a/ports/commsdsl/vcpkg.json b/ports/commsdsl/vcpkg.json index c01c9e27d..ee8dc22f9 100644 --- a/ports/commsdsl/vcpkg.json +++ b/ports/commsdsl/vcpkg.json @@ -1,11 +1,10 @@ { "name": "commsdsl", - "version-string": "3.6.0", - "port-version": 1, + "version-semver": "3.6.1", "description": "DSL schemas parser and code generator for CommsChampion Ecosystem", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/commsdsl", - "supports": "!uwp", + "supports": "!uwp & !static", "dependencies": [ "boost-algorithm", "boost-filesystem", diff --git a/versions/baseline.json b/versions/baseline.json index f096dc3eb..c3ac79495 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1317,16 +1317,16 @@ "port-version": 1 }, "comms": { - "baseline": "3.1.3", - "port-version": 1 + "baseline": "3.1.4", + "port-version": 0 }, "comms-ublox": { "baseline": "0.20.0", "port-version": 1 }, "commsdsl": { - "baseline": "3.6.0", - "port-version": 1 + "baseline": "3.6.1", + "port-version": 0 }, "concurrentqueue": { "baseline": "1.0.3", diff --git a/versions/c-/comms.json b/versions/c-/comms.json index 3b070d9d7..15e518aaf 100644 --- a/versions/c-/comms.json +++ b/versions/c-/comms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb4f92eb981baa5bc5b85e2362c513848af83c52", + "version-semver": "3.1.4", + "port-version": 0 + }, { "git-tree": "f767daddd556d8848fe375b07293c5df62a3bd9b", "version-string": "3.1.3", diff --git a/versions/c-/commsdsl.json b/versions/c-/commsdsl.json index 83bf3a75d..880a7f020 100644 --- a/versions/c-/commsdsl.json +++ b/versions/c-/commsdsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "014e972b792fdc47a14d60c1f8a54949f75a9495", + "version-semver": "3.6.1", + "port-version": 0 + }, { "git-tree": "7e27fe7eb3c6be733037eeceefbb7c1805974e30", "version-string": "3.6.0", -- cgit v1.2.3