From 878741953069a8d0a7d683cf2b7cbbfe957e880d Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 24 Jun 2019 09:43:58 +0200
Subject: [esock] More doc woes

Also needed to take care of the specs files (in erts and kernel docs).
Also, ifdef'ing the net module adjusted (again).
---
 erts/doc/src/Makefile      | 11 +++++++++--
 erts/doc/src/specs.xml     | 13 -------------
 erts/doc/src/specs.xml.src | 12 ++++++++++++
 3 files changed, 21 insertions(+), 15 deletions(-)
 delete mode 100644 erts/doc/src/specs.xml
 create mode 100644 erts/doc/src/specs.xml.src

(limited to 'erts')

diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile
index 735084b345..bb96293947 100644
--- a/erts/doc/src/Makefile
+++ b/erts/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2018. All Rights Reserved.
+# Copyright Ericsson AB 1997-2019. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,11 +51,13 @@ ifeq ($(USE_ESOCK), yes)
 XML_REF3_ESOCK_EFILES = socket.xml
 XML_CHAPTER_ESOCK_EFILES = socket_usage.xml
 ESOCK_USE_SOCKET_XML=<xi:include href="socket.xml"\/>
+ESOCK_USE_SOCKET_SPECS_XML=<xi:include href="../specs/specs_socket.xml"/>
 ESOCK_USE_SOCKET_USAGE_XML=<xi:include href="socket_usage.xml"/>
 else
 XML_REF3_ESOCK_EFILES =
 XML_CHAPTER_ESOCK_EFILES =
 ESOCK_USE_SOCKET_XML =
+ESOCK_USE_SOCKET_SPECS_XML =
 ESOCK_USE_SOCKET_USAGE_XML =
 endif
 
@@ -170,7 +172,7 @@ $(HTMLDIR)/%.gif: %.gif
 $(XML_FIGURE_DIR)/%.png: ../../emulator/internal_doc/figures/%.png
 	$(INSTALL_DATA) $< $@
 
-docs: part ref_man figures man pdf html $(INFO_FILE)
+docs: part ref_man specs figures man pdf html $(INFO_FILE)
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
@@ -182,6 +184,7 @@ man: $(MAN1_FILES) $(MAN3_FILES)
 
 ref_man: ref_man.xml
 part: part.xml
+specs: specs.xml
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 
@@ -218,6 +221,10 @@ part.xml: part.xml.src
 	($(PERL) -p -e 's?%ESOCK_USE_SOCKET_USAGE_XML%?$(ESOCK_USE_SOCKET_USAGE_XML)?' \
             $<) > $@
 
+specs.xml: specs.xml.src
+	($(PERL) -p -e 's?%ESOCK_USE_SOCKET_SPECS_XML%?$(ESOCK_USE_SOCKET_SPECS_XML)?' \
+            $<) > $@
+
 
 # ----------------------------------------------------
 # Release Target
diff --git a/erts/doc/src/specs.xml b/erts/doc/src/specs.xml
deleted file mode 100644
index 68fab5edf1..0000000000
--- a/erts/doc/src/specs.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<specs xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="../specs/specs_erl_prim_loader.xml"/>
-  <xi:include href="../specs/specs_erlang.xml"/>
-  <xi:include href="../specs/specs_erl_tracer.xml"/>
-  <xi:include href="../specs/specs_init.xml"/>
-  <xi:include href="../specs/specs_persistent_term.xml"/>
-  <xi:include href="../specs/specs_socket.xml"/>
-  <xi:include href="../specs/specs_net.xml"/>
-  <xi:include href="../specs/specs_zlib.xml"/>
-  <xi:include href="../specs/specs_atomics.xml"/>
-  <xi:include href="../specs/specs_counters.xml"/>
-</specs>
diff --git a/erts/doc/src/specs.xml.src b/erts/doc/src/specs.xml.src
new file mode 100644
index 0000000000..54224c15f5
--- /dev/null
+++ b/erts/doc/src/specs.xml.src
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<specs xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../specs/specs_erl_prim_loader.xml"/>
+  <xi:include href="../specs/specs_erlang.xml"/>
+  <xi:include href="../specs/specs_erl_tracer.xml"/>
+  <xi:include href="../specs/specs_init.xml"/>
+  <xi:include href="../specs/specs_persistent_term.xml"/>
+  %ESOCK_USE_SOCKET_SPECS_XML%
+  <xi:include href="../specs/specs_zlib.xml"/>
+  <xi:include href="../specs/specs_atomics.xml"/>
+  <xi:include href="../specs/specs_counters.xml"/>
+</specs>
-- 
cgit v1.2.3