File 1371-Revert-Scan-SKIP-files-in-addition-to-scanning-SKIP-.patch of Package erlang
From 487e410ef5a0d8bc70c076b8c24dabb94664ebeb Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Mon, 16 Mar 2026 15:06:39 +0100
Subject: [PATCH 1/7] Revert "Scan SKIP files in addition to scanning
SKIP-APPLICATIONS"
This reverts commit b0d8a9e0d7d4cf77540184d63291ac5a09c86971.
---
Makefile.in | 4 ----
system/doc/top/Makefile | 10 ++--------
system/doc/top/docs.exs | 26 +++-----------------------
3 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 5a9a72e5e9..fe2c6541ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -992,7 +992,3 @@ APPS_TEST=$(patsubst %, %_test,$(APPS))
$(NO_DIALYZER_APPS): $$(patsubst %,%_build,$$@)
$(APPS_TEST): $$(patsubst %_test,%_build,$$@)
ERL_TOP=$(ERL_TOP) TYPE=$(TYPE) $(MAKE) -C lib/$(patsubst %_test,%,$@) test
-
-.PHONY: clean_docs
-clean_docs:
- rm -rf $(ERL_TOP)/doc $(ERL_TOP)/make/otp_doc_built
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index df5aad6d91..bcf2f6ad51 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -28,7 +28,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
# ----------------------------------------------------
APPLICATION=Erlang/OTP
VSN=$(shell cat $(ERL_TOP)/OTP_VERSION)
-
+SKIP_FILE := $(wildcard $(ERL_TOP)/lib/SKIP_APPLICATIONS)
+SKIP_APPLICATIONS=$(if $(SKIP_FILE),$(shell cat $(ERL_TOP)/lib/SKIP-APPLICATIONS),)
APP_DIR=../../../lib/erl_interface
INDEX_DIR=.
HTMLDIR=../../../doc
@@ -44,13 +45,6 @@ TESTING=common_test eunit
DOCUMENTATION=edoc
SYSTEM:=$(shell awk -F: '{print $$1}' ../guides)
-# The applications skipped by $(ERL_TOP)/configure are not added SKIP-APPLICATIONS.
-# Solution: read both SKIP-APPLICATIONS and names of libraries which contain a lib/*/SKIP file.
-# $(pathsubst %/,%,_) clears trailing slash, $(dir _) = directory name, $(notdir _) = last component of the path
-SKIP_FILE := $(wildcard $(ERL_TOP)/lib/SKIP-APPLICATIONS)
-SKIP_APPLICATIONS=$(if $(SKIP_FILE),$(shell cat $(ERL_TOP)/lib/SKIP-APPLICATIONS),) \
- $(foreach f,$(wildcard $(ERL_TOP)/lib/*/SKIP),$(notdir $(patsubst %/,%,$(dir $(f)))))
-
REDIRECTS=$(foreach guide,$(SYSTEM),system/$(guide).md) \
$(foreach app, $(filter-out $(SKIP_APPLICATIONS),$(CORE)), core/$(app).md) \
$(foreach app, $(filter-out $(SKIP_APPLICATIONS),$(DATABASE)), database/$(app).md) \
diff --git a/system/doc/top/docs.exs b/system/doc/top/docs.exs
index 61610c4a88..0471db5f11 100644
--- a/system/doc/top/docs.exs
+++ b/system/doc/top/docs.exs
@@ -25,8 +25,8 @@ system_guides =
line |> String.split(":") |> Enum.at(0)
end)
-# $ERL_TOP/configure creates artifact lib/SKIP-APPLICATIONS containing all apps
-# skipped by user request (via command line). We can't build documentation for them.
+# Root /configure creates artifact /lib/SKIP-APPLICATIONS containing all apps
+# not built for various reasons. We can't build documentation for them either.
skipped_apps_from_file =
with erl_top when is_binary(erl_top) <- System.get_env("ERL_TOP"),
skip_path <- Path.join([erl_top, "lib", "SKIP-APPLICATIONS"]),
@@ -40,31 +40,11 @@ skipped_apps_from_file =
_ -> MapSet.new()
end
-# Failed lib/*/configure writes a file called 'SKIP', find names of such apps.
-skipped_apps_from_SKIP = fn ->
- with erl_top when is_binary(erl_top) <- System.get_env("ERL_TOP"),
- lib_path <- Path.join([erl_top, "lib"]) do
- Path.wildcard(Path.join([lib_path, "*", "SKIP"]))
- |> Enum.map(fn skip_file ->
- skip_file
- |> Path.dirname()
- |> Path.basename()
- |> String.downcase()
- end)
- |> MapSet.new()
- else
- _ -> MapSet.new()
- end
-end
-
apps =
Path.wildcard("{core,database,oam,interfaces,tools,testing,documentation}/*.md")
|> Enum.map(&Path.basename/1)
|> Enum.map(&Path.rootname/1)
- |> Enum.reject(fn app ->
- MapSet.member?(skipped_apps_from_file, app) or
- MapSet.member?(skipped_apps_from_SKIP.(), app)
- end)
+ |> Enum.reject(fn app -> skipped_apps_from_file |> MapSet.member?(app) end)
redirects =
Enum.map(apps, fn
--
2.51.0