[esock] Documentation woes

Still trying to make --disable-esock to work properly.
Now the primary chore is the doc building.

OTP-15765

4 files changed, 51 insertions, 35 deletions

diff --git a/lib/kernel/doc/src/Makefile b/lib/kernel/doc/src/Makefile
index 366631e912..817f592ad4 100644
--- a/lib/kernel/doc/src/Makefile
+++ b/lib/kernel/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.
@@ -37,10 +37,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
 
-ifeq ($(USE_ESOCK), yes)
+# The doc build has problems with if-defing out modules...
+ifeq ($(USE_ESOCK),yes)
 XML_REF3_ESOCK_FILES = net.xml
+ESOCK_USE_NET_XML=<xi:include href="net.xml"\/>
 else
 XML_REF3_ESOCK_FILES =
+ESOCK_USE_NET_XML =
 endif
 
 XML_REF3_FILES = application.xml \
@@ -120,6 +123,7 @@ SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml)
 
 TOP_SPECS_FILE = specs.xml
 
+
 # ----------------------------------------------------
 # FIGURES
 # ----------------------------------------------------
@@ -146,7 +150,7 @@ SPECS_FLAGS = -I../../include
 $(HTMLDIR)/%: %
 	$(INSTALL_DATA) $< $@
 
-docs: man pdf html
+docs: ref_man man pdf html
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
@@ -156,19 +160,31 @@ html: images $(HTML_REF_MAN_FILE)
 
 man: $(MAN3_FILES) $(MAN4_FILES) $(MAN6_FILES)
 
+ref_man: ref_man.xml
+
 images: $(IMAGE_FILES:%=$(HTMLDIR)/%)
 
+info:
+	@echo "XML_APPLICATION_FILES: $(XML_APPLICATION_FILES)"
+	@echo "XML_REF3_ESOCK_FILES:  $(XML_REF3_ESOCK_FILES)"
+	@echo "XML_REF3_FILES:        $(XML_REF3_FILES)"
+	@echo "XML_REF4_FILES:        $(XML_REF4_FILES)"
+	@echo "XML_REF6_FILES:        $(XML_REF6_FILES)"
+	@echo "XML_PART_FILES:        $(XML_PART_FILES)"
+	@echo "XML_CHAPTER_FILES:     $(XML_CHAPTER_FILES)"
+	@echo "BOOK_FILES:            $(BOOK_FILES)"
+
 debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
 	rm -rf $(XMLDIR)
-	rm -f $(MAN3DIR)/*
-	rm -f $(MAN4DIR)/*
-	rm -f $(MAN6DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f $(SPECDIR)/*
-	rm -f errs core *~ *.eps
+	rm -f  $(MAN3DIR)/*
+	rm -f  $(MAN4DIR)/*
+	rm -f  $(MAN6DIR)/*
+	rm -f  $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	rm -f  $(SPECDIR)/*
+	rm -f  errs core *~ *.eps
 
 $(SPECDIR)/specs_erl_prim_loader_stub.xml:
 	$(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
@@ -183,6 +199,11 @@ $(SPECDIR)/specs_zlib_stub.xml:
 	$(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
                 -o$(dir $@) -module zlib_stub
 
+ref_man.xml: ref_man.xml.src
+	($(PERL) -p -e 's?%ESOCK_USE_NET_XML%?$(ESOCK_USE_NET_XML)?' \
+            $<) > $@
+
+
 # ----------------------------------------------------
 # Release Target
 # ----------------------------------------------------
diff --git a/lib/kernel/doc/src/ref_man.xml b/lib/kernel/doc/src/ref_man.xml.src
index d3b947527f..72e3409123 100644
--- a/lib/kernel/doc/src/ref_man.xml
+++ b/lib/kernel/doc/src/ref_man.xml.src
@@ -4,7 +4,7 @@
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2018</year>
+      <year>1996</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -60,6 +60,7 @@
   <xi:include href="logger_formatter.xml"/>
   <xi:include href="logger_std_h.xml"/>
   <xi:include href="logger_disk_log_h.xml"/>
+  %ESOCK_USE_NET_XML%
   <xi:include href="net_adm.xml"/>
   <xi:include href="net_kernel.xml"/>
   <xi:include href="os.xml"/>
diff --git a/lib/kernel/doc/src/specs.xml b/lib/kernel/doc/src/specs.xml
index b8c25ca53b..9e258910db 100644
--- a/lib/kernel/doc/src/specs.xml
+++ b/lib/kernel/doc/src/specs.xml
@@ -26,6 +26,7 @@
   <xi:include href="../specs/specs_logger_formatter.xml"/>
   <xi:include href="../specs/specs_logger_std_h.xml"/>
   <xi:include href="../specs/specs_logger_disk_log_h.xml"/>
+  <xi:include href="../specs/specs_net.xml"/>
   <xi:include href="../specs/specs_net_adm.xml"/>
   <xi:include href="../specs/specs_net_kernel.xml"/>
   <xi:include href="../specs/specs_os.xml"/>
diff --git a/lib/kernel/src/net.erl b/lib/kernel/src/net.erl
index ac8b600e4b..01409c736a 100644
--- a/lib/kernel/src/net.erl
+++ b/lib/kernel/src/net.erl
@@ -71,31 +71,24 @@
 
 
 -ifdef(USE_ESOCK).
--type name_info_flags()         :: prim_net:name_info_flags().
--type name_info_flag()          :: prim_net:name_info_flag().
--type name_info_flag_ext()      :: prim_net:name_info_flag_ext().
--type name_info()               :: prim_net:name_info().
--type address_info()            :: prim_net:address_info().
--type network_interface_name()  :: prim_net:network_interface_name().
--type network_interface_index() :: prim_net:network_interface_index().
-
-%% -type name_info_flags()         :: [name_info_flag()|name_info_flag_ext()].
-%% -type name_info_flag()          :: namereqd |
-%%                                    dgram |
-%%                                    nofqdn |
-%%                                    numerichost |
-%%                                    nomericserv.
-%% -type name_info_flag_ext()      :: idn |
-%%                                    idna_allow_unassigned |
-%%                                    idna_use_std3_ascii_rules.
-%% -type name_info()               :: #{host    := string(),
-%%                                      service := string()}.
-%% -type address_info()            :: #{family   := socket:domain(),
-%%                                      socktype := socket:type(),
-%%                                      protocol := socket:protocol(),
-%%                                      address  := socket:sockaddr()}.
-%% -type network_interface_name()  :: string().
-%% -type network_interface_index() :: non_neg_integer().
+
+-type name_info_flags()         :: [name_info_flag()|name_info_flag_ext()].
+-type name_info_flag()          :: namereqd |
+                                   dgram |
+                                   nofqdn |
+                                   numerichost |
+                                   nomericserv.
+-type name_info_flag_ext()      :: idn |
+                                   idna_allow_unassigned |
+                                   idna_use_std3_ascii_rules.
+-type name_info()               :: #{host    := string(),
+                                     service := string()}.
+-type address_info()            :: #{family   := socket:domain(),
+                                     socktype := socket:type(),
+                                     protocol := socket:protocol(),
+                                     address  := socket:sockaddr()}.
+-type network_interface_name()  :: string().
+-type network_interface_index() :: non_neg_integer().
 
 -endif.