[h3/jaeger-client-cpp] Update to the latest version (#20008)

* [h3/jaeger-client-cpp] Update to the latest version * Remove CONTROL files * Update version files * Update patch * Update versions/j-/jaeger-client-cpp.json
2021-09-08 23:00:54 +08:00 · 2021-09-08 23:00:54 +08:00 · 6ea34201f3
parent 277e9a7f46
commit 6ea34201f3
11 changed files with 85 additions and 53 deletions
--- a/ports/h3/CONTROL
+++ b/ports/h3/CONTROL
@ -1,4 +0,0 @@
-Source: h3
-Version: 3.6.3
-Homepage: https://github.com/uber/h3
-Description: A Hexagonal Hierarchical Geospatial Indexing System
--- a/ports/h3/portfile.cmake
+++ b/ports/h3/portfile.cmake
@ -1,29 +1,28 @@
-vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP")
+vcpkg_fail_port_install(ON_TARGET "UWP")
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

 vcpkg_from_github(
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO uber/h3
-        REF v3.6.3
-        SHA512 925438663ef9fb6541e4655dc95febe6233f078f8277937d8a9b33a76cf9b257d8c14e3ac5109460ac9188c426e6997700c4ec17926cf401577b3faf74c6c320
-        HEAD_REF master
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO uber/h3
+    REF 26a6409156ba8539b2b332f799486572f1f8bab2 #v3.6.3
+    SHA512 ee3450a5720951254fcdd9bb3acc4b33ed4a58c214e1ed8a091791674b57f0a48de76f0483b31b0b2ad9c316af6a5fcb0c3b72428b8f6380d6b6f717aaed73d7
+    HEAD_REF master
 )

-vcpkg_configure_cmake(
-        SOURCE_PATH ${SOURCE_PATH}
-        PREFER_NINJA
-        OPTIONS
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
        -DBUILD_BENCHMARKS=OFF
        -DBUILD_FILTERS=OFF
        -DBUILD_GENERATORS=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})

 vcpkg_copy_pdbs()

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

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/h3/vcpkg.json
+++ b/ports/h3/vcpkg.json
@ -0,0 +1,17 @@
+{
+  "name": "h3",
+  "version-semver": "3.7.2",
+  "description": "A Hexagonal Hierarchical Geospatial Indexing System",
+  "homepage": "https://github.com/uber/h3",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
--- a/ports/jaeger-client-cpp/CONTROL
+++ b/ports/jaeger-client-cpp/CONTROL
@ -1,6 +0,0 @@
-Source: jaeger-client-cpp
-Version: 0.5.1-1
-Build-Depends: nlohmann-json,thrift,yaml-cpp,opentracing
-Homepage: https://github.com/jaegertracing/jaeger-client-cpp
-Description: C++ OpenTracing binding for Jaeger https://jaegertracing.io/
-Supports: !arm64
--- a/ports/jaeger-client-cpp/fix-CMakeLists.patch
+++ b/ports/jaeger-client-cpp/fix-CMakeLists.patch
@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5893f31..c8864fd 100644
+index d9bf7b5..eb2692c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -59,7 +59,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND
+@@ -60,7 +60,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND
 endif()
 
 hunter_add_package(thrift)
@ -11,7 +11,7 @@ index 5893f31..c8864fd 100644
 if(HUNTER_ENABLED)
   list(APPEND LIBS thrift::thrift_static)
 else()
-@@ -268,6 +268,9 @@ if(JAEGERTRACING_PLUGIN)
+@@ -273,6 +273,9 @@ if(JAEGERTRACING_PLUGIN)
   file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/export.map
     "{ global: OpenTracingMakeTracerFactory; local: *; };")
   add_library(jaegertracing_plugin MODULE ${SRC})
@ -21,7 +21,7 @@ index 5893f31..c8864fd 100644
   add_lib_deps(jaegertracing_plugin)
   target_link_libraries(jaegertracing_plugin PUBLIC
     -static-libgcc
-@@ -410,7 +413,7 @@ include(GNUInstallDirs)
+@@ -418,7 +421,7 @@ include(GNUInstallDirs)
 #   * <prefix>/lib*/cmake/<PROJECT-NAME>
 #   * <prefix>/lib*/
 #   * <prefix>/include/
--- a/ports/jaeger-client-cpp/portfile.cmake
+++ b/ports/jaeger-client-cpp/portfile.cmake
@ -4,21 +4,21 @@ vcpkg_fail_port_install(ON_ARCH "arm64")
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO jaegertracing/jaeger-idl
-    REF 378b83a64a4a822a4e7d2936bac5d787780555ad
-    SHA512 eceea3dc806600bea8a05b597e26035e97950db227bbefc582d8f20ad549e0be42ebfad92ef3927ebc4892233bac9bcf85a96a25c17ec71fbca0b1b1755f556f
+    REF b9acaab7b20fd4f984225657ffe272799ebdfefb #commit on 2021-08-04
+    SHA512 d136e68e54f39779a48b1c5bc61f81dc06b312120dc8d3788a9c360f89aa924ca4cc074c6515743a930982637f9fca94299000a4b2dca1f9c243d8d9d1c62de2
    HEAD_REF master
 )

 # Create target directory for proxy/stub generation
