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

* update commsdsl * update comms * versions * updates * format * versions * license * version * apply cr * versions * CRs * versions * Set option to ON * format vcpkg.json * update version Co-authored-by: Jonliu1993 <13720414433@163.com>
2024-11-24 03:00:19 +08:00 · 2022-06-18 00:03:58 +02:00 · 2022-06-18 00:03:58 +02:00 · 92136965ac
commit 92136965ac
parent 895a82aec6
12 changed files with 78 additions and 112 deletions
--- a/ports/comms-ublox/copyright
+++ b/ports/comms-ublox/copyright
@ -0,0 +1,5 @@
+The generated code has no license, the vendor is free to pick any as long as it's compatibile with the license(s) of the relevant CommsChampion Ecosystem project:
+
+The protocol definition uses the COMMS Library, which is provided under the MPL-2.0 licence. It allows usage in any closed source projects as long as modifications to the COMMS Library itself remain open source.
+The CommsChampion Tools use open source Qt5 libraries, hence are licensed under the GPLv3. It means that any relevant plugin code must remain open source and is not really available to be used in the closed source commercial products.
+The code of this project (libraries and tools it contains) is licensed under Apache v2.0 license.
--- a/ports/comms-ublox/fix-comms.patch
+++ b/ports/comms-ublox/fix-comms.patch
@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e2b69fe..aff5917 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -66,6 +66,7 @@ endif ()
- ######################################################################
- 
- # Use external CommsChampion project or compile it in place
-+if(FALSE)
- set (CC_EXTERNAL_TGT "comms_champion_external")
- if (OPT_BUILD_TEST OR OPT_BUILD_PLUGIN)
-     set (external_cc_needed TRUE)
-@@ -107,6 +108,10 @@ elseif (external_cc_needed)
-     find_package(CommsChampion NO_MODULE)
-     set (cc_compile_file "${OPT_CC_MAIN_INSTALL_DIR}/lib/LibComms/cmake/CC_Compile.cmake")
- endif ()
-+else()
-+    find_package(LibComms CONFIG REQUIRED)
-+    set(cc_compile_file "${LibComms_DIR}/CC_Compile.cmake")
-+endif()
- 
- if (EXISTS ${cc_compile_file})
-     # Set compiler flags
--- a/ports/comms-ublox/portfile.cmake
+++ b/ports/comms-ublox/portfile.cmake
@ -3,28 +3,23 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO commschamp/cc.ublox.generated
-    REF v0.20.2
-    SHA512 5672d964ea3e505837e44a5fd928069a219a5731764cb54bfe8609e39c6c6dd0059660bcde317c6c60cd1bd8d1f7942d2faa022095bf651817568291bc6a7569
+    REF v1.0
+    SHA512 0c487d9409c2f2818024f6232832762527250c3563a5eb5c639ad49943931ceb24616db2432bcd752d1a84820ec5349522510dcd202508641d3f29aef41ca1e5
    HEAD_REF master
-    PATCHES
-        fix-comms.patch
 )

-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
    OPTIONS
-        -DOPT_BUILD_TEST=OFF
-        -DOPT_BUILD_PLUGIN=OFF
-        -DOPT_NO_COMMS=ON
-        -DOPT_EXTERNALS_UPDATE_DISCONNECTED=ON
+        -DOPT_REQUIRE_COMMS_LIB=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
 )
-vcpkg_install_cmake()
+vcpkg_cmake_install()

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ublox/cmake TARGET_PATH share/ublox)
+vcpkg_cmake_config_fixup(PACKAGE_NAME ublox CONFIG_PATH lib/ublox/cmake)
 # currently this is only a header only library. after moving lib/ublox to share this lib path will be empty
 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 "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/comms-ublox/vcpkg.json
+++ b/ports/comms-ublox/vcpkg.json
@ -1,10 +1,19 @@
 {
  "name": "comms-ublox",
-  "version-semver": "0.20.2",
+  "version-semver": "1.0.0",
  "description": "UBLOX (UBX) protocol definition, generated out of cc.ublox.commsdsl",
  "homepage": "https://commschamp.github.io/",
  "documentation": "https://github.com/commschamp/cc.ublox.generated",
+  "license": null,
  "dependencies": [
-    "comms"
+    "comms",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
  ]
 }
--- a/ports/comms/portfile.cmake
+++ b/ports/comms/portfile.cmake
@ -1,56 +1,24 @@
 #header-only library
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
-    REPO commschamp/comms_champion
-    REF v3.4
-    SHA512 573afbc0aebd72d8a047067410f0f54588675c4cbad37f824edbb6d8303e9c191c573ac9325bf5fec575dffd3d05562c04e75c1e5b748a34d01056bc8b766fb1
+    REPO commschamp/comms
+    REF v4.0
+    SHA512 ec83bef647dd6c32e6ba98ce51970c48befaa2b0ff9c26f538fb0ce72e46da14cd592a0c652af5f9f10906f7058ff623dcf13ac4b81c96c0aea1fd8a31551bb7
    HEAD_REF master
 )

-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
-)
-
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
-        ${FEATURE_OPTIONS}
-        -DCC_INSTALL_COMMS_LIB=ON
-        -DCC_BUILD_UNIT_TESTS=OFF
+        -DCC_COMMS_BUILD_UNIT_TESTS=OFF
+        -DBUILD_TESTING=OFF
        -DCC_WARN_AS_ERR=OFF
