File 0942-otp-Generate-chunk-files-for-more-modules.... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0942-otp-Generate-chunk-files-for-more-modules.patch of Package erlang (Revision ef76582d9ec8723017fd1825f278d2c9)

Currently displaying revision ef76582d9ec8723017fd1825f278d2c9 , Show latest

From 7e3e9e545dcd4a2bff0781534920a457a7639717 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 9 Oct 2023 15:31:18 +0200
Subject: [PATCH 02/13] otp: Generate chunk files for more modules

diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile
index 6e95ded749..a4deeba269 100644
--- a/erts/doc/src/Makefile
+++ b/erts/doc/src/Makefile
@@ -118,7 +118,7 @@ HTML_EXTRA_FILES = $(ERL_TOP)/erts/example/time_compat.erl \
 
 XML_GEN_FILES = $(XML_INTERNAL_FILES:%=$(XMLDIR)/%)
 
-NO_CHUNKS = $(XML_REF3_CREF) erl_tracer.xml
+NO_CHUNKS = $(XML_REF3_CREF)
 
 # ----------------------------------------------------
 
diff --git a/lib/common_test/doc/src/Makefile b/lib/common_test/doc/src/Makefile
index a5f2f0975e..4c65078f92 100644
--- a/lib/common_test/doc/src/Makefile
+++ b/lib/common_test/doc/src/Makefile
@@ -87,7 +87,7 @@ XML_FILES=$(XML_APPLICATION_FILES) $(XML_REF1_FILES)  $(XML_REF3_FILES) $(XML_RE
 
 TOP_SPECS_FILE = specs.xml
 
-NO_CHUNKS = ct_hooks.xml ct_suite.xml
+NO_CHUNKS = 
 
 # ----------------------------------------------------
 
diff --git a/lib/diameter/doc/src/Makefile b/lib/diameter/doc/src/Makefile
index e54b5e4707..cfb3d9788d 100644
--- a/lib/diameter/doc/src/Makefile
+++ b/lib/diameter/doc/src/Makefile
@@ -39,7 +39,7 @@ XML_GEN_FILES = $(XMLDIR)/seehere.ent $(patsubst %.ent,$(XMLDIR)/%.ent,$(XML_EXT
 
 EXTRA_FILES=depend.mk $(XMLDIR)/seehere.ent
 
-NO_CHUNKS = diameter_app.xml diameter_transport.xml
+NO_CHUNKS = 
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/inets/doc/src/Makefile b/lib/inets/doc/src/Makefile
index e3c876c5be..59a8cd19c0 100644
--- a/lib/inets/doc/src/Makefile
+++ b/lib/inets/doc/src/Makefile
@@ -66,7 +66,7 @@ XML_FILES = \
 	$(XML_REF3_FILES)    \
 	$(XML_APPLICATION_FILES)
 
-NO_CHUNKS = httpd_custom_api.xml
+NO_CHUNKS = 
 
 # ----------------------------------------------------
 
diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile
index 79880fcbd7..29170025fe 100644
--- a/lib/snmp/doc/src/Makefile
+++ b/lib/snmp/doc/src/Makefile
@@ -53,17 +53,7 @@ XML_ERRS = $(XML_FILES:%.xml=%.latex.xmls_errs) \
 XML_OUTPUT = $(XML_FILES:%.xml=%.latex.xmls_output) \
               $(XML_FILES:%.xml=%.html.xmls_output)
 
-NO_CHUNKS = snmpa_discovery_handler.xml \
-	snmpa_error_report.xml \
-	snmpa_mib_data.xml \
-	snmpa_mib_storage.xml \
-	snmpa_network_interface.xml \
-	snmpa_network_interface_filter.xml \
-	snmpa_notification_delivery_info_receiver.xml \
-	snmpa_notification_filter.xml \
-	snmpm_network_interface.xml \
-	snmpm_network_interface_filter.xml \
-	snmpm_user.xml
+NO_CHUNKS = 
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/ssh/doc/src/Makefile b/lib/ssh/doc/src/Makefile
index 3835866fcc..00f1a69a39 100644
--- a/lib/ssh/doc/src/Makefile
+++ b/lib/ssh/doc/src/Makefile
@@ -67,7 +67,7 @@ IMAGE_FILES = SSH_protocols.png ssh_timeouts.jpg
 
 TOP_SPECS_FILE = specs.xml
 
-NO_CHUNKS = ssh_client_key_api.xml ssh_server_key_api.xml ssh_server_channel.xml ssh_file.xml
+NO_CHUNKS =
 
 # ----------------------------------------------------
 include $(ERL_TOP)/make/doc.mk
diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile
index 428783f8e1..db700bc555 100644
--- a/lib/ssl/doc/src/Makefile
+++ b/lib/ssl/doc/src/Makefile
@@ -52,7 +52,7 @@ XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) $(XML_REF6_
 
 TOP_SPECS_FILE = specs.xml
 
-NO_CHUNKS = ssl_crl_cache_api.xml ssl_session_cache_api.xml
+NO_CHUNKS = 
 
 # ----------------------------------------------------
 include $(ERL_TOP)/make/doc.mk
diff --git a/make/doc.mk b/make/doc.mk
index 247ae4b36e..589f8340e0 100644
--- a/make/doc.mk
+++ b/make/doc.mk
@@ -28,9 +28,15 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 endif
 RELCHUNKSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 
+ifeq ($(APPLICATION),erts)
+APP_DIR = $(ERL_TOP)/erts/preloaded
+APP_SRC_DIR = $(APP_DIR)/src
+APP_EBIN_DIR = $(APP_DIR)/ebin
+else
 APP_DIR = $(ERL_TOP)/lib/$(APPLICATION)
 APP_SRC_DIR = $(APP_DIR)/src
 APP_EBIN_DIR = $(APP_DIR)/ebin
+endif
 
 # ----------------------------------------------------
 HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
diff --git a/make/otp.mk.in b/make/otp.mk.in
index 1ed554ee76..6fe13b695b 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -327,8 +327,17 @@ $(PDFDIR)/%.pdf: %.fo
 $(CHUNKSDIR)/%.chunk: $(XMLDIR)/%.xml ../../ebin/%.beam $(DOCGEN)/ebin/docgen_xml_to_chunk.beam
 	$(gen_verbose)escript $(DOCGEN)/priv/bin/chunk.escript $(APPLICATION) $^ $@
 
+$(CHUNKSDIR)/%.chunk: $(XMLDIR)/%.xml ../../examples/meas/%.beam $(DOCGEN)/ebin/docgen_xml_to_chunk.beam
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/chunk.escript $(APPLICATION) $^ $@
+
+$(CHUNKSDIR)/%.chunk: $(XMLDIR)/%.xml ../../examples/simple/%.beam $(DOCGEN)/ebin/docgen_xml_to_chunk.beam
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/chunk.escript $(APPLICATION) $^ $@
+
 $(CHUNKSDIR)/%.chunk: $(XMLDIR)/%.xml ../../preloaded/ebin/%.beam $(DOCGEN)/ebin/docgen_xml_to_chunk.beam
 	$(gen_verbose)escript $(DOCGEN)/priv/bin/chunk.escript $(APPLICATION) $^ $@
 
+$(CHUNKSDIR)/%.chunk: ../../preloaded/ebin/%.beam $(DOCGEN)/ebin/docgen_xml_to_chunk.beam
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/chunk.escript $(APPLICATION) $^ $@
+
 $(CHUNKSDIR)/%.chunk: ../../ebin/%.beam $(DOCGEN)/ebin/docgen_xml_to_chunk.beam
 	$(gen_verbose)escript $(DOCGEN)/priv/bin/chunk.escript $(APPLICATION) $^ $@
-- 
2.35.3

Places

File 0942-otp-Generate-chunk-files-for-more-modules.patch of Package erlang (Revision ef76582d9ec8723017fd1825f278d2c9)

Places