From 80e863f62c3dc70cdbd2f7745e0378342376e34f Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 05:11:45 +0200 Subject: [PATCH] [replxx] Update to 0.0.3 (#20606) * Update replxx to 0.0.3 * Update CI baseline Co-authored-by: chausner --- ports/replxx/add-stdexcept.patch | 17 ----------------- ports/replxx/portfile.cmake | 26 +++++++++++--------------- ports/replxx/replxxConfig.cmake | 20 -------------------- ports/replxx/usage | 4 ---- ports/replxx/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/r-/replxx.json | 5 +++++ 7 files changed, 30 insertions(+), 61 deletions(-) delete mode 100644 ports/replxx/add-stdexcept.patch delete mode 100644 ports/replxx/replxxConfig.cmake delete mode 100644 ports/replxx/usage diff --git a/ports/replxx/add-stdexcept.patch b/ports/replxx/add-stdexcept.patch deleted file mode 100644 index 51fe01447f..0000000000 --- a/ports/replxx/add-stdexcept.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/io.cxx b/src/io.cxx -index a098867..6159e4b 100644 ---- a/src/io.cxx -+++ b/src/io.cxx -@@ -2,6 +2,7 @@ - #include - #include - #include -+#include - #include - - #ifdef _WIN32 -@@ -671,4 +672,3 @@ int Terminal::read_verbatim( char32_t* buffer_, int size_ ) { - #endif - - } -- diff --git a/ports/replxx/portfile.cmake b/ports/replxx/portfile.cmake index cbf2c646a7..9dfbbe0619 100644 --- a/ports/replxx/portfile.cmake +++ b/ports/replxx/portfile.cmake @@ -1,26 +1,22 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO AmokHuginnsson/replxx - REF 45696c250ce39ab21dedeea962b94d7827007a8c - SHA512 7beec508fa3049fe5a736a487728506d646d26d7194ef7453fc07bceade1982430808fab0a10ca9b1c43a8b87bf3a973f5cfe4aa22ed06927647c9a7244167fd - HEAD_REF master - PATCHES - add-stdexcept.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO AmokHuginnsson/replxx + REF release-0.0.3 + SHA512 039812B65D96C44907105D409E608132A115314BEA8616F79DA928BFEECEBFF64381F063D7B1C971B61C449FA24552E001767D61C57F65AF9EBD8F0B3AC62B18 + HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() - +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/replxx") vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/replxxConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/replxx/replxxConfig.cmake b/ports/replxx/replxxConfig.cmake deleted file mode 100644 index 680ffc3eea..0000000000 --- a/ports/replxx/replxxConfig.cmake +++ /dev/null @@ -1,20 +0,0 @@ -function(set_library_target NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) - add_library(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) - set_target_properties(${NAMESPACE}::${LIB_NAME} PROPERTIES - IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" - IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" - IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" - INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" - ) - set(${NAMESPACE}_${LIB_NAME}_FOUND 1) -endfunction() - -get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(ROOT "${ROOT}" PATH) -get_filename_component(ROOT "${ROOT}" PATH) - -if (CMAKE_HOST_WIN32) - set_library_target("REPLXX" "replxx" "${ROOT}/debug/lib/replxx-d.lib" "${ROOT}/lib/replxx.lib" "${ROOT}/include/") -else () - set_library_target("REPLXX" "replxx" "${ROOT}/debug/lib/libreplxx-d.a" "${ROOT}/lib/libreplxx.a" "${ROOT}/include/") -endif () diff --git a/ports/replxx/usage b/ports/replxx/usage deleted file mode 100644 index 5be648855a..0000000000 --- a/ports/replxx/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package replxx is compatible with built-in CMake targets: - - FIND_PACKAGE(replxx REQUIRED) - TARGET_LINK_LIBRARIES(main PRIVATE REPLXX::replxx) diff --git a/ports/replxx/vcpkg.json b/ports/replxx/vcpkg.json index 7e84aebc60..b82ef13a11 100644 --- a/ports/replxx/vcpkg.json +++ b/ports/replxx/vcpkg.json @@ -1,8 +1,17 @@ { "name": "replxx", - "version-string": "0.0.2", - "port-version": 3, + "version": "0.0.3", "description": "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters.", "homepage": "https://github.com/AmokHuginnsson/replxx", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 4634582c98..d613193327 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5829,8 +5829,8 @@ "port-version": 1 }, "replxx": { - "baseline": "0.0.2", - "port-version": 3 + "baseline": "0.0.3", + "port-version": 0 }, "reproc": { "baseline": "14.2.3", diff --git a/versions/r-/replxx.json b/versions/r-/replxx.json index 2e1901ca75..3071637577 100644 --- a/versions/r-/replxx.json +++ b/versions/r-/replxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6d52564217b918d799280703fdfde6e600272d4", + "version": "0.0.3", + "port-version": 0 + }, { "git-tree": "5e56bb5dd211e60671da16308a06e0738b7854c2", "version-string": "0.0.2",