[comms,commsdsl,comms-ublox] update ports (#19581)

* update comms, add tools feature; update commsdsl

* update versions

* update comms-ublox

* update version

* add quotes to paths

* version

* fix comms dir remove

* version

* remove VCPKG_POLICY_DLLS_WITHOUT_LIBS

* version

* fix some paths

* version

* only allow build of tools if triplet is dynamic

* version

* fail on static

* version

* replace deprecated functions and replace options

* version

* fix

* fix 2

* update version

* apply @JackBoosY suggestions

* version

* Update ports/comms/portfile.cmake

* Update versions/c-/comms.json

* add @NancyLi1013 suggestions

* update versions

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

11 files changed, 104 insertions, 33 deletions

diff --git a/ports/comms-ublox/fix-comms.patch b/ports/comms-ublox/fix-comms.patch
index c1619bfc2..d9620a4aa 100644
--- a/ports/comms-ublox/fix-comms.patch
+++ b/ports/comms-ublox/fix-comms.patch
@@ -16,7 +16,7 @@ index e2b69fe..aff5917 100644
  endif ()

 +else()

 +    find_package(LibComms CONFIG REQUIRED)

-+    set(cc_compile_file ${LibComms_DIR}/CC_Compile.cmake)

++    set(cc_compile_file "${LibComms_DIR}/CC_Compile.cmake")

 +endif()

  

  if (EXISTS ${cc_compile_file})

diff --git a/ports/comms-ublox/portfile.cmake b/ports/comms-ublox/portfile.cmake
index fbf86d8bd..d5fd4bcea 100644
--- a/ports/comms-ublox/portfile.cmake
+++ b/ports/comms-ublox/portfile.cmake
@@ -3,15 +3,15 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO commschamp/cc.ublox.generated

-    REF v0.20.1

-    SHA512 a03a5e63a1430d91d0f8250da576abdf8c86c85a2673817c38f3c883c7a5b736113974c4b56a804174d7fbcdbd198851435f5589d715950427b55180fce70801

+    REF v0.20.2

+    SHA512 5672d964ea3e505837e44a5fd928069a219a5731764cb54bfe8609e39c6c6dd0059660bcde317c6c60cd1bd8d1f7942d2faa022095bf651817568291bc6a7569

     HEAD_REF master

     PATCHES

         fix-comms.patch

 )

 

 vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

+    SOURCE_PATH "${SOURCE_PATH}"

     PREFER_NINJA

     OPTIONS

         -DOPT_BUILD_TEST=OFF

@@ -27,4 +27,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")

 

 # Handle copyright

-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/comms-ublox/vcpkg.json b/ports/comms-ublox/vcpkg.json
index ae997f2e6..93668cae0 100644
--- a/ports/comms-ublox/vcpkg.json
+++ b/ports/comms-ublox/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "comms-ublox",
-  "version-semver": "0.20.1",
+  "version-semver": "0.20.2",
   "description": "UBLOX (UBX) protocol definition, generated out of cc.ublox.commsdsl",
   "homepage": "https://commschamp.github.io/",
   "documentation": "https://github.com/commschamp/cc.ublox.generated",
diff --git a/ports/comms/portfile.cmake b/ports/comms/portfile.cmake
index 7e2f95df0..3ec544e2f 100644
--- a/ports/comms/portfile.cmake
+++ b/ports/comms/portfile.cmake
@@ -3,24 +3,60 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO commschamp/comms_champion

-    REF v3.3

-    SHA512 c60dc6c1ab67a2a5e26468255151ff9f5cbf4a2d7824c8f2ed0f8648b51170150fba26ab6072de9733b8b6e60272f28610d41d6b9df7994a0406f78aed5c686e

+    REF v3.4

+    SHA512 573afbc0aebd72d8a047067410f0f54588675c4cbad37f824edbb6d8303e9c191c573ac9325bf5fec575dffd3d05562c04e75c1e5b748a34d01056bc8b766fb1

     HEAD_REF master

 )

 

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

+vcpkg_check_features(

+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS

+    FEATURES

+        tools   CC_BUILD_TOOLS_LIBRARY

+        tools   CC_INSTALL_TOOLS_LIBRARY

+        tools   CC_BUILD_TOOLS

+        tools   CC_INSTALL_TOOLS

+)

+

+# check before configure

+if("tools" IN_LIST FEATURES)

+    vcpkg_fail_port_install(ON_LIBRARY_LINKAGE "static" MESSAGE "Feature 'Tools' can't be built statically") 

+endif()

+

+vcpkg_cmake_configure(

+    SOURCE_PATH "${SOURCE_PATH}"

     OPTIONS

-        -DCC_COMMS_LIB_ONLY=ON

-        -DCC_NO_UNIT_TESTS=ON

+        ${FEATURE_OPTIONS}

+        -DCC_INSTALL_COMMS_LIB=ON

+        -DCC_BUILD_UNIT_TESTS=OFF

+        -DCC_WARN_AS_ERR=OFF

+        -DCC_BUILD_DEMO_PROTOCOL=OFF

+        -DCC_INSTALL_DEMO_PROTOCOL=OFF

 )

-vcpkg_install_cmake()

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/LibComms/cmake TARGET_PATH share/LibComms)

-# currently this is only a header only library. after moving lib/LibComms to share this lib path will be empty

-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")

-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")

+vcpkg_cmake_install()

+vcpkg_copy_pdbs()

+

+vcpkg_cmake_config_fixup(PACKAGE_NAME "LibComms" CONFIG_PATH "lib/LibComms/cmake" )

+

+if("tools" IN_LIST FEATURES)

+    vcpkg_copy_tools(

+        TOOL_NAMES cc_dump cc_view

+        AUTO_CLEAN

+    )