-        -DCC_BUILD_DEMO_PROTOCOL=OFF
-        -DCC_INSTALL_DEMO_PROTOCOL=OFF
 )
 vcpkg_cmake_install()
-vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME LibComms CONFIG_PATH lib/LibComms/cmake)

-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()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")

 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/comms/vcpkg.json
+++ b/ports/comms/vcpkg.json
@ -1,10 +1,10 @@
 {
  "name": "comms",
-  "version-semver": "3.4.0",
-  "port-version": 1,
+  "version-semver": "4.0.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",
+  "license": "MPL-2.0",
  "dependencies": [
    {
      "name": "vcpkg-cmake",
@ -14,14 +14,5 @@
      "name": "vcpkg-cmake-config",
      "host": true
    }
-  ],
-  "features": {
-    "tools": {
-      "description": "Builds CommsChampion tools",
-      "supports": "!static",
-      "dependencies": [
-        "qt5-base"
-      ]
-    }
-  }
+  ]
 }
--- a/ports/commsdsl/portfile.cmake
+++ b/ports/commsdsl/portfile.cmake
@ -1,30 +1,31 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO commschamp/commsdsl
-    REF v3.6.4
-    SHA512 dd997bb063baf4e6bc15666539e8d3e8cf435cfda88e8b115b8a1568c8c77cc2ca6dbf1a77ae2fcf9b24f68cb35aa2ae583852cf887fbc85f74e868230374055
+    REF v4.0
+    SHA512 420fd0dd30aa5530692f40e15e3a640d1ef766c642e91edc07ed182e2125043c6ade1d245ef4d549a606c372c8c5f53fea7faa14b230ff485cf24d4f13ecfbee
    HEAD_REF master
 )

-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
    OPTIONS
-        -DCOMMSDSL_NO_COMMS_CHAMPION=ON
        -DCOMMSDSL_BUILD_APPS=ON
        -DCOMMSDSL_INSTALL_APPS=ON
-        -DCOMMSDSL_CHECKOUT_COMMS_CHAMPION=OFF
+        -DCOMMSDSL_INSTALL_LIBRARY=ON
+        -DCOMMSDSL_INSTALL_LIBRARY_HEADERS=ON
        -DCOMMSDSL_BUILD_UNIT_TESTS=OFF
        -DCOMMSDSL_WARN_AS_ERR=OFF
+        -DCOMMSDSL_WIN_ALLOW_LIBXML_BUILD=OFF
+        -DBUILD_TESTING=OFF
 )
-vcpkg_install_cmake()
+vcpkg_cmake_install()

 vcpkg_copy_tools(
-    TOOL_NAMES commsdsl2comms
+    TOOL_NAMES commsdsl2comms commsdsl2test commsdsl2tools_qt
    AUTO_CLEAN
 )

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/LibCommsdsl/cmake TARGET_PATH share/LibCommsdsl)
+vcpkg_cmake_config_fixup(PACKAGE_NAME LibCommsdsl CONFIG_PATH lib/LibCommsdsl/cmake)
 # after fixing the following dirs are empty
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/LibCommsdsl")
--- a/ports/commsdsl/vcpkg.json
+++ b/ports/commsdsl/vcpkg.json
@ -1,15 +1,20 @@
 {
  "name": "commsdsl",
-  "version-semver": "3.6.4",
-  "port-version": 1,
+  "version-semver": "4.0.0",
  "description": "DSL schemas parser and code generator for CommsChampion Ecosystem",
  "homepage": "https://commschamp.github.io/",
  "documentation": "https://github.com/commschamp/commsdsl",
-  "supports": "!uwp & !static",
+  "license": "Apache-2.0",
+  "supports": "!uwp",
  "dependencies": [
-    "boost-algorithm",
-    "boost-filesystem",
-    "boost-program-options",
-    "libxml2"
+    "libxml2",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
  ]
 }
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -1513,16 +1513,16 @@
      "port-version": 0
    },
    "comms": {
-      "baseline": "3.4.0",
-      "port-version": 1
+      "baseline": "4.0.0",
+      "port-version": 0
    },
    "comms-ublox": {
-      "baseline": "0.20.2",
+      "baseline": "1.0.0",
      "port-version": 0
    },
    "commsdsl": {
-      "baseline": "3.6.4",
-      "port-version": 1
+      "baseline": "4.0.0",
+      "port-version": 0
    },
    "compoundfilereader": {
      "baseline": "0.1.0",
--- a/versions/c-/comms-ublox.json
+++ b/versions/c-/comms-ublox.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "a129592b8ecf08fed15abaeab8b8c229ef16d045",
+      "version-semver": "1.0.0",
+      "port-version": 0
+    },
    {
      "git-tree": "9d57cdb7ee417cb5e5ed0208d3d9470b79c80f2a",
      "version-semver": "0.20.2",
--- a/versions/c-/comms.json
+++ b/versions/c-/comms.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "3a9bdbc7d61f9494ad2853f702a19699dae74a70",
+      "version-semver": "4.0.0",
+      "port-version": 0
+    },
    {
      "git-tree": "377ae2ef208c319a5b1360f6dbce38ddae897466",
      "version-semver": "3.4.0",
--- a/versions/c-/commsdsl.json
+++ b/versions/c-/commsdsl.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "a363dfeed76ba38fa1d1b3007b06223c347e0063",
+      "version-semver": "4.0.0",
+      "port-version": 0
+    },
    {
      "git-tree": "6dc397dcd2267999f4c8d34fabd9a7e2dcf48ced",
      "version-semver": "3.6.4",