From d09d65e7a99cde70a27e8d1b4853a38503ba5f0b Mon Sep 17 00:00:00 2001 From: deniskovalchuk Date: Tue, 12 Nov 2024 12:43:22 +0300 Subject: [PATCH 01/13] [libftp] Add new port --- ports/libftp/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/libftp/usage | 4 ++++ ports/libftp/vcpkg.json | 21 +++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 ports/libftp/portfile.cmake create mode 100644 ports/libftp/usage create mode 100644 ports/libftp/vcpkg.json diff --git a/ports/libftp/portfile.cmake b/ports/libftp/portfile.cmake new file mode 100644 index 00000000000000..b6069a7958f23a --- /dev/null +++ b/ports/libftp/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO deniskovalchuk/libftp + REF "v${VERSION}" + SHA512 7765c35884e1e4560e39018b15f441abac687afcb06942b0350ef21df8bf27d40283011397ce4a9e9125772bb9752180c225429b274fd6374e1a521ac2744b2e + HEAD_REF master +) + + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLIBFTP_BUILD_TEST=OFF + -DLIBFTP_BUILD_EXAMPLE=OFF + -DLIBFTP_BUILD_CMDLINE_CLIENT=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME ftp + CONFIG_PATH "share/cmake/ftp") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) \ No newline at end of file diff --git a/ports/libftp/usage b/ports/libftp/usage new file mode 100644 index 00000000000000..85bc2e71b24253 --- /dev/null +++ b/ports/libftp/usage @@ -0,0 +1,4 @@ +libftp provides CMake targets: + +find_package(ftp CONFIG REQUIRED) +target_link_libraries(main PRIVATE ftp::ftp) diff --git a/ports/libftp/vcpkg.json b/ports/libftp/vcpkg.json new file mode 100644 index 00000000000000..6c857c2dbdf517 --- /dev/null +++ b/ports/libftp/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libftp", + "version": "1.3.0", + "maintainers": "Denis Kovalchuk ", + "description": "A cross-platform FTP/FTPS client library based on Boost.Asio.", + "homepage": "https://github.com/deniskovalchuk/libftp", + "license": "MIT", + "dependencies": [ + "boost-asio", + "boost-format", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From 3d42320c4725a0c97429c6b281849889ad414b34 Mon Sep 17 00:00:00 2001 From: deniskovalchuk Date: Tue, 12 Nov 2024 12:44:45 +0300 Subject: [PATCH 02/13] [libftp] Version database --- versions/baseline.json | 8 ++++++-- versions/l-/libftp.json | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 versions/l-/libftp.json diff --git a/versions/baseline.json b/versions/baseline.json index 1f38897927c65b..ae728999e9c729 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4568,6 +4568,10 @@ "baseline": "1.5", "port-version": 5 }, + "libftp": { + "baseline": "1.3.0", + "port-version": 0 + }, "libfuse": { "baseline": "3.16.2", "port-version": 0 @@ -5665,8 +5669,8 @@ "port-version": 1 }, "luau": { - "baseline": "0.651", - "port-version": 0 + "baseline": "0.651", + "port-version": 0 }, "luminoengine": { "baseline": "0.10.1", diff --git a/versions/l-/libftp.json b/versions/l-/libftp.json new file mode 100644 index 00000000000000..5d3c240a9994aa --- /dev/null +++ b/versions/l-/libftp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1fca567400d9d1cdc652bac45eb5e8750acdd487", + "version": "1.3.0", + "port-version": 0 + } + ] +} From 839e7d82a79ea6b66770f5167f8fb54ac3a28f8a Mon Sep 17 00:00:00 2001 From: deniskovalchuk Date: Tue, 12 Nov 2024 13:11:13 +0300 Subject: [PATCH 03/13] [libftp] Revert unrelated change --- versions/baseline.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index ae728999e9c729..79c3fefea3c3b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5669,8 +5669,8 @@ "port-version": 1 }, "luau": { - "baseline": "0.651", - "port-version": 0 + "baseline": "0.651", + "port-version": 0 }, "luminoengine": { "baseline": "0.10.1", From 317ca847da6729a003c86ea8dce9c31719e1f07d Mon Sep 17 00:00:00 2001 From: deniskovalchuk Date: Tue, 12 Nov 2024 13:28:47 +0300 Subject: [PATCH 04/13] [libftp] Use vcpkg_install_copyright() --- ports/libftp/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libftp/portfile.cmake b/ports/libftp/portfile.cmake index b6069a7958f23a..c29a4667a86c4d 100644 --- a/ports/libftp/portfile.cmake +++ b/ports/libftp/portfile.cmake @@ -24,5 +24,5 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME ftp file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) \ No newline at end of file From c24cf3e08702f33530be340b8e3fb8519260cc60 Mon Sep 17 00:00:00 2001 From: deniskovalchuk Date: Tue, 12 Nov 2024 13:33:29 +0300 Subject: [PATCH 05/13] [libftp] Update libftp.json --- versions/l-/libftp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libftp.json b/versions/l-/libftp.json index 5d3c240a9994aa..4bb3645bd62fd8 100644 --- a/versions/l-/libftp.json +++ b/versions/l-/libftp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1fca567400d9d1cdc652bac45eb5e8750acdd487", + "git-tree": "d9f4d4f9f143aaaaa138be5afbe0dd37d9771229", "version": "1.3.0", "port-version": 0 } From 10501a5adc0ce22f47dff95fff944a53ff5cb47f Mon Sep 17 00:00:00 2001 From: deniskovalchuk Date: Tue, 12 Nov 2024 18:23:09 +0300 Subject: [PATCH 06/13] [libftp] Do not support 'uwp' --- ports/libftp/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/libftp/vcpkg.json b/ports/libftp/vcpkg.json index 6c857c2dbdf517..e408741ee46b60 100644 --- a/ports/libftp/vcpkg.json +++ b/ports/libftp/vcpkg.json @@ -5,6 +5,7 @@ "description": "A cross-platform FTP/FTPS client library based on Boost.Asio.", "homepage": "https://github.com/deniskovalchuk/libftp", "license": "MIT", + "supports": "!uwp", "dependencies": [ "boost-asio", "boost-format", From c6a86519e0c39ae081e4fbb8740bfdd61fddea91 Mon Sep 17 00:00:00 2001 From: deniskovalchuk Date: Tue, 12 Nov 2024 18:24:26 +0300 Subject: [PATCH 07/13] [libftp] Remove an extra line --- ports/libftp/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/libftp/portfile.cmake b/ports/libftp/portfile.cmake index c29a4667a86c4d..c3fd429f26bb5f 100644 --- a/ports/libftp/portfile.cmake +++ b/ports/libftp/portfile.cmake @@ -8,7 +8,6 @@ vcpkg_from_github( HEAD_REF master ) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS From 0d594d2852bbdfcc4893e4d231b70cd5674eaad8 Mon Sep 17 00:00:00 2001 From: deniskovalchuk Date: Tue, 12 Nov 2024 18:25:19 +0300 Subject: [PATCH 08/13] [libftp] Update libftp.json --- versions/l-/libftp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libftp.json b/versions/l-/libftp.json index 4bb3645bd62fd8..aa92f18c93445b 100644 --- a/versions/l-/libftp.json +++ b/versions/l-/libftp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d9f4d4f9f143aaaaa138be5afbe0dd37d9771229", + "git-tree": "a1828b639bda1924f16b8f84e7d7e9a47637003b", "version": "1.3.0", "port-version": 0 } From c003874cfc7ca75821655327afdb631701baeefe Mon Sep 17 00:00:00 2001 From: deniskovalchuk Date: Wed, 13 Nov 2024 11:02:54 +0300 Subject: [PATCH 09/13] [libftp] Delete the 'usage' file libftp provides usage. --- ports/libftp/portfile.cmake | 3 +-- ports/libftp/usage | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 ports/libftp/usage diff --git a/ports/libftp/portfile.cmake b/ports/libftp/portfile.cmake index c3fd429f26bb5f..c2abe55696f414 100644 --- a/ports/libftp/portfile.cmake +++ b/ports/libftp/portfile.cmake @@ -23,5 +23,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME ftp file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") \ No newline at end of file diff --git a/ports/libftp/usage b/ports/libftp/usage deleted file mode 100644 index 85bc2e71b24253..00000000000000 --- a/ports/libftp/usage +++ /dev/null @@ -1,4 +0,0 @@ -libftp provides CMake targets: - -find_package(ftp CONFIG REQUIRED) -target_link_libraries(main PRIVATE ftp::ftp) From d017544956a4a52e51c91021c2390492d589fd27 Mon Sep 17 00:00:00 2001 From: deniskovalchuk Date: Wed, 13 Nov 2024 11:04:02 +0300 Subject: [PATCH 10/13] [libftp] Add a new line at the end of the 'portfile.cmake' file --- ports/libftp/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libftp/portfile.cmake b/ports/libftp/portfile.cmake index c2abe55696f414..99665f56dd9c08 100644 --- a/ports/libftp/portfile.cmake +++ b/ports/libftp/portfile.cmake @@ -23,4 +23,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME ftp file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") From 6b9cafcc29d2214b88e70f3312219b9d6d6d3487 Mon Sep 17 00:00:00 2001 From: deniskovalchuk Date: Wed, 13 Nov 2024 16:44:48 +0300 Subject: [PATCH 11/13] [libftp] Update libftp.json --- versions/l-/libftp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libftp.json b/versions/l-/libftp.json index aa92f18c93445b..72716c88f53ff5 100644 --- a/versions/l-/libftp.json +++ b/versions/l-/libftp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a1828b639bda1924f16b8f84e7d7e9a47637003b", + "git-tree": "48dfdd09c7ed3f6394dc80646050f2afbb7db018", "version": "1.3.0", "port-version": 0 } From e3d77c98565602630df336976e721c75f8d76ef6 Mon Sep 17 00:00:00 2001 From: Denis Kovalchuk Date: Thu, 14 Nov 2024 10:04:28 +0300 Subject: [PATCH 12/13] [libftp] Do not support dynamic linking for Windows only Co-authored-by: Kai Pastor --- ports/libftp/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/libftp/portfile.cmake b/ports/libftp/portfile.cmake index 99665f56dd9c08..4e71d2d07526c9 100644 --- a/ports/libftp/portfile.cmake +++ b/ports/libftp/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH From b5ef1adb701ae9ae6ea994f350823b1bda168b7f Mon Sep 17 00:00:00 2001 From: deniskovalchuk Date: Thu, 14 Nov 2024 10:17:03 +0300 Subject: [PATCH 13/13] [libftp] Update libftp.json --- versions/l-/libftp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libftp.json b/versions/l-/libftp.json index 72716c88f53ff5..365fbf0d342d99 100644 --- a/versions/l-/libftp.json +++ b/versions/l-/libftp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "48dfdd09c7ed3f6394dc80646050f2afbb7db018", + "git-tree": "833fc7cafcca2f762abde803ad30218122af2539", "version": "1.3.0", "port-version": 0 }