mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-28 20:47:48 +00:00
Code Issues Releases Wiki Activity

[#2081] remove docbook and docgen mentions (extra)

Browse Source
This commit is contained in:
Andrei Pavel 2021-09-11 19:51:55 +03:00 committed by Tomek Mrugalski
parent 7ede1ced15
commit 91dd72dbf3
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -2,8 +2,6 @@ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
# ^^^^^^^^ This has to be the first line and cannot come later in this # ^^^^^^^^ This has to be the first line and cannot come later in this
# Makefile.am due to some bork in some versions of autotools. # Makefile.am due to some bork in some versions of autotools.
# We now build doc after src/, because docgen, a tool to generate API
# documentation requires libkea-exceptions and libkea-cc.
SUBDIRS = tools . ext src doc m4macros @PREMIUM_DIR@ @CONTRIB_DIR@ SUBDIRS = tools . ext src doc m4macros @PREMIUM_DIR@ @CONTRIB_DIR@
USE_LCOV=@USE_LCOV@ USE_LCOV=@USE_LCOV@

25
doc/devel/doc.dox
View File

@ -11,27 +11,26 @@
There are several types of documentation for Kea. The primary one, intended to There are several types of documentation for Kea. The primary one, intended to
be read by users, is User's Guide. It comes in HTML, PDF and txt format. All be read by users, is User's Guide. It comes in HTML, PDF and txt format. All
of them generated from the same sources. To generate this doc, you need to of them generated from the same sources. To generate this doc, you need to
run configure script with --enable-generate-docs option. Several tools have to run configure script with --enable-generate-docs option. sphinx has to be
be present in the system: docbook environment, links and several others. enabled in the system.
You can generate this by doing: You can generate this by doing:
@code @code
$ ./configure --enable-generate-docs $ ./configure --enable-generate-docs
$ cd doc/ $ make -C ./doc
$ make guide
@endcode @endcode
The output files will be generated in doc/guide/ directory. The output files will be generated in the ./doc/sphinx/_build directory.
Since Kea 1.5, this doc has appendix A that lists all Kea commands. That The ARM has an appendix that lists all Kea commands. The commands are integrated
appendix is generated using a small tool called docgen. The basic principle into RST using the tool located at doc/sphinx/api2doc.py. The basic principle
is that for every command there is a JSON file that briefly describes the major is that for every command there is a JSON file that briefly describes the major
aspects of the new command, such as name, short description, expected syntax, aspects such as name, short description, expected syntax, expected response,
expected response, a hook that needs to be loaded, first Kea version where it a hook that needs to be loaded, first Kea version where it appeared, etc.
appeared, etc. Those JSON files are loaded by docgen tool that will generate Those JSON files are loaded by the api2doc.py tool that will generate api.txt
api.xml that will be used by make guide. There is no need to generate this, that will be used by sphinx. There is no need to call this tool explicitly.
unless you alter description of existing commands or add a new one. It is called automatically when building the ARM.
Since Kea 1.9.9, this doc has appendix with the grammar. If there were new Since Kea 1.9.9, the ARM has an appendix with the grammar. If there were new
parameters added, you can regenerate the grammars and the appendix with the parameters added, you can regenerate the grammars and the appendix with the
following procedure: following procedure:

9
hammer.py
View File

@ -1492,9 +1492,6 @@ def prepare_system_local(features, check_times):
if 'native-pkg' in features: if 'native-pkg' in features:
packages.extend(['python3-devel', 'rpm-build']) packages.extend(['python3-devel', 'rpm-build'])
if 'docs' in features and not revision == '8':
packages.extend(['libxslt', 'elinks', 'docbook-style-xsl'])
# TODO: # TODO:
# if 'mysql' in features: # if 'mysql' in features:
# packages.extend(['default-mysql-client-core', 'default-libmysqlclient-dev', 'mysql-server']) # packages.extend(['default-mysql-client-core', 'default-libmysqlclient-dev', 'mysql-server'])
@ -1548,7 +1545,7 @@ def prepare_system_local(features, check_times):
if 'native-pkg' in features: if 'native-pkg' in features:
packages.extend(['build-essential', 'fakeroot', 'devscripts']) packages.extend(['build-essential', 'fakeroot', 'devscripts'])
packages.extend(['bison', 'debhelper', 'docbook', 'flex', 'libboost-dev', 'python3-dev']) packages.extend(['bison', 'debhelper', 'flex', 'libboost-dev', 'python3-dev'])
if 20.04 <= float(revision): if 20.04 <= float(revision):
packages.extend(['dh-python']) packages.extend(['dh-python'])
@ -1623,7 +1620,7 @@ def prepare_system_local(features, check_times):
if 'native-pkg' in features: if 'native-pkg' in features:
packages.extend(['build-essential', 'fakeroot', 'devscripts']) packages.extend(['build-essential', 'fakeroot', 'devscripts'])
packages.extend(['bison', 'debhelper', 'docbook', 'flex', 'libboost-dev', 'python3-dev']) packages.extend(['bison', 'debhelper', 'flex', 'libboost-dev', 'python3-dev'])
if 'mysql' in features: if 'mysql' in features:
if revision == '8': if revision == '8':
@ -1751,7 +1748,7 @@ def prepare_system_local(features, check_times):
if 'pgsql' in features: if 'pgsql' in features:
packages.extend(['postgresql-dev', 'postgresql']) packages.extend(['postgresql-dev', 'postgresql'])
packages.extend(['bison', 'flex', 'boost-dev', 'docbook-xsl', 'python3-dev']) packages.extend(['bison', 'flex', 'boost-dev', 'python3-dev'])
if 'gssapi' in features: if 'gssapi' in features:
packages.extend(['krb5-dev']) packages.extend(['krb5-dev'])