From eb6eaf948b3b453543ce27ba8bf85298a7651e27 Mon Sep 17 00:00:00 2001 From: wmbat Date: Sat, 7 Jan 2023 11:33:03 -0500 Subject: [PATCH 1/8] Port of spdlog to v1.11.0 --- spdlog-bench/manifest | 2 +- spdlog-bench/spdlog-bench/buildfile | 2 +- spdlog-tests/manifest | 2 +- spdlog/manifest | 4 ++-- upstream | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) 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..02299d0 100644 --- a/spdlog-bench/spdlog-bench/buildfile +++ b/spdlog-bench/spdlog-bench/buildfile @@ -2,7 +2,7 @@ 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{bench}: bench_src/cxx{bench} bench_src/hxx{*} $libs ./: exe{formatter-bench}: bench_src/cxx{formatter-bench} bench_src/hxx{*} $libs ./: exe{latency}: bench_src/cxx{latency} bench_src/hxx{*} $libs 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 From 6f3ddd8f34026480436447c32abc0a48c106235e Mon Sep 17 00:00:00 2001 From: wmbat Date: Sun, 14 May 2023 10:43:06 -0400 Subject: [PATCH 2/8] Added testscript to run formatter_bench --- spdlog-bench/spdlog-bench/buildfile | 2 +- spdlog-bench/spdlog-bench/testscript | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 spdlog-bench/spdlog-bench/testscript diff --git a/spdlog-bench/spdlog-bench/buildfile b/spdlog-bench/spdlog-bench/buildfile index 02299d0..002bcd3 100644 --- a/spdlog-bench/spdlog-bench/buildfile +++ b/spdlog-bench/spdlog-bench/buildfile @@ -3,7 +3,7 @@ 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{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/testscript b/spdlog-bench/spdlog-bench/testscript new file mode 100644 index 0000000..5839629 --- /dev/null +++ b/spdlog-bench/spdlog-bench/testscript @@ -0,0 +1 @@ +$* 'all' From 5fa58f9d0bbbd72d73c5bea4cbd9ec914dcd488b Mon Sep 17 00:00:00 2001 From: wmbat Date: Sun, 14 May 2023 11:02:21 -0400 Subject: [PATCH 3/8] Updated script to account for output to stdin & stdout --- spdlog-bench/spdlog-bench/buildfile | 2 +- spdlog-bench/spdlog-bench/formatter_bench_script | 4 ++++ spdlog-bench/spdlog-bench/testscript | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 spdlog-bench/spdlog-bench/formatter_bench_script delete mode 100644 spdlog-bench/spdlog-bench/testscript diff --git a/spdlog-bench/spdlog-bench/buildfile b/spdlog-bench/spdlog-bench/buildfile index 002bcd3..5e4431f 100644 --- a/spdlog-bench/spdlog-bench/buildfile +++ b/spdlog-bench/spdlog-bench/buildfile @@ -3,7 +3,7 @@ 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{*} testscript $libs +./: exe{formatter-bench}: bench_src/cxx{formatter-bench} bench_src/hxx{*} formatter_bench_script $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 b/spdlog-bench/spdlog-bench/formatter_bench_script new file mode 100644 index 0000000..cabc714 --- /dev/null +++ b/spdlog-bench/spdlog-bench/formatter_bench_script @@ -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-bench/spdlog-bench/testscript b/spdlog-bench/spdlog-bench/testscript deleted file mode 100644 index 5839629..0000000 --- a/spdlog-bench/spdlog-bench/testscript +++ /dev/null @@ -1 +0,0 @@ -$* 'all' From b47216b654c1fa89c3b28e0b0dded25839643d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sun, 14 May 2023 17:27:18 +0200 Subject: [PATCH 4/8] Fixed symlink issues visible on windows. --- .gitattributes | 5 +++++ spdlog-bench/spdlog-bench/bench_src | 2 +- spdlog-tests/spdlog-tests/tests_src | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) 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/spdlog-bench/spdlog-bench/bench_src b/spdlog-bench/spdlog-bench/bench_src index 86da35c..752a24c 120000 --- a/spdlog-bench/spdlog-bench/bench_src +++ b/spdlog-bench/spdlog-bench/bench_src @@ -1 +1 @@ -../../upstream/bench/ \ No newline at end of file +../../upstream/bench \ No newline at end of file diff --git a/spdlog-tests/spdlog-tests/tests_src b/spdlog-tests/spdlog-tests/tests_src index 1334efa..fea0e75 120000 --- a/spdlog-tests/spdlog-tests/tests_src +++ b/spdlog-tests/spdlog-tests/tests_src @@ -1 +1 @@ -../../upstream/tests/ \ No newline at end of file +../../upstream/tests \ No newline at end of file From f2093980feae5f02f5b904e896e71b8599081af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sun, 14 May 2023 17:31:36 +0200 Subject: [PATCH 5/8] Fixed: testscript not being taken into account in testing. --- spdlog-bench/spdlog-bench/buildfile | 2 +- ...formatter_bench_script => formatter_bench_script.testscript} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename spdlog-bench/spdlog-bench/{formatter_bench_script => formatter_bench_script.testscript} (100%) diff --git a/spdlog-bench/spdlog-bench/buildfile b/spdlog-bench/spdlog-bench/buildfile index 5e4431f..218d318 100644 --- a/spdlog-bench/spdlog-bench/buildfile +++ b/spdlog-bench/spdlog-bench/buildfile @@ -3,7 +3,7 @@ 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{*} formatter_bench_script $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 b/spdlog-bench/spdlog-bench/formatter_bench_script.testscript similarity index 100% rename from spdlog-bench/spdlog-bench/formatter_bench_script rename to spdlog-bench/spdlog-bench/formatter_bench_script.testscript From 37bb2a84d10082c2c1e2263c07578bfaf92baa99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sun, 14 May 2023 18:23:29 +0200 Subject: [PATCH 6/8] Revert "Fixed symlink issues visible on windows." This reverts commit b47216b654c1fa89c3b28e0b0dded25839643d33. --- .gitattributes | 5 ----- spdlog-bench/spdlog-bench/bench_src | 2 +- spdlog-tests/spdlog-tests/tests_src | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitattributes b/.gitattributes index 9ec9772..1631641 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,8 +17,3 @@ # 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/spdlog-bench/spdlog-bench/bench_src b/spdlog-bench/spdlog-bench/bench_src index 752a24c..86da35c 120000 --- a/spdlog-bench/spdlog-bench/bench_src +++ b/spdlog-bench/spdlog-bench/bench_src @@ -1 +1 @@ -../../upstream/bench \ No newline at end of file +../../upstream/bench/ \ No newline at end of file diff --git a/spdlog-tests/spdlog-tests/tests_src b/spdlog-tests/spdlog-tests/tests_src index fea0e75..1334efa 120000 --- a/spdlog-tests/spdlog-tests/tests_src +++ b/spdlog-tests/spdlog-tests/tests_src @@ -1 +1 @@ -../../upstream/tests \ No newline at end of file +../../upstream/tests/ \ No newline at end of file From c052b7faa8cffc3367a1ade608d8182f6bac7a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sun, 14 May 2023 18:25:17 +0200 Subject: [PATCH 7/8] Re-attempt to fix the symlink issues. --- .gitattributes | 5 +++++ 1 file changed, 5 insertions(+) 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 From 1b6725fd1664b7cdad225b654619a6cad8cac858 Mon Sep 17 00:00:00 2001 From: wmbat Date: Sun, 4 Jun 2023 20:18:49 -0400 Subject: [PATCH 8/8] Updated repositories.manifest --- repositories.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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