From ebdbcd2e4735f3dc9ade9813e27490f8e7296618 Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Tue, 18 May 2021 16:43:26 +1000 Subject: [tinyfiledialogs] 3.6.3 -> 3.8.8 (#17343) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [tinyfiledialogs] 3.6.3 -> 3.8.7 * x-add-version * [tinyfiledialogs] Use git rather than explicit snapshot * x-add-version * [tinyfiledialogs] Put header in include dir one level down from before * x-add-version * Update ports/tinyfiledialogs/portfile.cmake Co-authored-by: Robert Schumacher * Update ports/tinyfiledialogs/portfile.cmake Co-authored-by: Robert Schumacher * Update ports/tinyfiledialogs/portfile.cmake Co-authored-by: Robert Schumacher * Update ports/tinyfiledialogs/portfile.cmake Co-authored-by: Robert Schumacher * Update ports/tinyfiledialogs/portfile.cmake Co-authored-by: Robert Schumacher * [tinyfiledialogs] 3.8.8 * vcpkg x-add-version --all * Update versions/t-/tinyfiledialogs.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/tinyfiledialogs/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update ports/tinyfiledialogs/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update versions/t-/tinyfiledialogs.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Robert Schumacher Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- ports/tinyfiledialogs/CONTROL | 2 +- ports/tinyfiledialogs/portfile.cmake | 23 ++++++++++++----------- versions/baseline.json | 2 +- versions/t-/tinyfiledialogs.json | 5 +++++ 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ports/tinyfiledialogs/CONTROL b/ports/tinyfiledialogs/CONTROL index 6e5b062b8..c17db7194 100644 --- a/ports/tinyfiledialogs/CONTROL +++ b/ports/tinyfiledialogs/CONTROL @@ -1,5 +1,5 @@ Source: tinyfiledialogs -Version: 3.6.3 +Version: 3.8.8 Description: Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more Homepage: https://sourceforge.net/projects/tinyfiledialogs/ Supports: !uwp diff --git a/ports/tinyfiledialogs/portfile.cmake b/ports/tinyfiledialogs/portfile.cmake index 7077d6bff..afeb1c2d7 100644 --- a/ports/tinyfiledialogs/portfile.cmake +++ b/ports/tinyfiledialogs/portfile.cmake @@ -2,25 +2,26 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_sourceforge( +vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - REPO tinyfiledialogs - FILENAME "frozen_versions/tinyfiledialogs-3.6.3.zip" - SHA512 42c3bd34b0287cf2477f9ede049bea29a9306304e8fab7740065957d3737f4041899f26f29a0693e801cb0a7b63844509f86441262303ff0a4030a431ffac648 + URL "https://git.code.sf.net/p/tinyfiledialogs/code" + REF "8e966d92d0e772b5e34ffc3d8ec1559731a07ccb" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -file(READ ${CURRENT_PACKAGES_DIR}/include/tinyfiledialogs/tinyfiledialogs.h _contents) -string(SUBSTRING "${_contents}" 0 1024 _contents) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${_contents}") +file(READ "${CURRENT_PACKAGES_DIR}/include/tinyfiledialogs/tinyfiledialogs.h" _contents) +# reads between the line "- License -" and a closing "*/" +if (NOT _contents MATCHES [[- License -(([^*]|\*[^/])*)\*/]]) + message(FATAL_ERROR "Failed to parse license from tinyfiledialogs.h") +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "${CMAKE_MATCH_1}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/versions/baseline.json b/versions/baseline.json index 08efb6ecf..df70bbe2a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6065,7 +6065,7 @@ "port-version": 0 }, "tinyfiledialogs": { - "baseline": "3.6.3", + "baseline": "3.8.8", "port-version": 0 }, "tinygltf": { diff --git a/versions/t-/tinyfiledialogs.json b/versions/t-/tinyfiledialogs.json index eaa56f77c..d918fbdef 100644 --- a/versions/t-/tinyfiledialogs.json +++ b/versions/t-/tinyfiledialogs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a5b599e8303e1b62bca446461bd7114ec97caba", + "version-string": "3.8.8", + "port-version": 0 + }, { "git-tree": "8cafa08c2b7e1d04e3a4e8bbc15271c33d9699e3", "version-string": "3.6.3", -- cgit v1.2.3