From 57787964fda190305fc7353e618da089ed3aff4b Mon Sep 17 00:00:00 2001 From: Philipp Stephani Date: Thu, 18 Jan 2024 02:12:44 +0100 Subject: [PATCH] Check for starlark_doc_extract instead of Bazel version. See https://github.com/bazel-contrib/bazel_features/pull/34#issuecomment-1897141981. --- docs/BUILD | 4 +--- private/defs.bzl | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/BUILD b/docs/BUILD index 54b449a1..47c52f59 100644 --- a/docs/BUILD +++ b/docs/BUILD @@ -17,7 +17,7 @@ load("@pip_deps//:requirements.bzl", "requirement") load("@rules_python//python:defs.bzl", "py_binary") load("@rules_python//python:proto.bzl", "py_proto_library") load("//elisp:defs.bzl", "elisp_binary", "elisp_manual") -load("//private:defs.bzl", "bazel_is_at_least", "merged_manual") +load("//private:defs.bzl", "DOCUMENT_EXTENSIONS", "merged_manual") package( default_applicable_licenses = ["//:license"], @@ -41,8 +41,6 @@ genrule( cmd = "makeinfo --no-split --output=$@ -- $<", ) -DOCUMENT_EXTENSIONS = bazel_is_at_least("7") - DOCS = [ "elisp", "emacs", diff --git a/private/defs.bzl b/private/defs.bzl index 72cdaed3..45711b23 100644 --- a/private/defs.bzl +++ b/private/defs.bzl @@ -23,6 +23,8 @@ load(":generated.bzl", "CHR", "ORD") visibility(["//docs", "//elisp", "//elisp/proto", "//emacs", "//tests/wrap"]) +DOCUMENT_EXTENSIONS = hasattr(native, "starlark_doc_extract") + def bazel_is_at_least(version): """Return `True` if the Bazel version is at least version.""" return versions.is_at_least(version, BAZEL_VERSION)