diff --git a/ports/google-cloud-cpp-common/CONTROL b/ports/google-cloud-cpp-common/CONTROL index 6408941b2e43fe..481343c97e6509 100644 --- a/ports/google-cloud-cpp-common/CONTROL +++ b/ports/google-cloud-cpp-common/CONTROL @@ -1,9 +1,4 @@ Source: google-cloud-cpp-common -Version: 0.25.0 -Build-Depends: grpc, googleapis -Description: Base C++ Libraries for Google Cloud Platform APIs -Homepage: https://github.com/googleapis/google-cloud-cpp-common - -Feature: test -Description: Build test -Build-Depends: gtest +Version: alias +Build-Depends: google-cloud-cpp +Description: Deprecated, use google-cloud-cpp instead diff --git a/ports/google-cloud-cpp-common/portfile.cmake b/ports/google-cloud-cpp-common/portfile.cmake index e4ba4fa7261604..065116c276adcf 100644 --- a/ports/google-cloud-cpp-common/portfile.cmake +++ b/ports/google-cloud-cpp-common/portfile.cmake @@ -1,30 +1 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO googleapis/google-cloud-cpp-common - REF v0.25.0 - SHA512 074294e8b824d7f2b9d6d4051f4fbb28ca83166aad98ff000348abb238488b1c957726d901dae041bf50aa23ab368da5cf1d23ad42454f9ad07153976c0a29fe - HEAD_REF master) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - test BUILD_TESTING -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE - OPTIONS - ${FEATURE_OPTIONS} - -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF) - -vcpkg_install_cmake(ADD_BIN_TO_PATH) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_copy_pdbs() +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/google-cloud-cpp-spanner/CONTROL b/ports/google-cloud-cpp-spanner/CONTROL index 82d7ea0a63858d..69cc736359ac2b 100644 --- a/ports/google-cloud-cpp-spanner/CONTROL +++ b/ports/google-cloud-cpp-spanner/CONTROL @@ -1,5 +1,4 @@ Source: google-cloud-cpp-spanner -Version: 1.1.0 -Build-Depends: grpc, googleapis, google-cloud-cpp-common -Description: C++ Client Library for Google Cloud Spanner. -Homepage: https://github.com/googleapis/google-cloud-cpp-spanner +Version: alias +Build-Depends: google-cloud-cpp +Description: Deprecated, use google-cloud-cpp instead diff --git a/ports/google-cloud-cpp-spanner/portfile.cmake b/ports/google-cloud-cpp-spanner/portfile.cmake index ffbae18dfc7490..065116c276adcf 100644 --- a/ports/google-cloud-cpp-spanner/portfile.cmake +++ b/ports/google-cloud-cpp-spanner/portfile.cmake @@ -1,29 +1 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO googleapis/google-cloud-cpp-spanner - REF v1.1.0 - SHA512 00141418a01ff55cf2228e3f59a49e49bc35e28da958a7817964976196bb6019e5f04e2d9ceacc758d649c8cc91d35df14aec23f9e8fa4044cfaa67115dc6e69 - HEAD_REF master -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE - OPTIONS - -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF - -DBUILD_TESTING=OFF -) - -vcpkg_install_cmake(ADD_BIN_TO_PATH) - -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_copy_pdbs() +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/google-cloud-cpp/0001-fix-x86-build.patch b/ports/google-cloud-cpp/0001-fix-x86-build.patch deleted file mode 100644 index ec3674cb75178d..00000000000000 --- a/ports/google-cloud-cpp/0001-fix-x86-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/google/cloud/storage/parallel_upload.h b/google/cloud/storage/parallel_upload.h -index 44f542d..4fd97bd 100644 ---- a/google/cloud/storage/parallel_upload.h -+++ b/google/cloud/storage/parallel_upload.h -@@ -515,7 +515,7 @@ StatusOr> CreateUploadShards( - - std::size_t const wanted_num_streams = - (std::max)(1, -- (std::min)(max_streams, -+ (std::min)(max_streams, - div_ceil(file_size, min_stream_size))); - - std::uintmax_t const stream_size = diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index ba320d8f2e6858..715c0c153555da 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,5 +1,6 @@ Source: google-cloud-cpp -Version: 0.21.0 -Build-Depends: grpc, curl[ssl], crc32c, googleapis, google-cloud-cpp-common +Version: 1.14.0 +Build-Depends: abseil, grpc, curl[ssl], crc32c Description: C++ Client Libraries for Google Cloud Platform APIs. Homepage: https://github.com/googleapis/google-cloud-cpp +Supports: !uwp diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 0bb7ef74237c34..601f2b3db6b5fc 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v0.21.0 - SHA512 744c7a14c31966df1f1383ad5804428807babf53079ed96514367f145eb38b4b90be3e0f9c6f16deb9269c754fd5a44e898e5afb77f6f749ba968605d79b8397 + REF v1.14.0 + SHA512 73ab8fd6167616ff0671c15b59afe0a0c8816badd873293d3645b46f74d5f4dfc7f89de84019c5933c132c3d061456067f686f72c1c5e775d9e8a3dae3cdc63f HEAD_REF master - PATCHES - 0001-fix-x86-build.patch ) vcpkg_configure_cmake( @@ -15,8 +13,8 @@ vcpkg_configure_cmake( PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS - -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF + -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF -DBUILD_TESTING=OFF ) diff --git a/ports/googleapis/CONTROL b/ports/googleapis/CONTROL index c96f5b6e507f41..08a9ee1130d99e 100644 --- a/ports/googleapis/CONTROL +++ b/ports/googleapis/CONTROL @@ -1,6 +1,4 @@ Source: googleapis -Version: 0.9.0 -Build-Depends: grpc, protobuf -Description: C++ Proto Libraries for Google APIs. -Homepage: https://github.com/googleapis/cpp-cmakefiles -Supports: !uwp +Version: alias +Build-Depends: google-cloud-cpp +Description: Deprecated, use google-cloud-cpp instead. diff --git a/ports/googleapis/portfile.cmake b/ports/googleapis/portfile.cmake index 4693479acc9ff5..065116c276adcf 100644 --- a/ports/googleapis/portfile.cmake +++ b/ports/googleapis/portfile.cmake @@ -1,28 +1 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO googleapis/cpp-cmakefiles - REF v0.9.0 - SHA512 74791d0ae2fcac0a1acdc255e65f7ca46de8b5129f5b9b066efd0d83c5b3bf61e41b9c3ec6924cfbfb77e5496fa9e2db113f8d17dcc0740058bb19f4d1115f18 - HEAD_REF master -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) - -vcpkg_install_cmake(ADD_BIN_TO_PATH) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_copy_pdbs() - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 06ac3d996a58fd..fc07a7856f2038 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -552,10 +552,9 @@ gmmlib:x64-uwp=fail gmmlib:x64-windows=fail gmmlib:x64-windows-static=fail gmmlib:x86-windows=fail -googleapis:arm64-windows=fail -googleapis:arm-uwp=fail -googleapis:x64-uwp=fail -google-cloud-cpp-spanner:x86-windows=fail +google-cloud-cpp:arm64-windows=fail +google-cloud-cpp:arm-uwp=fail +google-cloud-cpp:x64-uwp=fail gppanel:x64-osx=fail gperf:x64-uwp=fail gperf:arm-uwp=fail