From 1fe29381876838e26c5ffbd2efaf449a5a9522a9 Mon Sep 17 00:00:00 2001 From: Sverker Eriksson Date: Fri, 14 Jun 2019 17:41:57 +0200 Subject: Move net.xml from erts to kernel --- erts/doc/src/Makefile | 3 +- erts/doc/src/net.xml | 129 -------------------------------------------------- 2 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 erts/doc/src/net.xml (limited to 'erts/doc') diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile index bc01919da1..a509f33eac 100644 --- a/erts/doc/src/Makefile +++ b/erts/doc/src/Makefile @@ -56,8 +56,7 @@ XML_REF3_EFILES = \ atomics.xml \ counters.xml \ zlib.xml \ - socket.xml \ - net.xml + socket.xml XML_REF3_FILES = \ $(XML_REF3_EFILES) \ diff --git a/erts/doc/src/net.xml b/erts/doc/src/net.xml deleted file mode 100644 index 6fbc37076c..0000000000 --- a/erts/doc/src/net.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - -
- - 20182018 - Ericsson AB. 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. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - - net - - - - - net.xml -
- net - Network interface. - -

This module provides an API for the network interface.

- -

There is currently no support for Windows.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Get hostname. - -

Returns the name of the current host.

- - - - - - - Address-to-name transaltion. - -

Address-to-name translation in a protocol-independant manner.

-

This function is the inverse of - getaddrinfo. - It converts a socket address to a corresponding host and service.

- - - - - - - - - Network address and service transation. - -

Network address and service translation.

-

This function is the inverse of - getnameinfo. - It converts host and service to a corresponding socket address.

-

One of the Host and Service may be undefined - but not both.

- - - - - - Mappings between network interface names and indexes. - -

Mappings between network interface names and indexes.

- - - - - - Mappings between network interface index and names. - -

Mappings between network interface index and names.

- - - - - - Get network interface names and indexes. - -

Get network interface names and indexes.

