From c3cfb02466318e328c7e9ef56ba28bcafce96cfd Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 27 May 2020 11:40:27 +0800 Subject: [PATCH] [libusbmuxd berkeleydb cppcms activemq-cpp] Add Supports and failure message (#11589) * [libusbmuxd berkeleydb cppcms] Add Supports and failure message * Add Supports for activemq-cpp --- ports/activemq-cpp/CONTROL | 4 ++-- ports/activemq-cpp/portfile.cmake | 11 ++--------- ports/berkeleydb/CONTROL | 4 ++-- ports/berkeleydb/portfile.cmake | 9 ++------- ports/cppcms/CONTROL | 3 ++- ports/cppcms/portfile.cmake | 10 ++++------ ports/libusbmuxd/CONTROL | 3 ++- ports/libusbmuxd/portfile.cmake | 2 ++ 8 files changed, 18 insertions(+), 28 deletions(-) diff --git a/ports/activemq-cpp/CONTROL b/ports/activemq-cpp/CONTROL index 891c51ee7e..85a7cff7d3 100644 --- a/ports/activemq-cpp/CONTROL +++ b/ports/activemq-cpp/CONTROL @@ -1,5 +1,5 @@ Source: activemq-cpp -Version: 3.9.5-1 +Version: 3.9.5-2 Build-Depends: apr Description: Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server. -Supports: !uwp \ No newline at end of file +Supports: !(uwp|linux|osx) diff --git a/ports/activemq-cpp/portfile.cmake b/ports/activemq-cpp/portfile.cmake index 5353e5dd4e..1b83fd1e31 100644 --- a/ports/activemq-cpp/portfile.cmake +++ b/ports/activemq-cpp/portfile.cmake @@ -1,8 +1,4 @@ -include(vcpkg_common_functions) - -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") -endif() +vcpkg_fail_port_install( ON_TARGET "uwp" "linux" "osx") set(VERSION 3.9.5) @@ -42,10 +38,7 @@ vcpkg_build_msbuild( vcpkg_copy_pdbs() -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/activemq-cpp) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/activemq-cpp/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/activemq-cpp/copyright) - +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file( COPY diff --git a/ports/berkeleydb/CONTROL b/ports/berkeleydb/CONTROL index 75c856c084..07ab3e3067 100644 --- a/ports/berkeleydb/CONTROL +++ b/ports/berkeleydb/CONTROL @@ -1,5 +1,5 @@ Source: berkeleydb -Version: 4.8.30-3 +Version: 4.8.30-4 Homepage: https://download.oracle.com/ Description: BDB - A high-performance embedded database for key/value data. -Supports: !uwp \ No newline at end of file +Supports: !(uwp|linux|osx) diff --git a/ports/berkeleydb/portfile.cmake b/ports/berkeleydb/portfile.cmake index f685279dd3..5d47b7a6fa 100644 --- a/ports/berkeleydb/portfile.cmake +++ b/ports/berkeleydb/portfile.cmake @@ -1,8 +1,4 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") -endif() - -include(vcpkg_common_functions) +vcpkg_fail_port_install( ON_TARGET "uwp" "linux" "osx") vcpkg_download_distfile(ARCHIVE URLS "http://download.oracle.com/berkeley-db/db-4.8.30.NC.zip" @@ -25,5 +21,4 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/berkeleydb RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/cppcms/CONTROL b/ports/cppcms/CONTROL index 35296edc15..2acc51fdf5 100644 --- a/ports/cppcms/CONTROL +++ b/ports/cppcms/CONTROL @@ -1,5 +1,6 @@ Source: cppcms -Version: 1.2.1 +Version: 1.2.1-1 Homepage: https://github.com/artyom-beilis/cppcms Description: CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development Build-Depends: icu, pcre, openssl, zlib +Supports: !(linux|osx) diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index e6c6cfa2a6..383022fab9 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -1,4 +1,4 @@ -include(vcpkg_common_functions) +vcpkg_fail_port_install( ON_TARGET "linux" "osx") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO artyom-beilis/cppcms REF b72b19915794d1af63c9a9e9bea58e20a4ad93d4 - SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df + SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df ) vcpkg_find_acquire_program(PYTHON2) @@ -15,7 +15,7 @@ get_filename_component(PYTHON2_DIR ${PYTHON2} DIRECTORY) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DCMAKE_PROGRAM_PATH=${PYTHON2_DIR} -DUSE_WINDOWS6_API=ON + OPTIONS -DCMAKE_PROGRAM_PATH=${PYTHON2_DIR} -DUSE_WINDOWS6_API=ON ) vcpkg_install_cmake() @@ -26,6 +26,4 @@ file(REMOVE ${EXE_DEBUG_FILES}) file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe) file(REMOVE ${EXE_FILES}) -# Handle copyright -file(COPY ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppcms) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppcms/MIT.TXT ${CURRENT_PACKAGES_DIR}/share/cppcms/copyright) +file(INSTALL ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libusbmuxd/CONTROL b/ports/libusbmuxd/CONTROL index 2c0bf3dd97..615147f468 100644 --- a/ports/libusbmuxd/CONTROL +++ b/ports/libusbmuxd/CONTROL @@ -1,4 +1,5 @@ Source: libusbmuxd -Version: 1.2.185 +Version: 1.2.185-1 Description: A client library to multiplex connections from and to iOS devices Build-Depends: libplist +Supports: !(uwp|linux|osx) diff --git a/ports/libusbmuxd/portfile.cmake b/ports/libusbmuxd/portfile.cmake index f7a4d3a4b4..26518b2170 100644 --- a/ports/libusbmuxd/portfile.cmake +++ b/ports/libusbmuxd/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install( ON_TARGET "uwp" "linux" "osx") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/libusbmuxd