From c2b3b2bc4a36c9b91ca5efca2d6fe1c702ec69b8 Mon Sep 17 00:00:00 2001 From: Jeremy Nimmer Date: Sun, 15 Dec 2024 07:52:52 -0800 Subject: [PATCH] spdlog@1.15.0.bcr.2 Add bool_flag for header_only mode. This enables `--@spdlog//:header_only=False` on the bazel command line. --- modules/spdlog/1.15.0.bcr.2/MODULE.bazel | 11 +++ .../spdlog/1.15.0.bcr.2/overlay/BUILD.bazel | 99 +++++++++++++++++++ .../spdlog/1.15.0.bcr.2/overlay/MODULE.bazel | 1 + modules/spdlog/1.15.0.bcr.2/presubmit.yml | 18 ++++ modules/spdlog/1.15.0.bcr.2/source.json | 10 ++ modules/spdlog/metadata.json | 3 +- 6 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 modules/spdlog/1.15.0.bcr.2/MODULE.bazel create mode 100644 modules/spdlog/1.15.0.bcr.2/overlay/BUILD.bazel create mode 120000 modules/spdlog/1.15.0.bcr.2/overlay/MODULE.bazel create mode 100644 modules/spdlog/1.15.0.bcr.2/presubmit.yml create mode 100644 modules/spdlog/1.15.0.bcr.2/source.json diff --git a/modules/spdlog/1.15.0.bcr.2/MODULE.bazel b/modules/spdlog/1.15.0.bcr.2/MODULE.bazel new file mode 100644 index 00000000000..3a666063b40 --- /dev/null +++ b/modules/spdlog/1.15.0.bcr.2/MODULE.bazel @@ -0,0 +1,11 @@ +module( + name = "spdlog", + version = "1.15.0.bcr.2", + compatibility_level = 1, +) + +bazel_dep(name = "bazel_skylib", version = "1.7.1") +bazel_dep(name = "fmt", version = "11.0.2") +bazel_dep(name = "rules_cc", version = "0.1.0") + +bazel_dep(name = "catch2", version = "3.7.1", dev_dependency = True) diff --git a/modules/spdlog/1.15.0.bcr.2/overlay/BUILD.bazel b/modules/spdlog/1.15.0.bcr.2/overlay/BUILD.bazel new file mode 100644 index 00000000000..c9f99840dd9 --- /dev/null +++ b/modules/spdlog/1.15.0.bcr.2/overlay/BUILD.bazel @@ -0,0 +1,99 @@ +load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") +load("@rules_cc//cc:defs.bzl", "cc_library") + +bool_flag( + name = "header_only", + build_setting_default = True, +) + +config_setting( + name = "header_only_true", + flag_values = { + ":header_only": "True", + }, +) + +SRCS = glob( + [ + "src/*.cpp", + ], + exclude = [ + "src/bundled*", + ], +) + +HDRS = glob( + [ + "include/**/*.h", + ], + exclude = [ + "include/**/*-inl.h", + "include/spdlog/fmt/bundled/**", + ], +) + +INLS = glob( + [ + "include/**/*-inl.h", + ], + exclude = [ + "include/spdlog/fmt/bundled/**", + ], +) + +cc_library( + name = "spdlog", + srcs = select({ + ":header_only_true": [], + "//conditions:default": SRCS + INLS, + }), + hdrs = select({ + ":header_only_true": HDRS + INLS, + "//conditions:default": HDRS, + }), + defines = ["SPDLOG_FMT_EXTERNAL"] + select({ + ":header_only_true": [], + "//conditions:default": ["SPDLOG_COMPILED_LIB"], + }), + includes = ["include"], + visibility = ["//visibility:public"], + deps = ["@fmt"], +) + +cc_test( + name = "spdlog_test", + srcs = [ + "tests/includes.h", + "tests/main.cpp", + "tests/test_async.cpp", + "tests/test_backtrace.cpp", + "tests/test_bin_to_hex.cpp", + "tests/test_cfg.cpp", + "tests/test_circular_q.cpp", + "tests/test_create_dir.cpp", + "tests/test_custom_callbacks.cpp", + "tests/test_daily_logger.cpp", + "tests/test_dup_filter.cpp", + "tests/test_errors.cpp", + "tests/test_eventlog.cpp", + "tests/test_file_helper.cpp", + "tests/test_file_logging.cpp", + "tests/test_fmt_helper.cpp", + "tests/test_macros.cpp", + "tests/test_misc.cpp", + "tests/test_mpmc_q.cpp", + "tests/test_pattern_formatter.cpp", + "tests/test_registry.cpp", + "tests/test_sink.h", + "tests/test_stdout_api.cpp", + "tests/test_stopwatch.cpp", + "tests/test_systemd.cpp", + "tests/test_time_point.cpp", + "tests/utils.cpp", + "tests/utils.h", + ], + deps = [ + ":spdlog", + "@catch2//:catch2_main", + ], +) diff --git a/modules/spdlog/1.15.0.bcr.2/overlay/MODULE.bazel b/modules/spdlog/1.15.0.bcr.2/overlay/MODULE.bazel new file mode 120000 index 00000000000..9b599e3ad9c --- /dev/null +++ b/modules/spdlog/1.15.0.bcr.2/overlay/MODULE.bazel @@ -0,0 +1 @@ +../MODULE.bazel \ No newline at end of file diff --git a/modules/spdlog/1.15.0.bcr.2/presubmit.yml b/modules/spdlog/1.15.0.bcr.2/presubmit.yml new file mode 100644 index 00000000000..566fad92573 --- /dev/null +++ b/modules/spdlog/1.15.0.bcr.2/presubmit.yml @@ -0,0 +1,18 @@ +matrix: + platform: + - debian10 + - debian11 + - macos + - macos_arm64 + - ubuntu2004 + - ubuntu2204 + - ubuntu2404 + - windows + bazel: [7.x, rolling] +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - "@spdlog//:spdlog" diff --git a/modules/spdlog/1.15.0.bcr.2/source.json b/modules/spdlog/1.15.0.bcr.2/source.json new file mode 100644 index 00000000000..f4a15fa6ddc --- /dev/null +++ b/modules/spdlog/1.15.0.bcr.2/source.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/gabime/spdlog/archive/refs/tags/v1.15.0.tar.gz", + "integrity": "sha256-mWJkjJtPGnu8dv2NkXJVW60Ycf2xT/T4Qu+HlJaCyqU=", + "strip_prefix": "spdlog-1.15.0", + "patch_strip": 0, + "overlay": { + "BUILD.bazel": "sha256-wNMOpyEN4/Ha4jzPkEZLMfeeUMc7dseTSPBuyEbtwFo=", + "MODULE.bazel": "sha256-bFwS/xbKqQBWs1OhOMywl4bR6k9BbMc+4NfUypYUUGk=" + } +} diff --git a/modules/spdlog/metadata.json b/modules/spdlog/metadata.json index fa40c80c09c..453b41be992 100644 --- a/modules/spdlog/metadata.json +++ b/modules/spdlog/metadata.json @@ -23,7 +23,8 @@ "1.14.0", "1.14.1", "1.15.0", - "1.15.0.bcr.1" + "1.15.0.bcr.1", + "1.15.0.bcr.2" ], "yanked_versions": {} }