From 680071397677bb123b2f2b0ebe73905feae4a955 Mon Sep 17 00:00:00 2001 From: Take Vos Date: Wed, 12 Oct 2022 10:31:44 +0200 Subject: [PATCH] [hikogui] update to version 0.7.0 (#27134) * [hikogui] update to version 0.7.0 * [hikogui] empty ttauri and fix deprecated port files. Make ttauri an empty dependency only port which imports hikogui. Update the hikogui portfile to use non-deprecated functions. * [ttauri] version update * Update ports/hikogui/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * remove port-version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/hikogui/portfile.cmake | 25 +++++++++++++++++++++++++ ports/hikogui/vcpkg.json | 21 +++++++++++++++++++++ ports/ttauri/portfile.cmake | 27 +-------------------------- ports/ttauri/vcpkg.json | 7 +++---- versions/baseline.json | 6 +++++- versions/h-/hikogui.json | 9 +++++++++ versions/t-/ttauri.json | 5 +++++ 7 files changed, 69 insertions(+), 31 deletions(-) create mode 100644 ports/hikogui/portfile.cmake create mode 100644 ports/hikogui/vcpkg.json create mode 100644 versions/h-/hikogui.json diff --git a/ports/hikogui/portfile.cmake b/ports/hikogui/portfile.cmake new file mode 100644 index 0000000000..7a37309f4e --- /dev/null +++ b/ports/hikogui/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hikogui/hikogui + REF v0.7.0 + SHA512 64555c67e5a44f336a3528d3a894d43e2751a1f4e4e4d9f6618c085ef0be4a502610a36625d95f79298080cb483f7361a758f7c43b4784999b0b5d839baacb28 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DHI_BUILD_TESTS=OFF + -DHI_BUILD_EXAMPLES=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/hikogui/vcpkg.json b/ports/hikogui/vcpkg.json new file mode 100644 index 0000000000..ab0dddefc7 --- /dev/null +++ b/ports/hikogui/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "hikogui", + "version": "0.7.0", + "maintainers": "@takev", + "description": "A portable, low latency, retained-mode GUI framework written in C++.", + "homepage": "https://github.com/hikogui/hikogui", + "license": "BSL-1.0", + "supports": "windows & x64", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan", + "vulkan-memory-allocator" + ] +} diff --git a/ports/ttauri/portfile.cmake b/ports/ttauri/portfile.cmake index 52eeca7bab..065116c276 100644 --- a/ports/ttauri/portfile.cmake +++ b/ports/ttauri/portfile.cmake @@ -1,26 +1 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ttauri-project/ttauri - REF v0.5.0 - SHA512 946c8b7fbd030235d06fff3e100c6be15c2dd360306c674906eb395067642ea38551290ebf4d2c398798219b5c0711eeaecb57bc5021db9f91ec343baab64171 - HEAD_REF main -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DTT_BUILD_TESTS=OFF - -DTT_BUILD_EXAMPLES=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON -) - -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() -vcpkg_copy_pdbs() - -file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/ttauri/vcpkg.json b/ports/ttauri/vcpkg.json index b59bd25f4c..7c60c6939f 100644 --- a/ports/ttauri/vcpkg.json +++ b/ports/ttauri/vcpkg.json @@ -1,14 +1,13 @@ { "name": "ttauri", "version": "0.5.0", - "port-version": 1, + "port-version": 2, "maintainers": "@takev", - "description": "A portable, low latency, retained-mode GUI framework written in C++.", + "description": "A portable, low latency, retained-mode GUI framework written in C++. (renamed to hikogui)", "homepage": "https://github.com/ttauri-project/ttauri", "license": "BSL-1.0", "supports": "windows & x64", "dependencies": [ - "vulkan", - "vulkan-memory-allocator" + "hikogui" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 6d94842e94..aadc7d9a5b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2904,6 +2904,10 @@ "baseline": "0.14.2", "port-version": 0 }, + "hikogui": { + "baseline": "0.7.0", + "port-version": 0 + }, "hiredis": { "baseline": "1.0.2", "port-version": 4 @@ -7490,7 +7494,7 @@ }, "ttauri": { "baseline": "0.5.0", - "port-version": 1 + "port-version": 2 }, "turbobase64": { "baseline": "2020-01-12", diff --git a/versions/h-/hikogui.json b/versions/h-/hikogui.json new file mode 100644 index 0000000000..2bc102777e --- /dev/null +++ b/versions/h-/hikogui.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3ed99f330c9de6be97e6e2e25c3ff55080fbbcd5", + "version": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/versions/t-/ttauri.json b/versions/t-/ttauri.json index f1deb87b03..fc89a2fe69 100644 --- a/versions/t-/ttauri.json +++ b/versions/t-/ttauri.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "528e0c198c489d3212ba2b8e7048bbc0a379f4b2", + "version": "0.5.0", + "port-version": 2 + }, { "git-tree": "5990b7368bf89a8b6cd1fa2a7b33406c9ef3a24e", "version": "0.5.0",