diff --git a/.codecov.yml b/.codecov.yml index 32be6362..88949595 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -7,7 +7,7 @@ codecov: ignore: - "benchmarks/cpp/asio/*" - - "examples/*" + - "example/*" - "tests/*" - "/usr/*" - "**/boost/*" diff --git a/CMakeLists.txt b/CMakeLists.txt index af097451..f442d55c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,5 +74,5 @@ if(BOOST_REDIS_MAIN_PROJECT AND BUILD_TESTING) add_subdirectory(benchmarks) # Examples - add_subdirectory(examples) + add_subdirectory(example) endif() diff --git a/doc/Jamfile b/doc/Jamfile index de957e6f..83782e62 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -9,7 +9,7 @@ path-constant this_dir : . ; path-constant target_dir : html ; path-constant redis_root_dir : .. ; path-constant include_dir : ../include ; -path-constant examples_dir : ../examples ; +path-constant examples_dir : ../example ; path-constant readme : ../README.md ; path-constant layout_file : DoxygenLayout.xml ; diff --git a/examples/CMakeLists.txt b/example/CMakeLists.txt similarity index 100% rename from examples/CMakeLists.txt rename to example/CMakeLists.txt diff --git a/examples/cpp17_intro.cpp b/example/cpp17_intro.cpp similarity index 100% rename from examples/cpp17_intro.cpp rename to example/cpp17_intro.cpp diff --git a/examples/cpp17_intro_sync.cpp b/example/cpp17_intro_sync.cpp similarity index 100% rename from examples/cpp17_intro_sync.cpp rename to example/cpp17_intro_sync.cpp diff --git a/examples/cpp20_chat_room.cpp b/example/cpp20_chat_room.cpp similarity index 100% rename from examples/cpp20_chat_room.cpp rename to example/cpp20_chat_room.cpp diff --git a/examples/cpp20_containers.cpp b/example/cpp20_containers.cpp similarity index 100% rename from examples/cpp20_containers.cpp rename to example/cpp20_containers.cpp diff --git a/examples/cpp20_echo_server.cpp b/example/cpp20_echo_server.cpp similarity index 100% rename from examples/cpp20_echo_server.cpp rename to example/cpp20_echo_server.cpp diff --git a/examples/cpp20_intro.cpp b/example/cpp20_intro.cpp similarity index 100% rename from examples/cpp20_intro.cpp rename to example/cpp20_intro.cpp diff --git a/examples/cpp20_intro_tls.cpp b/example/cpp20_intro_tls.cpp similarity index 100% rename from examples/cpp20_intro_tls.cpp rename to example/cpp20_intro_tls.cpp diff --git a/examples/cpp20_json.cpp b/example/cpp20_json.cpp similarity index 97% rename from examples/cpp20_json.cpp rename to example/cpp20_json.cpp index 8a18e1d7..2f0674f0 100644 --- a/examples/cpp20_json.cpp +++ b/example/cpp20_json.cpp @@ -41,7 +41,7 @@ struct user { // The type must be described for serialization to work. BOOST_DESCRIBE_STRUCT(user, (), (name, age, country)) -// Boost.Redis customization points (examples/json.hpp) +// Boost.Redis customization points (example/json.hpp) void boost_redis_to_bulk(std::string& to, user const& u) { boost::redis::resp3::boost_redis_to_bulk(to, boost::json::serialize(boost::json::value_from(u))); } diff --git a/examples/cpp20_protobuf.cpp b/example/cpp20_protobuf.cpp similarity index 95% rename from examples/cpp20_protobuf.cpp rename to example/cpp20_protobuf.cpp index f8ab5494..e8b47e79 100644 --- a/examples/cpp20_protobuf.cpp +++ b/example/cpp20_protobuf.cpp @@ -27,10 +27,10 @@ using boost::redis::ignore_t; using boost::redis::config; using boost::redis::connection; -// The protobuf type described in examples/person.proto +// The protobuf type described in example/person.proto using tutorial::person; -// Boost.Redis customization points (examples/protobuf.hpp) +// Boost.Redis customization points (example/protobuf.hpp) namespace tutorial { diff --git a/examples/cpp20_resolve_with_sentinel.cpp b/example/cpp20_resolve_with_sentinel.cpp similarity index 100% rename from examples/cpp20_resolve_with_sentinel.cpp rename to example/cpp20_resolve_with_sentinel.cpp diff --git a/examples/cpp20_streams.cpp b/example/cpp20_streams.cpp similarity index 100% rename from examples/cpp20_streams.cpp rename to example/cpp20_streams.cpp diff --git a/examples/cpp20_subscriber.cpp b/example/cpp20_subscriber.cpp similarity index 100% rename from examples/cpp20_subscriber.cpp rename to example/cpp20_subscriber.cpp diff --git a/examples/main.cpp b/example/main.cpp similarity index 100% rename from examples/main.cpp rename to example/main.cpp diff --git a/examples/person.proto b/example/person.proto similarity index 100% rename from examples/person.proto rename to example/person.proto diff --git a/examples/sync_connection.hpp b/example/sync_connection.hpp similarity index 100% rename from examples/sync_connection.hpp rename to example/sync_connection.hpp diff --git a/tools/ci.py b/tools/ci.py index bf81ad45..9eae794f 100755 --- a/tools/ci.py +++ b/tools/ci.py @@ -109,7 +109,7 @@ def _setup_boost( # Install Boost dependencies _run(["git", "config", "submodule.fetchJobs", "8"]) _run(["git", "submodule", "update", "-q", "--init", "tools/boostdep"]) - _run(["python", "tools/boostdep/depinst/depinst.py", "--include", "examples", "redis"]) + _run(["python", "tools/boostdep/depinst/depinst.py", "--include", "example", "redis"]) # Bootstrap if _is_windows: