From 2a744d41af76a394f270fcb152ab80cc5bddbdf2 Mon Sep 17 00:00:00 2001 From: misirlou-tg <39652424+misirlou-tg@users.noreply.github.com> Date: Mon, 12 Dec 2022 13:00:37 -0600 Subject: [PATCH] [tabulate] update to version 1.4 (#28294) * Updating tabulate to version 1.4 The previous port was using a version prior to 1.0 * [tabulate] updating to use latest cmake functions * [tabulate] Adding license License is MIT according to: https://github.com/p-ranav/tabulate/blob/v1.4/LICENSE * [tabulate] Adding double quotes to absolute paths in portfile.cmake * [tabulate] updating license Requested to add BSL-1.0 AND BSD-3-Clause * [tabulate] running x-add-version --- ports/tabulate/portfile.cmake | 21 +++++++++------------ ports/tabulate/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/t-/tabulate.json | 5 +++++ 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/ports/tabulate/portfile.cmake b/ports/tabulate/portfile.cmake index 284dc218af..fcc880a059 100644 --- a/ports/tabulate/portfile.cmake +++ b/ports/tabulate/portfile.cmake @@ -1,26 +1,23 @@ -# header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO p-ranav/tabulate - REF 8f7a31b58806384b755858fe5e69593f9f216ed0 - SHA512 33a51617d363f9e8eed2153f60c5a087ed84edaeb21a0bc779d0af6228d4d7deb211e03c1eb7c8d56ac538de6a1cc0b641d219b4ff95d277f3daa7762f64a8f6 + REF v1.4 + SHA512 37d69d53f1c628955f2a35779dbf3053c5b449f7069d846b697b541df1719b00e9b72e9d6de361d9733b7e7543c25e444b1aa139f72000730eeeafa022bbf3c1 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dtabulate_BUILD_TESTS=OFF -DSAMPLES=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}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/LICENSE.termcolor DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.termcolor" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/tabulate/vcpkg.json b/ports/tabulate/vcpkg.json index cdbb579bb1..351a98db94 100644 --- a/ports/tabulate/vcpkg.json +++ b/ports/tabulate/vcpkg.json @@ -1,7 +1,17 @@ { "name": "tabulate", - "version-string": "2019-01-06", - "port-version": 1, + "version": "1.4", "description": "Table maker for modern C++", - "homepage": "https://github.com/p-ranav/tabulate" + "homepage": "https://github.com/p-ranav/tabulate", + "license": "MIT AND BSL-1.0 AND BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index e37f34a4b6..ae999045eb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7317,8 +7317,8 @@ "port-version": 9 }, "tabulate": { - "baseline": "2019-01-06", - "port-version": 1 + "baseline": "1.4", + "port-version": 0 }, "tacopie": { "baseline": "3.2.0", diff --git a/versions/t-/tabulate.json b/versions/t-/tabulate.json index dcdfc027bf..5812052992 100644 --- a/versions/t-/tabulate.json +++ b/versions/t-/tabulate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27a49e666dd469fbf41f27917b1cfd1640aa71f0", + "version": "1.4", + "port-version": 0 + }, { "git-tree": "482538c4e4f465f113e0318f20cd18b6f2b17f17", "version-string": "2019-01-06",