diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7c8535..1d11f2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -230,7 +230,6 @@ jobs: cd .. git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root - mkdir -p libs/$LIBRARY # remove when/if the library makes it into Boost cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY git submodule update --init tools/boostdep python3 tools/boostdep/depinst/depinst.py -I example --git_args "--jobs 3" $LIBRARY @@ -293,7 +292,6 @@ jobs: cd .. git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root - mkdir -p libs\%LIBRARY% # remove when/if the library makes it into Boost xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\ git submodule update --init tools/boostdep python tools/boostdep/depinst/depinst.py -I example --git_args "--jobs 3" %LIBRARY% @@ -397,7 +395,6 @@ jobs: cd .. git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root - mkdir -p libs\%LIBRARY% # remove when/if the library makes it into Boost xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\ git submodule update --init tools/boostdep python tools/boostdep/depinst/depinst.py -I benchmark -I example --git_args "--jobs 3" %LIBRARY% @@ -502,4 +499,4 @@ jobs: - name: Upload coverage env: CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}} - run: ci/codecov.sh "upload" \ No newline at end of file + run: ci/codecov.sh "upload" diff --git a/README.md b/README.md index a39e142..8587d48 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Candidate Boost Bloom Library +# Boost Bloom Library -[![Branch](https://img.shields.io/badge/branch-master-brightgreen.svg)](https://github.com/joaquintides/bloom/tree/master) [![CI](https://github.com/joaquintides/bloom/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/joaquintides/bloom/actions/workflows/ci.yml) [![Drone status](https://img.shields.io/drone/build/joaquintides/bloom/master?server=https%3A%2F%2Fdrone.cpp.al&logo=drone&logoColor=%23CCCCCC&label=CI)](https://drone.cpp.al/joaquintides/bloom) [![codecov](https://codecov.io/gh/joaquintides/bloom/branch/master/graph/badge.svg)](https://app.codecov.io/gh/joaquintides/bloom/tree/master) [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://master.bloom.cpp.al/)
-[![Branch](https://img.shields.io/badge/branch-develop-brightgreen.svg)](https://github.com/joaquintides/bloom/tree/develop) [![CI](https://github.com/joaquintides/bloom/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/joaquintides/bloom/actions/workflows/ci.yml) [![Drone status](https://img.shields.io/drone/build/joaquintides/bloom/develop?server=https%3A%2F%2Fdrone.cpp.al&logo=drone&logoColor=%23CCCCCC&label=CI)](https://drone.cpp.al/joaquintides/bloom) [![codecov](https://codecov.io/gh/joaquintides/bloom/branch/develop/graph/badge.svg)](https://app.codecov.io/gh/joaquintides/bloom/tree/develop) [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://develop.bloom.cpp.al/)
+[![Branch](https://img.shields.io/badge/branch-master-brightgreen.svg)](https://github.com/boostorg/bloom/tree/master) [![CI](https://github.com/boostorg/bloom/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/boostorg/bloom/actions/workflows/ci.yml) [![Drone status](https://img.shields.io/drone/build/boostorg/bloom/master?server=https%3A%2F%2Fdrone.cpp.al&logo=drone&logoColor=%23CCCCCC&label=CI)](https://drone.cpp.al/boostorg/bloom) [![codecov](https://codecov.io/gh/joaquintides/bloom/branch/master/graph/badge.svg)](https://app.codecov.io/gh/joaquintides/bloom/tree/master) [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://boost.org/doc/libs/master/libs/bloom)
+[![Branch](https://img.shields.io/badge/branch-develop-brightgreen.svg)](https://github.com/boostorg/bloom/tree/develop) [![CI](https://github.com/boostorg/bloom/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/boostorg/bloom/actions/workflows/ci.yml) [![Drone status](https://img.shields.io/drone/build/boostorg/bloom/develop?server=https%3A%2F%2Fdrone.cpp.al&logo=drone&logoColor=%23CCCCCC&label=CI)](https://drone.cpp.al/boostorg/bloom) [![codecov](https://codecov.io/gh/joaquintides/bloom/branch/develop/graph/badge.svg)](https://app.codecov.io/gh/joaquintides/bloom/tree/develop) [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://boost.org/doc/libs/develop/libs/bloom)
[![BSL 1.0](https://img.shields.io/badge/license-BSL_1.0-blue.svg)](https://www.boost.org/users/license.html) C++11 required Header-only library -(Candidate) Boost.Bloom provides the class template `boost::bloom::filter` that +Boost.Bloom provides the class template `boost::bloom::filter` that can be configured to implement a classical [Bloom filter](https://en.wikipedia.org/wiki/Bloom_filter) as well as variations discussed in the literature such as block filters, multiblock filters, and more. @@ -41,21 +41,38 @@ int main() ## Learn about Boost.Bloom -* [Online documentation](https://develop.bloom.cpp.al/) -* [Some benchmarks](https://github.com/joaquintides/boost_bloom_benchmarks) +* [Online documentation](https://boost.org/libs/bloom) +* [Some benchmarks](https://github.com/boostorg/boost_bloom_benchmarks) ## Install Boost.Bloom -Clone this repo, adjust your include paths and enjoy. -Boost.Bloom is header-only and requires no building. A recent version of Boost is required. +* [Download Boost](https://www.boost.org/users/download/) and you're ready to go (this is a header-only library requiring no building). +* Using Conan 2: In case you don't have it yet, add an entry for Boost in your `conanfile.txt` (the example requires at least Boost 1.89): +``` +[requires] +boost/[>=1.89.0] +``` + + +``` +[options] +boost:header_only=True +``` +* Using vcpkg: Execute the command +``` +vcpkg install boost-bloom +``` +* Using CMake: [Boost CMake support infrastructure](https://github.com/boostorg/cmake) +allows you to use CMake directly to download, build and consume all of Boost or +some specific libraries. ## Support * Join the **#boost** discussion group at [cpplang.slack.com](https://cpplang.slack.com/) ([ask for an invite](https://cppalliance.org/slack/) if you’re not a member of this workspace yet) -* [File an issue](https://github.com/joaquintides/bloom/issues) +* [File an issue](https://github.com/boostorg/bloom/issues) ## Contribute -* [Pull requests](https://github.com/joaquintides/bloom/pulls) against **develop** branch are most welcome. +* [Pull requests](https://github.com/boostorg/bloom/pulls) against **develop** branch are most welcome. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). diff --git a/build.jam b/build.jam index 68040eb..092678f 100644 --- a/build.jam +++ b/build.jam @@ -12,6 +12,7 @@ constant boost_dependencies : /boost/core//boost_core /boost/throw_exception//boost_throw_exception /boost/type_traits//boost_type_traits + ; project /boost/bloom ; diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index d53a481..c30289d 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -9,10 +9,14 @@ import config : requires ; project : requirements - # /boost/bloom//boost_bloom + /boost/bloom//boost_bloom [ requires cxx11_noexcept ] # used as a proxy for C++11 support ; exe basic : basic.cpp ; exe genome : genome.cpp : [ requires cxx17_if_constexpr ] ; -exe serialization : serialization.cpp ; \ No newline at end of file +exe serialization + : serialization.cpp + : /boost/core//boost_core + /boost/uuid//boost_uuid + ; \ No newline at end of file diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 641c44f..143ccff 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -13,7 +13,9 @@ import config : requires ; project : requirements - # /boost/bloom//boost_bloom + /boost/bloom//boost_bloom + /boost/core//boost_core + /boost/mp11//boost_mp11 [ requires cxx11_noexcept ] # used as a proxy for C++11 support msvc:-D_SCL_SECURE_NO_WARNINGS ;