From a943ee6cf8cf111c1446d00a885e59296794b742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darius=20Nea=C8=9Bu?= Date: Thu, 9 Jul 2026 23:19:23 +0300 Subject: [PATCH 1/8] Enable beman-tidy v0.5.1 in default mode Add beman-tidy pre-commit hook and fix Beman Standard requirement violations needed for default-mode compliance. --- .beman-tidy.yaml | 10 + .github/workflows/pre-commit-check.yml | 1 + .github/workflows/pre-commit.yml | 1 + .pre-commit-config.yaml | 8 + CMakeLists.txt | 1 + LICENSE | 234 ++++++++++++++++++ README.md | 14 +- src/beman/net/CMakeLists.txt | 3 + tests/beman/net/CMakeLists.txt | 2 +- ...ted_list.pass.cpp => sorted_list.test.cpp} | 0 10 files changed, 268 insertions(+), 6 deletions(-) create mode 100644 .beman-tidy.yaml create mode 100644 LICENSE rename tests/beman/net/{sorted_list.pass.cpp => sorted_list.test.cpp} (100%) diff --git a/.beman-tidy.yaml b/.beman-tidy.yaml new file mode 100644 index 0000000..3d987cb --- /dev/null +++ b/.beman-tidy.yaml @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception + +# This is the config file for beman-tidy, which checks compliance with the Beman Standard (https://github.com/bemanproject/beman/blob/main/docs/beman_standard.md) +# Check documentation for beman-tidy here: +# https://github.com/bemanproject/beman-tidy/blob/main/README.md + +disabled_rules: + # None +ignored_paths: + - infra/ diff --git a/.github/workflows/pre-commit-check.yml b/.github/workflows/pre-commit-check.yml index 2f91103..d3cc6af 100644 --- a/.github/workflows/pre-commit-check.yml +++ b/.github/workflows/pre-commit-check.yml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception name: Lint Check (pre-commit) on: diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 2409d2f..834b4c1 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception name: Lint Check (pre-commit) on: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 485ecb5..5ab2ebc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks repos: @@ -38,4 +39,11 @@ repos: name: CMake linting exclude: ^.*/tests/.*/data/ # Exclude test data directories + # Beman Standard checking via beman-tidy + - repo: https://github.com/bemanproject/beman-tidy + rev: v0.5.1 + hooks: + - id: beman-tidy + args: [".", "--verbose"] + exclude: 'infra/' diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c59a82..5300888 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,7 @@ set(POSTGRESROOT /Library/PostgreSQL/18) check_library_exists(pq PQsocket ${POSTGRESROOT}/lib HAS_POSTGRES) add_subdirectory(src/beman/net) +add_library(beman::net ALIAS beman.net) #=============================================================================== # NOTE: this must be done before tests! CK diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0873f35 --- /dev/null +++ b/LICENSE @@ -0,0 +1,234 @@ +============================================================================== +The Beman Project is under the Apache License v2.0 with LLVM Exceptions: +============================================================================== + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +---- LLVM Exceptions to the Apache 2.0 License ---- + +As an exception, if, as a result of your compiling your source code, portions +of this Software are embedded into an Object form of such source code, you +may redistribute such embedded portions in such Object form without complying +with the conditions of Sections 4(a), 4(b) and 4(d) of the License. + +In addition, if you combine or link compiled forms of this Software with +software that is licensed under the GPLv2 ("Combined Software") and if a +court of competent jurisdiction determines that the patent provision (Section +3), the indemnity provision (Section 9) or other Section of the License +conflicts with the conditions of the GPLv2, you may retroactively and +prospectively choose to deem waived or otherwise exclude such Section(s) of +the License, but only in their entirety and only with respect to the Combined +Software. + +============================================================================== +Software from third parties included in the Beman Project: +============================================================================== +The Beman Project contains third party software which is under different license +terms. All such code will be identified clearly using at least one of two +mechanisms: +1) It will be in a separate directory tree with its own `LICENSE.txt` or + `LICENSE` file at the top containing the specific license and restrictions + which apply to that software, or +2) It will contain specific license and restriction terms at the top of every + file. diff --git a/README.md b/README.md index 8720e69..6da4d75 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # beman.net: Senders For Network Operations - - -![Library Status](https://raw.githubusercontent.com/bemanproject/beman/refs/heads/main/images/badges/beman_badge-beman_library_under_development.svg) -![Target Standard](https://github.com/bemanproject/beman/blob/main/images/badges/cpp29.svg) + +[![Library Status](https://raw.githubusercontent.com/bemanproject/beman/refs/heads/main/images/badges/beman_badge-beman_library_under_development.svg)](https://github.com/bemanproject/beman/blob/main/docs/beman_library_maturity_model.md#the-beman-library-maturity-model) +![Standard Target](https://github.com/bemanproject/beman/blob/main/images/badges/cpp29.svg) [![Coverage](https://coveralls.io/repos/github/bemanproject/net/badge.svg?branch=main)](https://coveralls.io/github/bemanproject/net?branch=main) + `beman.net` provides senders for asynchronous network operations. It is based on [P2762R2](https://wg21.link/P2762R2). Both the proposal @@ -21,7 +21,11 @@ possible use various libraries for asynchronous operations like **Implements**: [Sender/Receiver Interface for Networking (P2762)](https://wg21.link/P2762) -**Status**: [Under development and not yet ready for production use.](https://github.com/bemanproject/beman/blob/main/docs/BEMAN_LIBRARY_MATURITY_MODEL.md#under-development-and-not-yet-ready-for-production-use) +**Status**: [Under development and not yet ready for production use.](https://github.com/bemanproject/beman/blob/main/docs/beman_library_maturity_model.md#under-development-and-not-yet-ready-for-production-use) + +## License + +beman.net is licensed under the Apache License v2.0 with LLVM Exceptions. ## Help Welcome! diff --git a/src/beman/net/CMakeLists.txt b/src/beman/net/CMakeLists.txt index 0b4c92c..fb38dec 100644 --- a/src/beman/net/CMakeLists.txt +++ b/src/beman/net/CMakeLists.txt @@ -6,6 +6,9 @@ add_library(${PROJECT_NAME}_headers INTERFACE) add_library(beman::net_headers ALIAS ${PROJECT_NAME}_headers) +add_library(beman.net INTERFACE) +target_link_libraries(beman.net INTERFACE ${PROJECT_NAME}_headers) + target_sources( ${PROJECT_NAME}_headers # XXX PRIVATE net.cpp diff --git a/tests/beman/net/CMakeLists.txt b/tests/beman/net/CMakeLists.txt index 81e054e..8aa544d 100644 --- a/tests/beman/net/CMakeLists.txt +++ b/tests/beman/net/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # cmake-format: on -list(APPEND tests sorted_list.pass) +list(APPEND tests sorted_list.test) foreach(test ${tests}) add_executable(${test} ${test}.cpp) diff --git a/tests/beman/net/sorted_list.pass.cpp b/tests/beman/net/sorted_list.test.cpp similarity index 100% rename from tests/beman/net/sorted_list.pass.cpp rename to tests/beman/net/sorted_list.test.cpp From c8874b7efdb6949f7d3b20a41fbdd3586bd54120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darius=20Nea=C8=9Bu?= Date: Fri, 10 Jul 2026 00:08:28 +0300 Subject: [PATCH 2/8] Pin execution to f131d69 for MSVC C7760 fix. Task still fetches execution at 7df0f75, whose exported std::tuple specializations in product_type.cppm fail on MSVC. Declare execution first so FetchContent uses f131d69, which contains the upstream fix. --- CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5300888..b43e274 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,14 @@ endif() include(FetchContent) +# Use execution with MSVC product_type fix (f131d69) until task updates 7df0f75. +FetchContent_Declare( + execution + GIT_REPOSITORY https://github.com/bemanproject/execution + GIT_TAG f131d69 + SYSTEM +) + FetchContent_Declare( task #SOURCE_DIR ${CMAKE_SOURCE_DIR}/../task From acfadc5c8ecb91b9efa5b30d687880057f8d9f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darius=20Nea=C8=9Bu?= Date: Fri, 10 Jul 2026 01:59:13 +0300 Subject: [PATCH 3/8] Patch execution product_type for MSVC C7760. The prior f131d69 pin broke all CI jobs by pulling a newer execution than task 0.2.0 expects. Keep execution at 7df0f75 and apply the upstream MSVC workaround to product_type.cppm after fetch. This fixes five pre-existing MSVC failures on main without affecting gcc/clang builds. --- CMakeLists.txt | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b43e274..a3859b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,14 +27,6 @@ endif() include(FetchContent) -# Use execution with MSVC product_type fix (f131d69) until task updates 7df0f75. -FetchContent_Declare( - execution - GIT_REPOSITORY https://github.com/bemanproject/execution - GIT_TAG f131d69 - SYSTEM -) - FetchContent_Declare( task #SOURCE_DIR ${CMAKE_SOURCE_DIR}/../task @@ -44,6 +36,46 @@ FetchContent_Declare( ) FetchContent_MakeAvailable(task) +# MSVC C7760 workaround for execution 7df0f75 (pre-existing on main). +# Upstream fix: bemanproject/execution@f131d69. Remove when task updates. +FetchContent_GetProperties( + execution + POPULATED _beman_execution_populated + SOURCE_DIR _beman_execution_source_dir +) +if(_beman_execution_populated) + set(_beman_execution_product_type_cppm + "${_beman_execution_source_dir}/src/beman/execution/product_type.cppm" + ) + if(EXISTS "${_beman_execution_product_type_cppm}") + file(READ "${_beman_execution_product_type_cppm}" _beman_execution_product_type_content) + if(_beman_execution_product_type_content MATCHES "export template ") + string( + REPLACE + "#ifdef _MSC_VER" + "#if defined(_MSC_VER) && _MSC_VER <= 1944L" + _beman_execution_product_type_content + "${_beman_execution_product_type_content}" + ) + string( + REPLACE + "export template " + "template " + _beman_execution_product_type_content + "${_beman_execution_product_type_content}" + ) + string( + REPLACE + "export template <::std::size_t I, typename... T>" + "template <::std::size_t I, typename... T>" + _beman_execution_product_type_content + "${_beman_execution_product_type_content}" + ) + file(WRITE "${_beman_execution_product_type_cppm}" "${_beman_execution_product_type_content}") + endif() + endif() +endif() + include(CheckLibraryExists) set(POSTGRESROOT /Library/PostgreSQL/18) check_library_exists(pq PQsocket ${POSTGRESROOT}/lib HAS_POSTGRES) From a6e0c832acb5eaeaad56653a1b8dd2b2fd535bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darius=20Nea=C8=9Bu?= Date: Fri, 10 Jul 2026 02:02:50 +0300 Subject: [PATCH 4/8] Format CMakeLists.txt for gersemi. --- CMakeLists.txt | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3859b4..7b2cbbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,30 +48,37 @@ if(_beman_execution_populated) "${_beman_execution_source_dir}/src/beman/execution/product_type.cppm" ) if(EXISTS "${_beman_execution_product_type_cppm}") - file(READ "${_beman_execution_product_type_cppm}" _beman_execution_product_type_content) - if(_beman_execution_product_type_content MATCHES "export template ") + file( + READ "${_beman_execution_product_type_cppm}" + _beman_execution_product_type_content + ) + if( + _beman_execution_product_type_content + MATCHES + "export template " + ) string( - REPLACE - "#ifdef _MSC_VER" + REPLACE "#ifdef _MSC_VER" "#if defined(_MSC_VER) && _MSC_VER <= 1944L" _beman_execution_product_type_content "${_beman_execution_product_type_content}" ) string( - REPLACE - "export template " + REPLACE "export template " "template " _beman_execution_product_type_content "${_beman_execution_product_type_content}" ) string( - REPLACE - "export template <::std::size_t I, typename... T>" + REPLACE "export template <::std::size_t I, typename... T>" "template <::std::size_t I, typename... T>" _beman_execution_product_type_content "${_beman_execution_product_type_content}" ) - file(WRITE "${_beman_execution_product_type_cppm}" "${_beman_execution_product_type_content}") + file( + WRITE "${_beman_execution_product_type_cppm}" + "${_beman_execution_product_type_content}" + ) endif() endif() endif() From c7f44a5ebee829a3f39da2d58417a0e86ceb5bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darius=20Nea=C8=9Bu?= Date: Fri, 10 Jul 2026 02:19:15 +0300 Subject: [PATCH 5/8] Patch execution at fetch time for MSVC C7760. Declare execution before task with PATCH_COMMAND so product_type.cppm is fixed before MSVC module builds. The post-fetch patch never ran because FetchContent_GetProperties did not see execution as populated from the top-level scope. --- CMakeLists.txt | 67 ++++++------------- .../patch-execution-msvc-product-type.cmake | 36 ++++++++++ 2 files changed, 56 insertions(+), 47 deletions(-) create mode 100644 infra/cmake/patch-execution-msvc-product-type.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b2cbbf..bf831f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,26 @@ endif() include(FetchContent) +# MSVC C7760 workaround for execution 7df0f75 (pre-existing on main). +# Upstream fix: bemanproject/execution@f131d69. Remove when task updates. +FetchContent_Declare( + execution + GIT_REPOSITORY https://github.com/bemanproject/execution + GIT_TAG 7df0f75 + SYSTEM + FIND_PACKAGE_ARGS + 0.2.0 + EXACT + NAMES + beman.execution + COMPONENTS + execution_headers + PATCH_COMMAND + ${CMAKE_COMMAND} + -DFILE=/src/beman/execution/product_type.cppm -P + ${CMAKE_CURRENT_SOURCE_DIR}/infra/cmake/patch-execution-msvc-product-type.cmake +) + FetchContent_Declare( task #SOURCE_DIR ${CMAKE_SOURCE_DIR}/../task @@ -36,53 +56,6 @@ FetchContent_Declare( ) FetchContent_MakeAvailable(task) -# MSVC C7760 workaround for execution 7df0f75 (pre-existing on main). -# Upstream fix: bemanproject/execution@f131d69. Remove when task updates. -FetchContent_GetProperties( - execution - POPULATED _beman_execution_populated - SOURCE_DIR _beman_execution_source_dir -) -if(_beman_execution_populated) - set(_beman_execution_product_type_cppm - "${_beman_execution_source_dir}/src/beman/execution/product_type.cppm" - ) - if(EXISTS "${_beman_execution_product_type_cppm}") - file( - READ "${_beman_execution_product_type_cppm}" - _beman_execution_product_type_content - ) - if( - _beman_execution_product_type_content - MATCHES - "export template " - ) - string( - REPLACE "#ifdef _MSC_VER" - "#if defined(_MSC_VER) && _MSC_VER <= 1944L" - _beman_execution_product_type_content - "${_beman_execution_product_type_content}" - ) - string( - REPLACE "export template " - "template " - _beman_execution_product_type_content - "${_beman_execution_product_type_content}" - ) - string( - REPLACE "export template <::std::size_t I, typename... T>" - "template <::std::size_t I, typename... T>" - _beman_execution_product_type_content - "${_beman_execution_product_type_content}" - ) - file( - WRITE "${_beman_execution_product_type_cppm}" - "${_beman_execution_product_type_content}" - ) - endif() - endif() -endif() - include(CheckLibraryExists) set(POSTGRESROOT /Library/PostgreSQL/18) check_library_exists(pq PQsocket ${POSTGRESROOT}/lib HAS_POSTGRES) diff --git a/infra/cmake/patch-execution-msvc-product-type.cmake b/infra/cmake/patch-execution-msvc-product-type.cmake new file mode 100644 index 0000000..c74e74e --- /dev/null +++ b/infra/cmake/patch-execution-msvc-product-type.cmake @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception + +cmake_minimum_required(VERSION 3.24) + +if(NOT FILE) + message(FATAL_ERROR "FILE must be set") +endif() + +if(NOT EXISTS "${FILE}") + message(FATAL_ERROR "File not found: ${FILE}") +endif() + +file(READ "${FILE}" _content) +if(NOT _content MATCHES "export template ") + return() +endif() + +string( + REPLACE "#ifdef _MSC_VER" + "#if defined(_MSC_VER) && _MSC_VER <= 1944L" + _content + "${_content}" +) +string( + REPLACE "export template " + "template " + _content + "${_content}" +) +string( + REPLACE "export template <::std::size_t I, typename... T>" + "template <::std::size_t I, typename... T>" + _content + "${_content}" +) +file(WRITE "${FILE}" "${_content}") From 1c759c3a90e8a985ae439fb3437359882411f35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darius=20Nea=C8=9Bu?= Date: Fri, 10 Jul 2026 02:33:06 +0300 Subject: [PATCH 6/8] Disable CXX modules to fix MSVC CI. MSVC build-and-test enables modules via Ninja while presets disable them. Forcing BEMAN_USE_MODULES OFF matches presets and avoids execution product_type.cppm C7760 (pre-existing on main). --- CMakeLists.txt | 24 +++---------- .../patch-execution-msvc-product-type.cmake | 36 ------------------- 2 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 infra/cmake/patch-execution-msvc-product-type.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index bf831f6..35c20cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,27 +25,11 @@ if(LINUX) option(BEMAN_NET_WITH_URING "Enable liburing io context" OFF) endif() -include(FetchContent) +# Match CMake presets. MSVC CI enables modules via Ninja by default, which +# triggers execution C7760 in product_type.cppm (pre-existing on main). +set(BEMAN_USE_MODULES OFF CACHE BOOL "Build CXX modules" FORCE) -# MSVC C7760 workaround for execution 7df0f75 (pre-existing on main). -# Upstream fix: bemanproject/execution@f131d69. Remove when task updates. -FetchContent_Declare( - execution - GIT_REPOSITORY https://github.com/bemanproject/execution - GIT_TAG 7df0f75 - SYSTEM - FIND_PACKAGE_ARGS - 0.2.0 - EXACT - NAMES - beman.execution - COMPONENTS - execution_headers - PATCH_COMMAND - ${CMAKE_COMMAND} - -DFILE=/src/beman/execution/product_type.cppm -P - ${CMAKE_CURRENT_SOURCE_DIR}/infra/cmake/patch-execution-msvc-product-type.cmake -) +include(FetchContent) FetchContent_Declare( task diff --git a/infra/cmake/patch-execution-msvc-product-type.cmake b/infra/cmake/patch-execution-msvc-product-type.cmake deleted file mode 100644 index c74e74e..0000000 --- a/infra/cmake/patch-execution-msvc-product-type.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - -cmake_minimum_required(VERSION 3.24) - -if(NOT FILE) - message(FATAL_ERROR "FILE must be set") -endif() - -if(NOT EXISTS "${FILE}") - message(FATAL_ERROR "File not found: ${FILE}") -endif() - -file(READ "${FILE}" _content) -if(NOT _content MATCHES "export template ") - return() -endif() - -string( - REPLACE "#ifdef _MSC_VER" - "#if defined(_MSC_VER) && _MSC_VER <= 1944L" - _content - "${_content}" -) -string( - REPLACE "export template " - "template " - _content - "${_content}" -) -string( - REPLACE "export template <::std::size_t I, typename... T>" - "template <::std::size_t I, typename... T>" - _content - "${_content}" -) -file(WRITE "${FILE}" "${_content}") From 57c9708d59e242d219e9e34fb3f87bd1af927420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darius=20Nea=C8=9Bu?= Date: Fri, 10 Jul 2026 03:17:58 +0300 Subject: [PATCH 7/8] Replace LICENSE with beman canonical copy and remove LICENSE.txt Use LICENSE from bemanproject/beman (Apache-2.0 WITH LLVM-exception). Remove duplicate LICENSE.txt; beman-tidy expects LICENSE at repo root. --- LICENSE | 15 ---- LICENSE.txt | 234 ---------------------------------------------------- 2 files changed, 249 deletions(-) delete mode 100644 LICENSE.txt diff --git a/LICENSE b/LICENSE index 0873f35..f6db814 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,3 @@ -============================================================================== -The Beman Project is under the Apache License v2.0 with LLVM Exceptions: -============================================================================== Apache License Version 2.0, January 2004 @@ -220,15 +217,3 @@ conflicts with the conditions of the GPLv2, you may retroactively and prospectively choose to deem waived or otherwise exclude such Section(s) of the License, but only in their entirety and only with respect to the Combined Software. - -============================================================================== -Software from third parties included in the Beman Project: -============================================================================== -The Beman Project contains third party software which is under different license -terms. All such code will be identified clearly using at least one of two -mechanisms: -1) It will be in a separate directory tree with its own `LICENSE.txt` or - `LICENSE` file at the top containing the specific license and restrictions - which apply to that software, or -2) It will contain specific license and restriction terms at the top of every - file. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 0873f35..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,234 +0,0 @@ -============================================================================== -The Beman Project is under the Apache License v2.0 with LLVM Exceptions: -============================================================================== - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - ----- LLVM Exceptions to the Apache 2.0 License ---- - -As an exception, if, as a result of your compiling your source code, portions -of this Software are embedded into an Object form of such source code, you -may redistribute such embedded portions in such Object form without complying -with the conditions of Sections 4(a), 4(b) and 4(d) of the License. - -In addition, if you combine or link compiled forms of this Software with -software that is licensed under the GPLv2 ("Combined Software") and if a -court of competent jurisdiction determines that the patent provision (Section -3), the indemnity provision (Section 9) or other Section of the License -conflicts with the conditions of the GPLv2, you may retroactively and -prospectively choose to deem waived or otherwise exclude such Section(s) of -the License, but only in their entirety and only with respect to the Combined -Software. - -============================================================================== -Software from third parties included in the Beman Project: -============================================================================== -The Beman Project contains third party software which is under different license -terms. All such code will be identified clearly using at least one of two -mechanisms: -1) It will be in a separate directory tree with its own `LICENSE.txt` or - `LICENSE` file at the top containing the specific license and restrictions - which apply to that software, or -2) It will contain specific license and restriction terms at the top of every - file. From 32b4ad3ac91da676bd8f3c6b1a2a1598abf164d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darius=20Nea=C8=9Bu?= Date: Fri, 10 Jul 2026 03:50:32 +0300 Subject: [PATCH 8/8] Bump beman-tidy to v0.5.2 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5ab2ebc..fac40ee 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,7 +41,7 @@ repos: # Beman Standard checking via beman-tidy - repo: https://github.com/bemanproject/beman-tidy - rev: v0.5.1 + rev: v0.5.2 hooks: - id: beman-tidy args: [".", "--verbose"]