From 4bd67a4371f8cdb7ccad359036c66cf24c7fca77 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 30 Aug 2021 19:20:48 +0200 Subject: [PATCH] [spix] Add new port (#19351) * [anyrpc] Bump version to export missing symbol * [spix] Add port * versioning * Update ports/anyrpc/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * versioning * Update ports/anyrpc/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * versioning Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/anyrpc/portfile.cmake | 19 ++++++++++--------- ports/anyrpc/vcpkg.json | 3 +-- ports/spix/portfile.cmake | 25 +++++++++++++++++++++++++ ports/spix/vcpkg.json | 18 ++++++++++++++++++ versions/a-/anyrpc.json | 5 +++++ versions/baseline.json | 8 ++++++-- versions/s-/spix.json | 9 +++++++++ 7 files changed, 74 insertions(+), 13 deletions(-) create mode 100644 ports/spix/portfile.cmake create mode 100644 ports/spix/vcpkg.json create mode 100644 versions/s-/spix.json diff --git a/ports/anyrpc/portfile.cmake b/ports/anyrpc/portfile.cmake index 513c37cd91..3090d2db9c 100644 --- a/ports/anyrpc/portfile.cmake +++ b/ports/anyrpc/portfile.cmake @@ -1,27 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sgieseking/anyrpc - REF b288617d0ae1d6e227bcda7d3db7db5329fa2322 - SHA512 d50ef96ad13f06991e65e9912225b64c1f244bf89b67e4afcddbb18e08a885ec773aea88e1334d6deb73bb3824e916695b3b187b9023368aec3ba21a53dd2830 + REF b1949b3d40849229055ae75cf5334b9d08579502 + SHA512 8c674d29e80ec2522d6c1ec959663958ab4e1bf1135727c3c2aaa19e62a81ddbbd1e6a46f3e4679ee02894ad2ab26e70ca7e1e6c8750f3289994311069221b53 HEAD_REF master + FILE_DISAMBIGUATOR 1 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARED) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS - -DBUILD_EXAMPLES=OFF - -DBUILD_TESTS=OFF - -DBUILD_WITH_LOG4CPLUS=OFF - -DANYRPC_LIB_BUILD_SHARED=${ANYRPC_LIB_BUILD_SHARED} + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_WITH_LOG4CPLUS=OFF + -DANYRPC_LIB_BUILD_SHARED=${ANYRPC_LIB_BUILD_SHARED} ) vcpkg_install_cmake() -file(INSTALL ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/anyrpc RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL "${SOURCE_PATH}/license" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() diff --git a/ports/anyrpc/vcpkg.json b/ports/anyrpc/vcpkg.json index f71f684cc7..02ffac66d9 100644 --- a/ports/anyrpc/vcpkg.json +++ b/ports/anyrpc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "anyrpc", - "version-string": "2020-01-13", - "port-version": 2, + "version-date": "2021-08-24", "description": "A multiprotocol remote procedure call system for C++.", "homepage": "https://github.com/sgieseking/anyrpc" } diff --git a/ports/spix/portfile.cmake b/ports/spix/portfile.cmake new file mode 100644 index 0000000000..91512aa78b --- /dev/null +++ b/ports/spix/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO faaxm/spix + REF v0.3 + SHA512 be5695e1e061583645a711c91f218c2038ed66896932d9f32129242d20d0a451a032d53aee2fdb917f1423de96ebcba97887421636a13260a7e7c228a13666c0 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSPIX_BUILD_EXAMPLES=OFF + -DSPIX_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/ports/spix/vcpkg.json b/ports/spix/vcpkg.json new file mode 100644 index 0000000000..e2e1e5c48d --- /dev/null +++ b/ports/spix/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "spix", + "version": "0.3", + "description": "A minimally invasive UI testing library that enables your Qt/QML app's UI to be controlled either via c++ code, or through an http RPC interface.", + "homepage": "https://github.com/faaxm/spix", + "dependencies": [ + "anyrpc", + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/a-/anyrpc.json b/versions/a-/anyrpc.json index f37d0d4a72..62639f3f0c 100644 --- a/versions/a-/anyrpc.json +++ b/versions/a-/anyrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f4ca4180fb5021b85ae6d4c5ad7b7e15f89b367", + "version-date": "2021-08-24", + "port-version": 0 + }, { "git-tree": "e82759546790c693469c78e166e6c83f745849b3", "version-string": "2020-01-13", diff --git a/versions/baseline.json b/versions/baseline.json index 6dd9af2166..8a7f7cada1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -93,8 +93,8 @@ "port-version": 0 }, "anyrpc": { - "baseline": "2020-01-13", - "port-version": 2 + "baseline": "2021-08-24", + "port-version": 0 }, "aom": { "baseline": "3.1.2", @@ -6080,6 +6080,10 @@ "baseline": "2021.1", "port-version": 0 }, + "spix": { + "baseline": "0.3", + "port-version": 0 + }, "sprout": { "baseline": "2019-06-20", "port-version": 0 diff --git a/versions/s-/spix.json b/versions/s-/spix.json new file mode 100644 index 0000000000..a3ab08a133 --- /dev/null +++ b/versions/s-/spix.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "703bc0f66a7cb23368f4230a35451356b92e5c75", + "version": "0.3", + "port-version": 0 + } + ] +}