Commit b4221e25 authored by Ondřej Surý's avatar Ondřej Surý

Merge branch 'ondrej/disable-maintainer-mode-in-ci' into 'main'

Disable rebuilding miscellaneous documentation source files when not in maintainer mode

See merge request isc-projects/bind9!3733
parents c9c84af3 7ff77bb6
......@@ -484,9 +484,6 @@ docs:
- test -n "${OOT_BUILD_WORKSPACE}" && mkdir "${OOT_BUILD_WORKSPACE}" && cd "${OOT_BUILD_WORKSPACE}"
script:
- *configure
- make -j${BUILD_PARALLEL_JOBS:-1} -k maintainer-clean V=1
- *configure
- make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1
- make -j${BUILD_PARALLEL_JOBS:-1} -k doc V=1
needs:
- job: autoreconf
......
......@@ -64,9 +64,9 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
#
# Enable maintainer mode by default, but allow to disable it in the CI
# Enable maintainer mode by default only when building from git repository
#
AM_MAINTAINER_MODE([enable])
AM_MAINTAINER_MODE([m4_ifset([bind_SRCID],[enable],[disable])])
# Set the library versions
# https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
......
......@@ -120,12 +120,8 @@ EXTRA_DIST = \
$(MANPAGES_RST) \
$(MANPAGES_IN)
MAINTAINERCLEANFILES = \
$(MANPAGES_IN)
CLEANFILES = \
$(man_MANS) \
manpages.stamp
$(man_MANS)
#
# Build rules for pre-generated manpages
......@@ -152,6 +148,14 @@ man: Makefile $(man_MANS)
clean-local::
-rm -rf $(SPHINXBUILDDIR)
if MAINTAINER_MODE
CLEANFILES += \
manpages.stamp
MAINTAINERCLEANFILES = \
$(MANPAGES_IN)
#
# Build rules for generating pre-generated manpages
#
......@@ -196,5 +200,4 @@ $(MANPAGES_IN): manpages.stamp
fi
endif HAVE_SPHINX_BUILD
maintainerclean-local:
-$(RM)
endif MAINTAINER_MODE
......@@ -437,6 +437,15 @@ which disables padding. The maximum is 512. Values are ordinarily
expected to be powers of two, such as 128; however, this is not
mandatory. Responses to padded queries may also be padded, but only
if the query uses TCP or DNS COOKIE.
.UNINDENT
.sp
\fB+qid=value\fP
.INDENT 0.0
.INDENT 3.5
Specify the query ID to use when sending queries.
.UNINDENT
.UNINDENT
.INDENT 0.0
.TP
.B \fB+[no]qr\fP
Toggles the display of the query message as it is sent. By default, the query
......
......@@ -86,6 +86,9 @@ valid domain name. The default is \fBrndc\-key\fP\&.
Specifies the command channel port where \fBnamed\fP listens for
connections from \fBrndc\fP\&. The default is 953.
.TP
\fB\-q\fP
Omits printing written path in automatic configuration mode.
.TP
\fB\-s\fP address
Specifies the IP address where \fBnamed\fP listens for command channel
connections from \fBrndc\fP\&. The default is the loopback address
......
include $(top_srcdir)/Makefile.top
include $(top_srcdir)/Makefile.docs
noinst_PROGRAMS = cfg_test
cfg_test_CFLAGS = \
$(AM_CFLAGS) \
$(LIBISC_CFLAGS) \
$(LIBDNS_CFLAGS) \
$(LIBISCCFG_CFLAGS)
cfg_test_LDADD = \
$(LIBISC_LIBS) \
$(LIBDNS_LIBS) \
$(LIBISCCFG_LIBS)
BUILT_SOURCES = \
OPTIONS_FILES = \
options \
options.active \
master.zoneopt \
......@@ -51,15 +38,33 @@ BUILT_SOURCES = \
managed-keys.grammar.rst \
trusted-keys.grammar.rst
EXTRA_DIST = \
$(BUILT_SOURCES) \
EXTRA_DIST = \
$(OPTIONS_FILES) \
format-options.pl \
rst-grammars.pl \
rst-options.pl \
rst-zoneopt.pl \
sort-options.pl
MAINTAINERCLEANFILES = $(BUILT_SOURCES)
if MAINTAINER_MODE
MAINTAINERCLEANFILES = $(OPTIONS_FILES)
noinst_PROGRAMS = cfg_test
cfg_test_CFLAGS = \
$(AM_CFLAGS) \
$(LIBISC_CFLAGS) \
$(LIBDNS_CFLAGS) \
$(LIBISCCFG_CFLAGS)
cfg_test_LDADD = \
$(LIBISC_LIBS) \
$(LIBDNS_LIBS) \
$(LIBISCCFG_LIBS)
BUILT_SOURCES = \
$(OPTIONS_FILES)
options: cfg_test
$(AM_V_CFG_TEST)$(builddir)/cfg_test --named --grammar | $(PERL) $(srcdir)/sort-options.pl | $(PERL) $(srcdir)/format-options.pl --strip-not-configured > $@
......@@ -165,3 +170,5 @@ managed-keys.grammar.rst: options.active
trusted-keys.grammar.rst: options.active
$(AM_V_RST_GRAMMARS)$(PERL) $(srcdir)/rst-grammars.pl options.active trusted-keys > $@
endif
......@@ -152,8 +152,8 @@ options {
dns64-contact <string>;
dns64-server <string>;
dnskey-sig-validity <integer>;
dnsrps-enable <boolean>; // not configured
dnsrps-options { <unspecified-text> }; // not configured
dnsrps-enable <boolean>;
dnsrps-options { <unspecified-text> };
dnssec-accept-expired <boolean>;
dnssec-dnskey-kskonly <boolean>;
dnssec-enable <boolean>; // obsolete
......@@ -533,8 +533,8 @@ view <string> [ <class> ] {
dns64-contact <string>;
dns64-server <string>;
dnskey-sig-validity <integer>;
dnsrps-enable <boolean>; // not configured
dnsrps-options { <unspecified-text> }; // not configured
dnsrps-enable <boolean>;
dnsrps-options { <unspecified-text> };
dnssec-accept-expired <boolean>;
dnssec-dnskey-kskonly <boolean>;
dnssec-enable <boolean>; // obsolete
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment