diff --git a/.gitattributes b/.gitattributes index 1631641..9ec9772 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/repositories.manifest b/repositories.manifest index ad51e7d..95c2268 100644 --- a/repositories.manifest +++ b/repositories.manifest @@ -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 diff --git a/spdlog-bench/manifest b/spdlog-bench/manifest index 6923794..0fc143a 100644 --- a/spdlog-bench/manifest +++ b/spdlog-bench/manifest @@ -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++ diff --git a/spdlog-bench/spdlog-bench/buildfile b/spdlog-bench/spdlog-bench/buildfile index 4799624..218d318 100644 --- a/spdlog-bench/spdlog-bench/buildfile +++ b/spdlog-bench/spdlog-bench/buildfile @@ -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" diff --git a/spdlog-bench/spdlog-bench/formatter_bench_script.testscript b/spdlog-bench/spdlog-bench/formatter_bench_script.testscript new file mode 100644 index 0000000..cabc714 --- /dev/null +++ b/spdlog-bench/spdlog-bench/formatter_bench_script.testscript @@ -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>- diff --git a/spdlog-tests/manifest b/spdlog-tests/manifest index 48e852c..bfad7da 100644 --- a/spdlog-tests/manifest +++ b/spdlog-tests/manifest @@ -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++ diff --git a/spdlog/manifest b/spdlog/manifest index d535c3a..721eb38 100644 --- a/spdlog/manifest +++ b/spdlog/manifest @@ -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 @@ -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. diff --git a/upstream b/upstream index 76fb40d..ad0e89c 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 76fb40d95455f249bd70824ecfcae7a8f0930fa3 +Subproject commit ad0e89cbfb4d0c1ce4d097e134eb7be67baebb36