From 840339a02f8d03cdfc7bff423203c3a2528ff424 Mon Sep 17 00:00:00 2001 From: Conor Williams Date: Thu, 29 Feb 2024 10:47:03 +0000 Subject: [PATCH 01/14] add libfork v3.7.0 --- ports/libfork/portfile.cmake | 21 +++++++++++++++++++++ ports/libfork/usage | 4 ++++ ports/libfork/vcpkg.json | 19 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 ports/libfork/portfile.cmake create mode 100644 ports/libfork/usage create mode 100644 ports/libfork/vcpkg.json diff --git a/ports/libfork/portfile.cmake b/ports/libfork/portfile.cmake new file mode 100644 index 00000000000000..285beb02556aa6 --- /dev/null +++ b/ports/libfork/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO conorwilliams/libfork + REF "v${VERSION}" + SHA512 dcd1c81833deda519da7483b1b35087856c118db7de8b780018fa251d4b6ef4f02c9d3a7e60d61607bbe0946e157e382d3023baedf9254e42f614080e4b43069 + HEAD_REF cmake-sample-lib +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "libfork") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) diff --git a/ports/libfork/usage b/ports/libfork/usage new file mode 100644 index 00000000000000..0d5acf66b8c97f --- /dev/null +++ b/ports/libfork/usage @@ -0,0 +1,4 @@ +libfork provides CMake targets: + + find_package(libfork CONFIG REQUIRED) + target_link_libraries(main PRIVATE libfork::libfork) \ No newline at end of file diff --git a/ports/libfork/vcpkg.json b/ports/libfork/vcpkg.json new file mode 100644 index 00000000000000..7ba0737dca0ccd --- /dev/null +++ b/ports/libfork/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libfork", + "version": "3.7.0", + "homepage": "https://github.com/conorwilliams/libfork", + "description": "A bleeding-edge, lock-free, wait-free, continuation-stealing fork-join library built on C++20's coroutines.", + "license": "MPL-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "boost-atomic", + "hwloc" + ] +} \ No newline at end of file From da82f39b66870e8a826d4fcf25665f896b9c7784 Mon Sep 17 00:00:00 2001 From: Conor Williams Date: Thu, 29 Feb 2024 10:48:46 +0000 Subject: [PATCH 02/14] lint (auto format) --- ports/libfork/vcpkg.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ports/libfork/vcpkg.json b/ports/libfork/vcpkg.json index 7ba0737dca0ccd..91932226074647 100644 --- a/ports/libfork/vcpkg.json +++ b/ports/libfork/vcpkg.json @@ -1,19 +1,19 @@ { - "name": "libfork", - "version": "3.7.0", - "homepage": "https://github.com/conorwilliams/libfork", - "description": "A bleeding-edge, lock-free, wait-free, continuation-stealing fork-join library built on C++20's coroutines.", - "license": "MPL-2.0", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "boost-atomic", - "hwloc" - ] -} \ No newline at end of file + "name": "libfork", + "version": "3.7.0", + "description": "A bleeding-edge, lock-free, wait-free, continuation-stealing fork-join library built on C++20's coroutines.", + "homepage": "https://github.com/conorwilliams/libfork", + "license": "MPL-2.0", + "dependencies": [ + "boost-atomic", + "hwloc", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From 6e1168032d1e165389e9a2567a3bb30f858761ea Mon Sep 17 00:00:00 2001 From: Conor Williams Date: Thu, 29 Feb 2024 10:49:20 +0000 Subject: [PATCH 03/14] version database --- versions/baseline.json | 4 ++++ versions/l-/libfork.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/l-/libfork.json diff --git a/versions/baseline.json b/versions/baseline.json index a05ce31e19b0aa..83800a24a1d479 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4348,6 +4348,10 @@ "baseline": "1.1.4", "port-version": 0 }, + "libfork": { + "baseline": "3.7.0", + "port-version": 0 + }, "libfort": { "baseline": "0.4.2", "port-version": 1 diff --git a/versions/l-/libfork.json b/versions/l-/libfork.json new file mode 100644 index 00000000000000..54def62be6dd6f --- /dev/null +++ b/versions/l-/libfork.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2efae3193b23c4bb2c4eaa66f6e14d98cf1a6d42", + "version": "3.7.0", + "port-version": 0 + } + ] +} From 3827bcf7bbb8ea7b2e68a88d1535606147ec1152 Mon Sep 17 00:00:00 2001 From: Conor Williams Date: Thu, 29 Feb 2024 10:54:03 +0000 Subject: [PATCH 04/14] set correct main version --- ports/libfork/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libfork/portfile.cmake b/ports/libfork/portfile.cmake index 285beb02556aa6..13d818b67f033c 100644 --- a/ports/libfork/portfile.cmake +++ b/ports/libfork/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( REPO conorwilliams/libfork REF "v${VERSION}" SHA512 dcd1c81833deda519da7483b1b35087856c118db7de8b780018fa251d4b6ef4f02c9d3a7e60d61607bbe0946e157e382d3023baedf9254e42f614080e4b43069 - HEAD_REF cmake-sample-lib + HEAD_REF main ) vcpkg_cmake_configure( From 7da910e1b4f0886a39e5a4dbefeecc5874f6a5a6 Mon Sep 17 00:00:00 2001 From: Conor Williams Date: Thu, 29 Feb 2024 10:54:37 +0000 Subject: [PATCH 05/14] version database --- versions/l-/libfork.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libfork.json b/versions/l-/libfork.json index 54def62be6dd6f..8264e0d986f935 100644 --- a/versions/l-/libfork.json +++ b/versions/l-/libfork.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2efae3193b23c4bb2c4eaa66f6e14d98cf1a6d42", + "git-tree": "88957f84eb0f55c2d04b66d08d4761a9d106385c", "version": "3.7.0", "port-version": 0 } From 13013b55856de3e292a477292e44f5562dfbb4bf Mon Sep 17 00:00:00 2001 From: Conor Williams Date: Thu, 29 Feb 2024 13:41:24 +0000 Subject: [PATCH 06/14] bump version --- ports/libfork/portfile.cmake | 2 +- ports/libfork/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libfork/portfile.cmake b/ports/libfork/portfile.cmake index 13d818b67f033c..d1b621b4a54e3d 100644 --- a/ports/libfork/portfile.cmake +++ b/ports/libfork/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO conorwilliams/libfork REF "v${VERSION}" - SHA512 dcd1c81833deda519da7483b1b35087856c118db7de8b780018fa251d4b6ef4f02c9d3a7e60d61607bbe0946e157e382d3023baedf9254e42f614080e4b43069 + SHA512 1e94f91924abdda8950af634896fcdc6317b6487a4b51619733758291d3fa2ba9004f9204440b2e6a827b5ba417503e7120e4d32cf3bb3a96495792efb14fcfc HEAD_REF main ) diff --git a/ports/libfork/vcpkg.json b/ports/libfork/vcpkg.json index 91932226074647..1b6452402766c1 100644 --- a/ports/libfork/vcpkg.json +++ b/ports/libfork/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libfork", - "version": "3.7.0", + "version": "3.7.1", "description": "A bleeding-edge, lock-free, wait-free, continuation-stealing fork-join library built on C++20's coroutines.", "homepage": "https://github.com/conorwilliams/libfork", "license": "MPL-2.0", From 294d005c8e9c3056ae8cab1e20ca2c59159c75d3 Mon Sep 17 00:00:00 2001 From: Conor Williams Date: Thu, 29 Feb 2024 13:42:56 +0000 Subject: [PATCH 07/14] version database --- versions/baseline.json | 2 +- versions/l-/libfork.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 83800a24a1d479..fa2e93e23b03c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4349,7 +4349,7 @@ "port-version": 0 }, "libfork": { - "baseline": "3.7.0", + "baseline": "3.7.1", "port-version": 0 }, "libfort": { diff --git a/versions/l-/libfork.json b/versions/l-/libfork.json index 8264e0d986f935..f08c7a7d42b293 100644 --- a/versions/l-/libfork.json +++ b/versions/l-/libfork.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "88957f84eb0f55c2d04b66d08d4761a9d106385c", - "version": "3.7.0", + "git-tree": "39b852b7025f977ea4b1d9f58fc7021b98a946fd", + "version": "3.7.1", "port-version": 0 } ] From c4910b62edca8ae56328917634d7d2721b550ee1 Mon Sep 17 00:00:00 2001 From: Conor Williams Date: Fri, 1 Mar 2024 14:41:58 +0000 Subject: [PATCH 08/14] better copywrite Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> --- ports/libfork/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libfork/portfile.cmake b/ports/libfork/portfile.cmake index d1b621b4a54e3d..8be0f3bfd90953 100644 --- a/ports/libfork/portfile.cmake +++ b/ports/libfork/portfile.cmake @@ -16,6 +16,6 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME "libfork") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) From 47774f8fc3bb38c6308869455af20bd532a9796e Mon Sep 17 00:00:00 2001 From: Conor Williams Date: Fri, 1 Mar 2024 14:42:19 +0000 Subject: [PATCH 09/14] Update ports/libfork/vcpkg.json Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> --- ports/libfork/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libfork/vcpkg.json b/ports/libfork/vcpkg.json index 1b6452402766c1..1432bc8142214a 100644 --- a/ports/libfork/vcpkg.json +++ b/ports/libfork/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libfork", - "version": "3.7.1", + "version": "${VERSION}", "description": "A bleeding-edge, lock-free, wait-free, continuation-stealing fork-join library built on C++20's coroutines.", "homepage": "https://github.com/conorwilliams/libfork", "license": "MPL-2.0", From ea97acb76cc0ef672b7942a8c780b0ec79a12a8d Mon Sep 17 00:00:00 2001 From: Conor Williams Date: Fri, 1 Mar 2024 14:47:17 +0000 Subject: [PATCH 10/14] Revert "Update ports/libfork/vcpkg.json" This reverts commit 47774f8fc3bb38c6308869455af20bd532a9796e. --- ports/libfork/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libfork/vcpkg.json b/ports/libfork/vcpkg.json index 1432bc8142214a..1b6452402766c1 100644 --- a/ports/libfork/vcpkg.json +++ b/ports/libfork/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libfork", - "version": "${VERSION}", + "version": "3.7.1", "description": "A bleeding-edge, lock-free, wait-free, continuation-stealing fork-join library built on C++20's coroutines.", "homepage": "https://github.com/conorwilliams/libfork", "license": "MPL-2.0", From 98ea3729eb82ae3e2c1a70eb438d4e1f73e61556 Mon Sep 17 00:00:00 2001 From: Conor Williams Date: Fri, 1 Mar 2024 14:49:24 +0000 Subject: [PATCH 11/14] add blank line --- ports/libfork/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/libfork/portfile.cmake b/ports/libfork/portfile.cmake index 8be0f3bfd90953..60615da61b4be3 100644 --- a/ports/libfork/portfile.cmake +++ b/ports/libfork/portfile.cmake @@ -19,3 +19,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) + From abc508234707180afcc0c471cc6520fae66bb149 Mon Sep 17 00:00:00 2001 From: Conor Williams Date: Fri, 1 Mar 2024 16:07:52 +0000 Subject: [PATCH 12/14] update database --- versions/l-/libfork.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libfork.json b/versions/l-/libfork.json index f08c7a7d42b293..ff63fb8eb2ac56 100644 --- a/versions/l-/libfork.json +++ b/versions/l-/libfork.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "39b852b7025f977ea4b1d9f58fc7021b98a946fd", + "git-tree": "494cbd4939008a36174f7bc15fc2ba08ea6b0eab", "version": "3.7.1", "port-version": 0 } From f3e2542b469ceb46a89f900e142413b82a1b64ad Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Mon, 4 Mar 2024 10:26:31 +0800 Subject: [PATCH 13/14] Update usage --- ports/libfork/usage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libfork/usage b/ports/libfork/usage index 0d5acf66b8c97f..06d186ab6471f1 100644 --- a/ports/libfork/usage +++ b/ports/libfork/usage @@ -1,4 +1,4 @@ libfork provides CMake targets: find_package(libfork CONFIG REQUIRED) - target_link_libraries(main PRIVATE libfork::libfork) \ No newline at end of file + target_link_libraries(main PRIVATE libfork::libfork) From 6fe7598eab0e9693df366d9ea9f00623a0c5bd86 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Mon, 4 Mar 2024 10:38:38 +0800 Subject: [PATCH 14/14] Update libfork.json --- versions/l-/libfork.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libfork.json b/versions/l-/libfork.json index ff63fb8eb2ac56..8a44f4007526e3 100644 --- a/versions/l-/libfork.json +++ b/versions/l-/libfork.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "494cbd4939008a36174f7bc15fc2ba08ea6b0eab", + "git-tree": "5217dcb7548a52356e0ead8c0c671fa4ee4efa41", "version": "3.7.1", "port-version": 0 }