- - - - - - - -- cgit v1.2.3 From fdffb35fc3209e20459a03fc21924295b96becee Mon Sep 17 00:00:00 2001 From: Sverker Eriksson Date: Fri, 14 Jun 2019 18:49:52 +0200 Subject: Remove ESOCK stuff from doc build --- erts/doc/src/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'erts/doc') diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile index a509f33eac..0e35d7c79f 100644 --- a/erts/doc/src/Makefile +++ b/erts/doc/src/Makefile @@ -47,6 +47,12 @@ XML_REF1_FILES = epmd.xml \ run_erl.xml \ start.xml +ifeq ($(USE_ESOCK), yes) +XML_REF3_ESOCK_EFILES = socket.xml +else +XML_REF3_ESOCK_EFILES = +endif + XML_REF3_EFILES = \ erl_prim_loader.xml \ erlang.xml \ @@ -56,7 +62,7 @@ XML_REF3_EFILES = \ atomics.xml \ counters.xml \ zlib.xml \ - socket.xml + $(XML_REF3_ESOCK_EFILES) XML_REF3_FILES = \ $(XML_REF3_EFILES) \ -- cgit v1.2.3 From 55685630a4c2edccda1954e4bfb2ee590a4467f9 Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Mon, 17 Jun 2019 18:14:29 +0200 Subject: [esock] Documentation woes Still trying to make --disable-esock to work properly. Now the primary chore is the doc building. OTP-15765 --- erts/doc/src/Makefile | 22 +++++++++++++++-- erts/doc/src/part.xml | 49 ------------------------------------- erts/doc/src/part.xml.src | 49 +++++++++++++++++++++++++++++++++++++ erts/doc/src/ref_man.xml | 58 -------------------------------------------- erts/doc/src/ref_man.xml.src | 57 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 126 insertions(+), 109 deletions(-) delete mode 100644 erts/doc/src/part.xml create mode 100644 erts/doc/src/part.xml.src delete mode 100644 erts/doc/src/ref_man.xml create mode 100644 erts/doc/src/ref_man.xml.src (limited to 'erts/doc') diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile index 0e35d7c79f..735084b345 100644 --- a/erts/doc/src/Makefile +++ b/erts/doc/src/Makefile @@ -49,8 +49,14 @@ XML_REF1_FILES = epmd.xml \ ifeq ($(USE_ESOCK), yes) XML_REF3_ESOCK_EFILES = socket.xml +XML_CHAPTER_ESOCK_EFILES = socket_usage.xml +ESOCK_USE_SOCKET_XML= +ESOCK_USE_SOCKET_USAGE_XML= else XML_REF3_ESOCK_EFILES = +XML_CHAPTER_ESOCK_EFILES = +ESOCK_USE_SOCKET_XML = +ESOCK_USE_SOCKET_USAGE_XML = endif XML_REF3_EFILES = \ @@ -99,7 +105,7 @@ XML_CHAPTER_FILES = \ driver.xml \ absform.xml \ inet_cfg.xml \ - socket_usage.xml \ + $(XML_CHAPTER_ESOCK_EFILES) \ erl_ext_dist.xml \ erl_dist_protocol.xml \ communication.xml \ @@ -164,7 +170,7 @@ $(HTMLDIR)/%.gif: %.gif $(XML_FIGURE_DIR)/%.png: ../../emulator/internal_doc/figures/%.png $(INSTALL_DATA) $< $@ -docs: figures man pdf html $(INFO_FILE) +docs: part ref_man figures man pdf html $(INFO_FILE) $(TOP_PDF_FILE): $(XML_FILES) @@ -174,6 +180,9 @@ html: gifs $(HTML_REF_MAN_FILE) man: $(MAN1_FILES) $(MAN3_FILES) +ref_man: ref_man.xml +part: part.xml + gifs: $(GIF_FILES:%=$(HTMLDIR)/%) $(INFO_FILE): $(INFO_FILE_SRC) $(ERL_TOP)/make/$(TARGET)/otp.mk @@ -201,6 +210,15 @@ $(SPECDIR)/specs_%.xml: $(XMLDIR)/%.xml: ../../emulator/internal_doc/%.md $(ERL_TOP)/make/emd2exml $(ERL_TOP)/make/emd2exml $< $@ +ref_man.xml: ref_man.xml.src + ($(PERL) -p -e 's?%ESOCK_USE_SOCKET_XML%?$(ESOCK_USE_SOCKET_XML)?' \ + $<) > $@ + +part.xml: part.xml.src + ($(PERL) -p -e 's?%ESOCK_USE_SOCKET_USAGE_XML%?$(ESOCK_USE_SOCKET_USAGE_XML)?' \ + $<) > $@ + + # ---------------------------------------------------- # Release Target # ---------------------------------------------------- diff --git a/erts/doc/src/part.xml b/erts/doc/src/part.xml deleted file mode 100644 index f0b8a00b90..0000000000 --- a/erts/doc/src/part.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - -
- - 19962018 - Ericsson AB. 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. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - - ERTS User's Guide - Catrin Granbom - - 1997-05-15 - 4.5.2 - part.xml -
- - - - - - - - - - - - - - - - - - diff --git a/erts/doc/src/part.xml.src b/erts/doc/src/part.xml.src new file mode 100644 index 0000000000..9b20beffad --- /dev/null +++ b/erts/doc/src/part.xml.src @@ -0,0 +1,49 @@ + + + + +
+ + 19962019 + Ericsson AB. 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. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + + ERTS User's Guide + Catrin Granbom + + 1997-05-15 + 4.5.2 + part.xml +
+ + + + + + + + + + + + + + %ESOCK_USE_SOCKET_USAGE_XML% + + + + diff --git a/erts/doc/src/ref_man.xml b/erts/doc/src/ref_man.xml deleted file mode 100644 index 80cdcf9145..0000000000 --- a/erts/doc/src/ref_man.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - -
- - 19962018 - Ericsson AB. 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. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - - ERTS Reference Manual - Lars Thorsén - - 1997-05-15 - 4.5.2 - application.xml -
- - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/erts/doc/src/ref_man.xml.src b/erts/doc/src/ref_man.xml.src new file mode 100644 index 0000000000..7dd003763c --- /dev/null +++ b/erts/doc/src/ref_man.xml.src @@ -0,0 +1,57 @@ + + + + +
+ + 19962019 + Ericsson AB. 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. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + + ERTS Reference Manual + Lars Thorsén + + 1997-05-15 + 4.5.2 + application.xml +
+ + + + + + + + + + + + + + + + + + + + %ESOCK_USE_SOCKET_XML% + + + + + + -- cgit v1.2.3 From 878741953069a8d0a7d683cf2b7cbbfe957e880d Mon Sep 17 00:00:00 2001 From: Micael Karlberg 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/doc') 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= +ESOCK_USE_SOCKET_SPECS_XML= ESOCK_USE_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 @@ - - - - - - - - - - - - - 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 @@ + + + + + + + + %ESOCK_USE_SOCKET_SPECS_XML% + + + + -- cgit v1.2.3