From 48b59daff4692bee24e35dba0e3c5d3d3a356f2b Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 26 Mar 2021 00:12:33 +0800 Subject: [PATCH] [vcpkg baseline][gsoap] Update to 2.8.112 (#16837) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [gsoap] Update to 2.8.112 * Update versions * Update supports * Update versions/g-/gsoap.json * [gsoap] Skip in CI * Update scripts/ci.baseline.txt Co-authored-by: Robert Schumacher Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/gsoap/CONTROL | 6 ------ ports/gsoap/portfile.cmake | 8 +++++--- ports/gsoap/vcpkg.json | 7 +++++++ scripts/ci.baseline.txt | 6 ++++++ versions/baseline.json | 2 +- versions/g-/gsoap.json | 5 +++++ 6 files changed, 24 insertions(+), 10 deletions(-) delete mode 100644 ports/gsoap/CONTROL create mode 100644 ports/gsoap/vcpkg.json diff --git a/ports/gsoap/CONTROL b/ports/gsoap/CONTROL deleted file mode 100644 index 80908bf0ce..0000000000 --- a/ports/gsoap/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: gsoap -Version: 2.8.111 -Build-Depends: curl -Homepage: https://sourceforge.net/projects/gsoap2/ -Description: The gSOAP toolkit is a C and C++ software development toolkit for SOAP and REST XML Web services and generic C/C++ XML data bindings. -Supports: !(linux|osx|arm|uwp) diff --git a/ports/gsoap/portfile.cmake b/ports/gsoap/portfile.cmake index f192e6e58e..3ba596bc42 100644 --- a/ports/gsoap/portfile.cmake +++ b/ports/gsoap/portfile.cmake @@ -1,11 +1,13 @@ +message(FATAL_ERROR "gsoap does not offer permanent public downloads of its sources; all versions except the latest are removed from sourceforge. Therefore, vcpkg cannot support this library directly in the central catalog. If you would like to use gsoap, you can use this port as a starting point (${CMAKE_CURRENT_LIST_DIR}) and update it to use a permanent commercial copy or the latest public download. Do not report issues with this library to the vcpkg GitHub.") + vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "arm" "arm64") vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO gsoap2 REF gsoap-2.8 - FILENAME "gsoap_2.8.111.zip" - SHA512 9cc7f0252f82ec18d19784aba2d913e70620fc09955d148a31e2c89bba4915d20a6b592bd7b6a747f89dc3ab17b2bc542d672933fa1a3acbf59bc3d1f49fe31b + FILENAME "gsoap_2.8.112.zip" + SHA512 0c2562891a738916235f1d4b19d8419d96d0466ca4b729766551183c7b9b90cbe35bbf7fe126b3ea6b18138cbf591c9a9b5b73ddea7152ccdd2f790777c2b6d8 PATCHES fix-build-in-windows.patch ) @@ -14,7 +16,7 @@ set(BUILD_ARCH "Win32") # Handle binary files and includes file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/gsoap ${CURRENT_PACKAGES_DIR}/debug/tools) -if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if (VCPKG_TARGET_IS_WINDOWS) vcpkg_build_msbuild( USE_VCPKG_INTEGRATION PROJECT_PATH ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln diff --git a/ports/gsoap/vcpkg.json b/ports/gsoap/vcpkg.json new file mode 100644 index 0000000000..ffa37c5d2b --- /dev/null +++ b/ports/gsoap/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "gsoap", + "version": "2.8.112", + "description": "The gSOAP toolkit is a C and C++ software development toolkit for SOAP and REST XML Web services and generic C/C++ XML data bindings.", + "homepage": "https://sourceforge.net/projects/gsoap2/", + "supports": "!(linux | osx | arm | uwp)" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 36519bbef7..223cd42c35 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -368,6 +368,12 @@ gasol:x64-uwp=fail geos:arm-uwp=fail geos:x64-uwp=fail +# gsoap does not offer stable public source downloads +gsoap:x64-windows = skip +gsoap:x86-windows = skip +gsoap:x64-windows-static = skip +gsoap:x64-windows-static-md = skip + # Port geotrans source ftp://ftp.nga.mil server # extremely slow may take several hours to download geotrans:x64-linux = skip diff --git a/versions/baseline.json b/versions/baseline.json index 3c8d9e5f0f..4a5572ae9b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2337,7 +2337,7 @@ "port-version": 0 }, "gsoap": { - "baseline": "2.8.111", + "baseline": "2.8.112", "port-version": 0 }, "gtest": { diff --git a/versions/g-/gsoap.json b/versions/g-/gsoap.json index 598289f7f9..a81153c336 100644 --- a/versions/g-/gsoap.json +++ b/versions/g-/gsoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f3950a7c522535f3095358a298f7af276894a94", + "version": "2.8.112", + "port-version": 0 + }, { "git-tree": "010523cbf786f4563ccef87dc0d28b13083f06f0", "version-string": "2.8.111",