-file(MAKE_DIRECTORY ${SOURCE_PATH}/data)
+file(MAKE_DIRECTORY "${SOURCE_PATH}/data")
 # List of input files
 set(THRIFT_SOURCE_FILES agent.thrift jaeger.thrift sampling.thrift zipkincore.thrift crossdock/tracetest.thrift baggage.thrift dependency.thrift aggregation_validator.thrift)

 # Generate proxy/stubs for the input files
 foreach(THRIFT_SOURCE_FILE IN LISTS THRIFT_SOURCE_FILES)
 vcpkg_execute_required_process(
-    COMMAND ${CURRENT_INSTALLED_DIR}/tools/thrift/thrift --gen cpp:no_skeleton -o "${SOURCE_PATH}/data" ${THRIFT_SOURCE_FILE}
-    WORKING_DIRECTORY ${SOURCE_PATH}/thrift
+    COMMAND "${CURRENT_INSTALLED_DIR}/tools/thrift/thrift" --gen cpp:no_skeleton -o "${SOURCE_PATH}/data" ${THRIFT_SOURCE_FILE}
+    WORKING_DIRECTORY "${SOURCE_PATH}/thrift"
    LOGNAME jaeger-idl-${TARGET_TRIPLET}
 )
 endforeach()
@ -30,17 +30,16 @@ set(IDL_SOURCE_DIR "${SOURCE_PATH}/data/gen-cpp")
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO jaegertracing/jaeger-client-cpp
-    REF 47fbf19aae2e48d59dd8335b6f2a1e1a99abba7f
-    SHA512 a07e4d3e585c0f3e99aff6a662229f6beed8aef80fc6f7188629da38421bc49ab9effea479398e0d94e0a127bd931054ab332b38b73c2191bf75d4adfe5f6928
+    REF 277fdd75e413c914bff04d510afafc7f0811a31a #v0.7.0
+    SHA512 5112bda5ec24621044bbcd5393922564de70f4d696b1d4248e889dd3d49e492155bfc88626fea214ce4e4cb50e9a49ea031ddb8efbaafc6f1753a586db534a50
    HEAD_REF master
    PATCHES
-       "fix-CMakeLists.patch"
+        fix-CMakeLists.patch
 )

 # Do not use hunter, not testtools and build opentracing plugin
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
        -DHUNTER_ENABLED=0
        -DBUILD_TESTING=0
@ -49,20 +48,20 @@ vcpkg_configure_cmake(
 )

 # Copy generated files over to jaeger-client-cpp
-file(GLOB IDL_SOURCE_FILES LIST_DIRECTORIES false ${IDL_SOURCE_DIR}/*)
-file(COPY ${IDL_SOURCE_FILES} DESTINATION ${SOURCE_PATH}/src/jaegertracing/thrift-gen)
+file(GLOB IDL_SOURCE_FILES LIST_DIRECTORIES false "${IDL_SOURCE_DIR}/*")
+file(COPY ${IDL_SOURCE_FILES} DESTINATION "${SOURCE_PATH}/src/jaegertracing/thrift-gen")

 # Generate Jaeger client
-vcpkg_install_cmake()
+vcpkg_cmake_install()

-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()

 # Cleanup unused Debug files
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

 # Cleanup
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/jaegertracing/testutils)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/jaegertracing/testutils")
--- a/ports/jaeger-client-cpp/vcpkg.json
+++ b/ports/jaeger-client-cpp/vcpkg.json
@ -0,0 +1,21 @@
+{
+  "name": "jaeger-client-cpp",
+  "version-semver": "0.7.0",
+  "description": "C++ OpenTracing binding for Jaeger https://jaegertracing.io/",
+  "homepage": "https://github.com/jaegertracing/jaeger-client-cpp",
+  "supports": "!arm64",
+  "dependencies": [
+    "nlohmann-json",
+    "opentracing",
+    "thrift",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "yaml-cpp"
+  ]
+}
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@ -418,9 +418,6 @@ gtk:x64-windows-static=fail
 gtk:x64-windows-static-md=fail
 gts:x64-osx=fail
 guetzli:x64-osx=fail
-h3:arm64-windows=fail
-h3:arm-uwp=fail
-h3:x64-uwp=fail
 halide:x64-windows-static=fail
 hdf5:arm64-windows=fail
 hdf5:arm-uwp=fail
@ -489,7 +486,6 @@ isal:x64-windows=fail
 isal:x64-windows-static=fail
 isal:x64-windows-static-md=fail
 isal:x86-windows=fail
-jaeger-client-cpp:arm64-windows=fail
 jbig2dec:arm-uwp=fail
 jbig2dec:x64-uwp=fail
 jemalloc:arm64-windows=fail
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2505,7 +2505,7 @@
      "port-version": 0
    },
    "h3": {
-      "baseline": "3.6.3",
+      "baseline": "3.7.2",
      "port-version": 0
    },
    "h5py-lzf": {
@ -2793,7 +2793,7 @@
      "port-version": 0
    },
    "jaeger-client-cpp": {
-      "baseline": "0.5.1-1",
+      "baseline": "0.7.0",
      "port-version": 0
    },
    "jansson": {
--- a/versions/h-/h3.json
+++ b/versions/h-/h3.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "6c441a2da3a894cd1f1ec177c4b73abf2686f5b2",
+      "version-semver": "3.7.2",
+      "port-version": 0
+    },
    {
      "git-tree": "fa85d7bae358fa15d03381d256c84bccb04ff1ea",
      "version-string": "3.6.3",
--- a/versions/j-/jaeger-client-cpp.json
+++ b/versions/j-/jaeger-client-cpp.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "7b0bbe0b96ee8a4f4bffc825ada7b9c713468307",
+      "version-semver": "0.7.0",
+      "port-version": 0
+    },
    {
      "git-tree": "66b3f5f6f74acba54c8ab222118d0ae91a726299",
      "version-string": "0.5.1-1",