Skip to content

Port of spdlog to v1.11.0 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Wmbat merged 8 commits into from
Jun 7, 2023
Merged

Port of spdlog to v1.11.0 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb6eaf9
Port of spdlog to v1.11.0
Wmbat Jan 7, 2023
6f3ddd8
Added testscript to run formatter_bench
Wmbat May 14, 2023
5fa58f9
Updated script to account for output to stdin & stdout
Wmbat May 14, 2023
b47216b
Fixed symlink issues visible on windows.
Klaim May 14, 2023
f209398
Fixed: testscript not being taken into account in testing.
Klaim May 14, 2023
37bb2a8
Revert "Fixed symlink issues visible on windows."
Klaim May 14, 2023
c052b7f
Re-attempt to fix the symlink issues.
Klaim May 14, 2023
1b6725f
Updated repositories.manifest
Wmbat Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@
# Use `binary` to make sure certain files are never auto-detected as text.
#
#*.png binary

spdlog-tests/spdlog-tests/tests_src symlink=dir
spdlog-bench/spdlog-bench/bench_src symlink=dir
spdlog/spdlog/include symlink=dir
spdlog/spdlog/src symlink=dir
2 changes: 1 addition & 1 deletion repositories.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ summary: spdlog project repository

:
role: prerequisite
location: https://pkg.cppget.org/1/testing
location: https://pkg.cppget.org/1/stable
trust: 70:64:FE:E4:E0:F3:60:F1:B4:51:E1:FA:12:5C:E0:B3:DB:DF:96:33:39:B9:2E:E5:C2:68:63:4C:A6:47:39:43
2 changes: 1 addition & 1 deletion spdlog-bench/manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
: 1
name: spdlog-bench
version: 1.10.0+3
version: 1.11.0
project: spdlog
summary: Benchmarks package for spdlog
topics: logging, C++
Expand Down
4 changes: 2 additions & 2 deletions spdlog-bench/spdlog-bench/buildfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import libs = spdlog%lib{spdlog}
import libs += google-benchmark%lib{benchmark}

./: exe{async-bench}: bench_src/cxx{async_bench} bench_src/hxx{*} $libs
./: exe{bench}: bench_src/cxx{bench} bench_src/hxx{*} $libs
./: exe{formatter-bench}: bench_src/cxx{formatter-bench} bench_src/hxx{*} $libs
# ./: exe{bench}: bench_src/cxx{bench} bench_src/hxx{*} $libs
./: exe{formatter-bench}: bench_src/cxx{formatter-bench} bench_src/hxx{*} testscript{*} $libs
./: exe{latency}: bench_src/cxx{latency} bench_src/hxx{*} $libs

cxx.poptions =+ "-I$out_root" "-I$src_root"
4 changes: 4 additions & 0 deletions spdlog-bench/spdlog-bench/formatter_bench_script.testscript
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

# Pass the 'all' command line argument to the formatter bench
# and expect output on both stdin and stdout
$* 'all' 1>- 2>-
2 changes: 1 addition & 1 deletion spdlog-tests/manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
: 1
name: spdlog-tests
version: 1.10.0+3
version: 1.11.0
project: spdlog
summary: Tests package for spdlog
topics: logging, C++
Expand Down
4 changes: 2 additions & 2 deletions spdlog/manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
: 1
name: spdlog
version: 1.10.0+3
version: 1.11.0
project: spdlog
summary: Fast C++ logging library.
license: MIT ; MIT License
Expand All @@ -20,6 +20,6 @@ requires: c++ >= 11
depends: * build2 >= 0.13.0
depends: * bpkg >= 0.13.0

depends: fmt ^8.1.1
depends: fmt ^9.1.0

build-exclude: linux_debian_10-emcc_2.0.25 ; Compiler error, use at your own risks.
2 changes: 1 addition & 1 deletion upstream
Open in desktop
Submodule upstream updated 65 files
+81 −0 .github/workflows/ci.yml
+0 −155 .travis.yml
+29 −3 CMakeLists.txt
+8 −10 README.md
+12 −1 appveyor.yml
+1 −2 bench/latency.cpp
+2 −2 cmake/spdlog.pc.in
+14 −3 example/example.cpp
+1 −1 include/spdlog/common-inl.h
+17 −15 include/spdlog/common.h
+5 −0 include/spdlog/details/circular_q.h
+1 −1 include/spdlog/details/fmt_helper.h
+6 −0 include/spdlog/details/mpmc_blocking_q.h
+0 −4 include/spdlog/details/null_mutex.h
+1 −5 include/spdlog/details/os-inl.h
+0 −21 include/spdlog/details/periodic_worker-inl.h
+21 −1 include/spdlog/details/periodic_worker.h
+0 −7 include/spdlog/details/registry-inl.h
+8 −2 include/spdlog/details/registry.h
+5 −0 include/spdlog/details/thread_pool-inl.h
+1 −0 include/spdlog/details/thread_pool.h
+5 −3 include/spdlog/fmt/bin_to_hex.h
+4 −4 include/spdlog/fmt/bundled/args.h
+63 −61 include/spdlog/fmt/bundled/chrono.h
+113 −100 include/spdlog/fmt/bundled/color.h
+40 −71 include/spdlog/fmt/bundled/compile.h
+481 −394 include/spdlog/fmt/bundled/core.h
+807 −1,727 include/spdlog/fmt/bundled/format-inl.h
+1,535 −422 include/spdlog/fmt/bundled/format.h
+26 −75 include/spdlog/fmt/bundled/os.h
+124 −22 include/spdlog/fmt/bundled/ostream.h
+7 −24 include/spdlog/fmt/bundled/printf.h
+291 −362 include/spdlog/fmt/bundled/ranges.h
+26 −33 include/spdlog/fmt/bundled/xchar.h
+4 −0 include/spdlog/fmt/fmt.h
+14 −8 include/spdlog/logger.h
+12 −1 include/spdlog/pattern_formatter-inl.h
+1 −0 include/spdlog/pattern_formatter.h
+28 −5 include/spdlog/sinks/android_sink.h
+7 −4 include/spdlog/sinks/daily_file_sink.h
+7 −7 include/spdlog/sinks/dist_sink.h
+8 −0 include/spdlog/sinks/hourly_file_sink.h
+17 −9 include/spdlog/sinks/mongo_sink.h
+13 −6 include/spdlog/sinks/msvc_sink.h
+1 −5 include/spdlog/sinks/ringbuffer_sink.h
+4 −4 include/spdlog/sinks/win_eventlog_sink.h
+2 −2 include/spdlog/sinks/wincolor_sink-inl.h
+0 −5 include/spdlog/spdlog-inl.h
+11 −2 include/spdlog/spdlog.h
+1 −0 include/spdlog/stopwatch.h
+7 −0 include/spdlog/tweakme.h
+1 −1 include/spdlog/version.h
+12 −0 scripts/ci_setup_clang.sh
+0 −2 src/async.cpp
+52 −0 src/bundled_fmtlib_format.cpp
+0 −110 src/fmt.cpp
+10 −1 tests/includes.h
+10 −1 tests/main.cpp
+18 −39 tests/test_daily_logger.cpp
+3 −15 tests/test_errors.cpp
+5 −21 tests/test_fmt_helper.cpp
+1 −1 tests/test_misc.cpp
+47 −58 tests/test_pattern_formatter.cpp
+16 −7 tests/test_stopwatch.cpp
+1 −1 tests/utils.cpp