From fa08e615d8a25f60472813aa6f4c419d94949c09 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 9 Jun 2021 20:14:52 +0800 Subject: [PATCH 01/16] [ftxui] Add new port (fix #16327) --- ports/ftxui/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/ftxui/vcpkg.json | 17 +++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 ports/ftxui/portfile.cmake create mode 100644 ports/ftxui/vcpkg.json diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake new file mode 100644 index 00000000000000..648f2ae9c6d0a3 --- /dev/null +++ b/ports/ftxui/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ArthurSonzogni/FTXUI + REF e9eab32b2fe1d720c5c12d1131074e719840ffdc + SHA512 43cce8ae3e3801372f9183fe86d8e5c0732affb66c958950639265e28e6ad70613e09150da3be631c52ec413f284e40e0eda7a6ed2b81bc69c6307c1478114d2 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DFTXUI_BUILD_EXAMPLES=OFF + -DFTXUI_ENABLE_INSTALL=ON + -DFTXUI_BUILD_TESTS=OFF + -DFTXUI_BUILD_DOCS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/ftxui/vcpkg.json b/ports/ftxui/vcpkg.json new file mode 100644 index 00000000000000..8f53eeca7d31dc --- /dev/null +++ b/ports/ftxui/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ftxui", + "version-date": "2021-06-09", + "description": "C++ Functional Terminal User Interface", + "homepage": "https://github.com/ArthurSonzogni/FTXUI", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From 16d4779eafac635351789439e3ff3694a13c32f0 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 9 Jun 2021 20:15:53 +0800 Subject: [PATCH 02/16] [ftxui] x-add-version ftxui --- versions/baseline.json | 4 ++++ versions/f-/ftxui.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/f-/ftxui.json diff --git a/versions/baseline.json b/versions/baseline.json index 310ed89bab3008..1bdc39bda710a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2140,6 +2140,10 @@ "baseline": "2.4.0-2", "port-version": 0 }, + "ftxui": { + "baseline": "2021-06-09", + "port-version": 0 + }, "function2": { "baseline": "4.1.0", "port-version": 0 diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json new file mode 100644 index 00000000000000..f81332c1d02383 --- /dev/null +++ b/versions/f-/ftxui.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1bb317c26b314ac424815f2c36afedf8df95f328", + "version-date": "2021-06-09", + "port-version": 0 + } + ] +} From f5c095948df414ec8d2fc015b014e6b6576910b9 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 16 Jun 2021 18:03:15 +0800 Subject: [PATCH 03/16] [ftxui] Drop UWP support According to the build log: D:\buildtrees\ftxui\src\719840ffdc-7f05139eb7.clean\src\ftxui\screen\terminal.cpp(56,37): error C2039: 'getenv': is not a member of 'std' [D:\buildtrees\ftxui\x64-uwp-dbg\screen.vcxproj] D:\buildtrees\ftxui\src\719840ffdc-7f05139eb7.clean\src\ftxui\screen\terminal.cpp(60,32): error C2039: 'getenv': is not a member of 'std' [D:\buildtrees\ftxui\x64-uwp-dbg\screen.vcxproj] ftxui can not be built successfully on UWP, since `getenv` is unavailable on UWP. https://docs.microsoft.com/en-us/cpp/cppcx/crt-functions-not-supported-in-universal-windows-platform-apps?view=msvc-160 --- ports/ftxui/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/ftxui/vcpkg.json b/ports/ftxui/vcpkg.json index 8f53eeca7d31dc..ba36e66c7726e9 100644 --- a/ports/ftxui/vcpkg.json +++ b/ports/ftxui/vcpkg.json @@ -4,6 +4,7 @@ "description": "C++ Functional Terminal User Interface", "homepage": "https://github.com/ArthurSonzogni/FTXUI", "license": "MIT", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", From cf44206755635f98fc9a2fef887426c2ab1c9f0e Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 16 Jun 2021 18:06:35 +0800 Subject: [PATCH 04/16] [ftxui] Update to 2021-06-16 --- ports/ftxui/portfile.cmake | 4 ++-- ports/ftxui/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake index 648f2ae9c6d0a3..206450684a945c 100644 --- a/ports/ftxui/portfile.cmake +++ b/ports/ftxui/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArthurSonzogni/FTXUI - REF e9eab32b2fe1d720c5c12d1131074e719840ffdc - SHA512 43cce8ae3e3801372f9183fe86d8e5c0732affb66c958950639265e28e6ad70613e09150da3be631c52ec413f284e40e0eda7a6ed2b81bc69c6307c1478114d2 + REF 2406e20f3640c6bf8fac56860105744b6bafd2f9 + SHA512 c2c25be6a7dacc16afdc8aae68b4b78eea22608e470a21f9aa096eed42866afc733828b126ff694b46b0c860b1d51e06fd830bcd4ea833733a497ac18e8885bf HEAD_REF master ) diff --git a/ports/ftxui/vcpkg.json b/ports/ftxui/vcpkg.json index ba36e66c7726e9..36fea4a7357e40 100644 --- a/ports/ftxui/vcpkg.json +++ b/ports/ftxui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ftxui", - "version-date": "2021-06-09", + "version-date": "2021-06-16", "description": "C++ Functional Terminal User Interface", "homepage": "https://github.com/ArthurSonzogni/FTXUI", "license": "MIT", From f99eaf81fadde3c400c7b0e17cc0f69fde5fcdf1 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 16 Jun 2021 18:08:37 +0800 Subject: [PATCH 05/16] [ftxui] Overwrite version --- versions/baseline.json | 2 +- versions/f-/ftxui.json | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 1bdc39bda710a3..049eb89e9af08f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2141,7 +2141,7 @@ "port-version": 0 }, "ftxui": { - "baseline": "2021-06-09", + "baseline": "2021-06-16", "port-version": 0 }, "function2": { diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json index f81332c1d02383..69cb5315519ce5 100644 --- a/versions/f-/ftxui.json +++ b/versions/f-/ftxui.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "1bb317c26b314ac424815f2c36afedf8df95f328", + "git-tree": "6aa3d0f687a5cd121540e8e2bc158d0aaf77e905", + "version-date": "2021-06-16", + "port-version": 0 + }, + { + "git-tree": "4f720eb108815befe381654803dbdae18ee0615d", "version-date": "2021-06-09", "port-version": 0 } From 90c89687d9ea48fb8640c970e340aeb09f592b18 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 16 Jun 2021 18:47:54 +0800 Subject: [PATCH 06/16] [ftxui] Try to fix linux and macOS build --- ports/ftxui/fix-git-version.patch | 13 +++++++++++++ ports/ftxui/portfile.cmake | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 ports/ftxui/fix-git-version.patch diff --git a/ports/ftxui/fix-git-version.patch b/ports/ftxui/fix-git-version.patch new file mode 100644 index 00000000000000..a03cd4c0fae4cc --- /dev/null +++ b/ports/ftxui/fix-git-version.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9926417..e6eb51a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.0) + + find_package(Git QUIET) +-if (Git_FOUND) ++if (Git_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") + message("git found") + execute_process( + COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake index 206450684a945c..07d7030757a755 100644 --- a/ports/ftxui/portfile.cmake +++ b/ports/ftxui/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 2406e20f3640c6bf8fac56860105744b6bafd2f9 SHA512 c2c25be6a7dacc16afdc8aae68b4b78eea22608e470a21f9aa096eed42866afc733828b126ff694b46b0c860b1d51e06fd830bcd4ea833733a497ac18e8885bf HEAD_REF master + PATCHES + fix-git-version.patch ) vcpkg_cmake_configure( From 9cd66143775d5aa66d1813f29edde95c9a621ed2 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 16 Jun 2021 18:48:27 +0800 Subject: [PATCH 07/16] [ftxui] Overwrite version --- versions/f-/ftxui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json index 69cb5315519ce5..464a957f8983b4 100644 --- a/versions/f-/ftxui.json +++ b/versions/f-/ftxui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6aa3d0f687a5cd121540e8e2bc158d0aaf77e905", + "git-tree": "fa4295202b2e3af99de5109f81aee42b6418a4c1", "version-date": "2021-06-16", "port-version": 0 }, From 6727beae79c160d4f5722874189124629387ceb0 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 16 Jun 2021 18:50:36 +0800 Subject: [PATCH 08/16] [ftxui] Fail fast on UWP --- ports/ftxui/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake index 07d7030757a755..fbc018bb92f19f 100644 --- a/ports/ftxui/portfile.cmake +++ b/ports/ftxui/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( From b629d53b8efc8b6a33c8f373c7f9b11694c06f9f Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 16 Jun 2021 18:51:20 +0800 Subject: [PATCH 09/16] [ftxui] Clean version file --- versions/f-/ftxui.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json index 464a957f8983b4..48b8835cad78ae 100644 --- a/versions/f-/ftxui.json +++ b/versions/f-/ftxui.json @@ -4,11 +4,6 @@ "git-tree": "fa4295202b2e3af99de5109f81aee42b6418a4c1", "version-date": "2021-06-16", "port-version": 0 - }, - { - "git-tree": "4f720eb108815befe381654803dbdae18ee0615d", - "version-date": "2021-06-09", - "port-version": 0 } ] } From a545da5b2bb89528798794e4b3db53d053a2c9e0 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 16 Jun 2021 18:51:43 +0800 Subject: [PATCH 10/16] [ftxui] Overwrite version --- versions/f-/ftxui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json index 48b8835cad78ae..806204b19eb416 100644 --- a/versions/f-/ftxui.json +++ b/versions/f-/ftxui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fa4295202b2e3af99de5109f81aee42b6418a4c1", + "git-tree": "9344ba2c0ad10fe5b1a27a322d703a93c410ef38", "version-date": "2021-06-16", "port-version": 0 } From 3ed1bb944163ead837414a6f0597b7d409cc2ce5 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 18 Jun 2021 00:01:42 +0800 Subject: [PATCH 11/16] [ftxui] Update to 2021-06-17 --- ports/ftxui/fix-git-version.patch | 13 ------------- ports/ftxui/portfile.cmake | 6 ++---- ports/ftxui/vcpkg.json | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 ports/ftxui/fix-git-version.patch diff --git a/ports/ftxui/fix-git-version.patch b/ports/ftxui/fix-git-version.patch deleted file mode 100644 index a03cd4c0fae4cc..00000000000000 --- a/ports/ftxui/fix-git-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9926417..e6eb51a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,7 @@ - cmake_minimum_required(VERSION 3.0) - - find_package(Git QUIET) --if (Git_FOUND) -+if (Git_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") - message("git found") - execute_process( - COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake index fbc018bb92f19f..add93a68401ab1 100644 --- a/ports/ftxui/portfile.cmake +++ b/ports/ftxui/portfile.cmake @@ -5,11 +5,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArthurSonzogni/FTXUI - REF 2406e20f3640c6bf8fac56860105744b6bafd2f9 - SHA512 c2c25be6a7dacc16afdc8aae68b4b78eea22608e470a21f9aa096eed42866afc733828b126ff694b46b0c860b1d51e06fd830bcd4ea833733a497ac18e8885bf + REF 3d5e4eb6ca11a0827bff68a04f4bf68ca9820e20 + SHA512 670b0e5d95f7e6132ca7115005efdb1dee645146af82566af3e48bfff64d82dbc058c2f524b8b9d1d92182e4835ff6024067f0eab8dd6204514efa0207b3d33c HEAD_REF master - PATCHES - fix-git-version.patch ) vcpkg_cmake_configure( diff --git a/ports/ftxui/vcpkg.json b/ports/ftxui/vcpkg.json index 36fea4a7357e40..34557d19ac9c94 100644 --- a/ports/ftxui/vcpkg.json +++ b/ports/ftxui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ftxui", - "version-date": "2021-06-16", + "version-date": "2021-06-17", "description": "C++ Functional Terminal User Interface", "homepage": "https://github.com/ArthurSonzogni/FTXUI", "license": "MIT", From 0ac90c2aac39d71c5561e05a5e63d06d87215eee Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 18 Jun 2021 00:03:26 +0800 Subject: [PATCH 12/16] [ftxui] Overwrite version --- versions/baseline.json | 2 +- versions/f-/ftxui.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 1ec81e26fe4110..0bf92fc7c77cca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2145,7 +2145,7 @@ "port-version": 0 }, "ftxui": { - "baseline": "2021-06-16", + "baseline": "2021-06-17", "port-version": 0 }, "function2": { diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json index 806204b19eb416..55f78233361e8d 100644 --- a/versions/f-/ftxui.json +++ b/versions/f-/ftxui.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "9344ba2c0ad10fe5b1a27a322d703a93c410ef38", - "version-date": "2021-06-16", + "git-tree": "5ee0f897083cb9169b2d823f8c7a1497e157e554", + "version-date": "2021-06-17", "port-version": 0 } ] From 63fda376d65e3489f4a65b7973220432e59d65fb Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 18 Jun 2021 00:05:25 +0800 Subject: [PATCH 13/16] [ftxui] Remove debug/share --- ports/ftxui/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake index add93a68401ab1..17327666fa9e83 100644 --- a/ports/ftxui/portfile.cmake +++ b/ports/ftxui/portfile.cmake @@ -23,6 +23,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From bc00da5c75a363cd68779e85fa16fa39890f0520 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 18 Jun 2021 00:06:01 +0800 Subject: [PATCH 14/16] [ftxui] Overwrite version --- versions/f-/ftxui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json index 55f78233361e8d..eba60f1d6bbe64 100644 --- a/versions/f-/ftxui.json +++ b/versions/f-/ftxui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5ee0f897083cb9169b2d823f8c7a1497e157e554", + "git-tree": "caf1fe725e3afe44f01fe57d0d0150697952e5be", "version-date": "2021-06-17", "port-version": 0 } From 0d68941b9fedc549bf7637ba832bf1e5da7b6ac5 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 22 Jun 2021 19:00:42 +0800 Subject: [PATCH 15/16] [ftxui] Quote paths --- ports/ftxui/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake index 17327666fa9e83..bdb21781fc95c0 100644 --- a/ports/ftxui/portfile.cmake +++ b/ports/ftxui/portfile.cmake @@ -25,4 +25,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From daa9a24c6bc024c55c0fc21b605b255b3ec9e4f0 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 22 Jun 2021 19:02:15 +0800 Subject: [PATCH 16/16] [ftxui] Overwrite version --- versions/f-/ftxui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json index eba60f1d6bbe64..329be420782cad 100644 --- a/versions/f-/ftxui.json +++ b/versions/f-/ftxui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "caf1fe725e3afe44f01fe57d0d0150697952e5be", + "git-tree": "d7dd27584c015a37dd3266255530e889b16aebcf", "version-date": "2021-06-17", "port-version": 0 }