+    file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/CommsChampion/plugin" 

+         DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/lib/CommsChampion/plugin")

+    vcpkg_cmake_config_fixup(PACKAGE_NAME "CommsChampion" CONFIG_PATH "lib/CommsChampion/cmake")

+

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/LibComms")

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/CommsChampion")

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/LibComms")

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/CommsChampion")

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

+else()

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")

+endif()

 

 # 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)

+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)

diff --git a/ports/comms/vcpkg.json b/ports/comms/vcpkg.json
index 62821a8bf..677032b11 100644
--- a/ports/comms/vcpkg.json
+++ b/ports/comms/vcpkg.json
@@ -1,7 +1,25 @@
 {
   "name": "comms",
-  "version-semver": "3.3.0",
+  "version-semver": "3.4.0",
   "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"
+  "documentation": "https://github.com/commschamp/comms_champion",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tools": {
+      "description": "Builds CommsChampion tools",
+      "dependencies": [
+        "qt5-base"
+      ]
+    }
+  }
 }
diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake
index 7031ab989..60cb2bbbc 100644
--- a/ports/commsdsl/portfile.cmake
+++ b/ports/commsdsl/portfile.cmake
@@ -2,24 +2,26 @@ vcpkg_fail_port_install(ON_TARGET "uwp")
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO commschamp/commsdsl

-    REF v3.6.3

-    SHA512 0cb1573cd7dc000961a053601b85bd3c78183a0083fa654a97412c8024a3dc08bff58c833dea0af522a02888fbc198140d81615c7d8c7d5399871c2b0c2c43c5

+    REF v3.6.4

+    SHA512 dd997bb063baf4e6bc15666539e8d3e8cf435cfda88e8b115b8a1568c8c77cc2ca6dbf1a77ae2fcf9b24f68cb35aa2ae583852cf887fbc85f74e868230374055

     HEAD_REF master

 )

 

 vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

+    SOURCE_PATH "${SOURCE_PATH}"

     PREFER_NINJA

     OPTIONS

         -DCOMMSDSL_NO_COMMS_CHAMPION=ON

-        -DCOMMSDSL_NO_TESTS=ON

-        -DCOMMSDSL_NO_WARN_AS_ERR=ON # remove on next version or on next version of boost

+        -DCOMMSDSL_BUILD_APPS=ON

+        -DCOMMSDSL_INSTALL_APPS=ON

+        -DCOMMSDSL_CHECKOUT_COMMS_CHAMPION=OFF

+        -DCOMMSDSL_BUILD_UNIT_TESTS=OFF

+        -DCOMMSDSL_WARN_AS_ERR=OFF

 )

 vcpkg_install_cmake()

 

 vcpkg_copy_tools(

     TOOL_NAMES commsdsl2comms

-    SEARCH_DIR ${CURRENT_PACKAGES_DIR}/bin

     AUTO_CLEAN

 )

 

@@ -33,4 +35,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")

 endif()

 # Handle copyright

-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/commsdsl/vcpkg.json b/ports/commsdsl/vcpkg.json
index 9e9085fd0..ebfbd0c72 100644
--- a/ports/commsdsl/vcpkg.json
+++ b/ports/commsdsl/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "commsdsl",
-  "version-semver": "3.6.3",
+  "version-semver": "3.6.4",
   "description": "DSL schemas parser and code generator for CommsChampion Ecosystem",
   "homepage": "https://commschamp.github.io/",
   "documentation": "https://github.com/commschamp/commsdsl",
diff --git a/versions/baseline.json b/versions/baseline.json
index e3f56fde3..60a027f1a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1365,15 +1365,15 @@
       "port-version": 1
     },
     "comms": {
-      "baseline": "3.3.0",
+      "baseline": "3.4.0",
       "port-version": 0
     },
     "comms-ublox": {
-      "baseline": "0.20.1",
+      "baseline": "0.20.2",
       "port-version": 0
     },
     "commsdsl": {
-      "baseline": "3.6.3",
+      "baseline": "3.6.4",
       "port-version": 0
     },
     "concurrentqueue": {
diff --git a/versions/c-/comms-ublox.json b/versions/c-/comms-ublox.json
index f6e59f735..bde81cf2d 100644
--- a/versions/c-/comms-ublox.json
+++ b/versions/c-/comms-ublox.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "9d57cdb7ee417cb5e5ed0208d3d9470b79c80f2a",
+      "version-semver": "0.20.2",
+      "port-version": 0
+    },
+    {
       "git-tree": "5d9d9c8e99627bcea62fc1ba2cd9fc496f64a3d2",
       "version-semver": "0.20.1",
       "port-version": 0
diff --git a/versions/c-/comms.json b/versions/c-/comms.json
index 5f8ea3c88..5a0c6228f 100644
--- a/versions/c-/comms.json
+++ b/versions/c-/comms.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "05c5eff9612ccbb544cdcbc8f453e12394956ed8",
+      "version-semver": "3.4.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "3ebf2c0d025a1facfe7ea9e9418e631d3015f532",
       "version-semver": "3.3.0",
       "port-version": 0
diff --git a/versions/c-/commsdsl.json b/versions/c-/commsdsl.json
index a47cbdb09..8096dfd07 100644
--- a/versions/c-/commsdsl.json
+++ b/versions/c-/commsdsl.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "0e714012afcd0c56b2b55f6ab18b0092f6cd0066",
+      "version-semver": "3.6.4",
+      "port-version": 0
+    },
+    {
       "git-tree": "76aec94b428a3078c9135d05a46747c86cc24c7c",
       "version-semver": "3.6.3",
       "port-version": 0