CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
CHECK_HEADER = $(top_srcdir)/autotools/check-header
CHECK_MAN_DASHES = $(top_srcdir)/autotools/check-man-dashes
+CHECK_MAN_REFERENCES = $(top_srcdir)/autotools/check-man-references
CHECK_MAN_WARNINGS = $(top_srcdir)/autotools/check-man-warnings
CHECK_VERSION = $(top_srcdir)/autotools/check-version
CHECK_NEWS = $(top_srcdir)/autotools/check-news
daemons \
devel \
doc \
+ doc/css \
doc/examples \
doc/examples/gnt-debug \
doc/examples/hooks \
BUILDTIME_DIRS = \
$(BUILDTIME_DIR_AUTOCREATE) \
- doc/html
+ doc/html \
+ doc/man-html
DIRCHECK_EXCLUDE = \
$(BUILDTIME_DIRS) \
ganeti-[0-9]*.[0-9]*.[0-9]* \
doc/html/_* \
+ doc/man-html/_* \
autom4te.cache
# some helper vars
$(SHELL_ENV_INIT) \
daemons/daemon-util \
daemons/ganeti-cleaner \
+ $(mandocrst) \
+ doc/manpages-enabled.rst \
$(BUILT_EXAMPLES) \
doc/examples/bash_completion \
doc/examples/bash_completion-debug \
pytools_PYTHON = \
lib/tools/__init__.py \
+ lib/tools/burnin.py \
lib/tools/ensure_dirs.py \
lib/tools/node_cleanup.py \
lib/tools/node_daemon_setup.py \
lib/utils/wrapper.py \
lib/utils/x509.py
-docrst = \
+docinput = \
+ doc/conf.py \
+ doc/css/style.css \
doc/admin.rst \
doc/cluster-merge.rst \
doc/design-2.0.rst \
doc/install-quick.rst \
doc/install.rst \
doc/locking.rst \
+ doc/manpages-disabled.rst \
doc/move-instance.rst \
doc/news.rst \
doc/ovfconverter.rst \
doc/virtual-cluster.rst \
doc/walkthrough.rst
+# Generates file names such as "doc/man-gnt-instance.rst"
+mandocrst = $(addprefix doc/man-,$(notdir $(manrst)))
+
# Haskell programs to be installed in $PREFIX/bin
HS_BIN_PROGS=src/htools
$(RUN_IN_TEMPDIR): | stamp-directories
+doc/html/index.html: ENABLE_MANPAGES =
+doc/man-html/index.html: ENABLE_MANPAGES = 1
+doc/man-html/index.html: doc/manpages-enabled.rst $(mandocrst)
+
# Note: we use here an order-only prerequisite, as the contents of
# _autoconf.py are not actually influencing the html build output: it
# has to exist in order for the sphinx module to be loaded
# successfully, but we certainly don't want the docs to be rebuilt if
# it changes
-doc/html/index.html: $(docrst) doc/conf.py configure.ac \
- $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \
+doc/html/index.html doc/man-html/index.html: $(docinput) doc/conf.py \
+ configure.ac $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \
lib/build/shell_example_lexer.py lib/opcodes.py lib/ht.py \
+ doc/css/style.css \
| $(BUILT_PYTHON_SOURCES)
@test -n "$(SPHINX)" || \
{ echo 'sphinx-build' not found during configure; exit 1; }
- @mkdir_p@ $(dir $@)
- PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -W -b html \
+if !MANPAGES_IN_DOC
+ if test -n '$(ENABLE_MANPAGES)'; then \
+ echo 'Man pages in documentation were disabled at configure time' >&2; \
+ exit 1; \
+ fi
+endif
+ dir=$(dir $@) && \
+ @mkdir_p@ $$dir && \
+ PYTHONPATH=. ENABLE_MANPAGES=$(ENABLE_MANPAGES) \
+ $(RUN_IN_TEMPDIR) bash autotools/sphinx-wrapper $(SPHINX) -q -W -b html \
-d . \
-D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
-D release="$(PACKAGE_VERSION)" \
-D graphviz_dot="$(DOT)" \
- $(abs_top_srcdir)/doc $(CURDIR)/doc/html
- rm -f doc/html/.buildinfo doc/html/objects.inv
+ -D enable_manpages="$(ENABLE_MANPAGES)" \
+ doc $(CURDIR)/$$dir && \
+ rm -f $$dir/.buildinfo $$dir/objects.inv
touch $@
doc/html: doc/html/index.html
+doc/man-html: doc/man-html/index.html
+
doc/install-quick.rst: INSTALL
doc/news.rst: NEWS
doc/upgrade.rst: UPGRADE
cat $<; \
} > $@
+doc/manpages-enabled.rst: Makefile | $(built_base_sources)
+ { echo '.. This file is automatically generated, do not edit!'; \
+ echo ''; \
+ echo 'Man pages'; \
+ echo '========='; \
+ echo; \
+ echo '.. toctree::'; \
+ echo ' :maxdepth: 1'; \
+ echo; \
+ for i in $(notdir $(mandocrst)); do \
+ echo " $$i"; \
+ done | LC_ALL=C sort; \
+ } > $@
+
+doc/man-%.rst: man/%.gen Makefile $(REPLACE_VARS_SED) | $(built_base_sources)
+if MANPAGES_IN_DOC
+ { echo '.. This file is automatically updated at build time from $<.'; \
+ echo '.. Do not edit.'; \
+ echo; \
+ echo "$*"; \
+ echo '=========================================='; \
+ tail -n +3 $< | sed -f $(REPLACE_VARS_SED); \
+ } > $@
+else
+ echo 'Man pages in documentation were disabled at configure time' >&2; \
+ exit 1;
+endif
+
# Things to build but not to install (add it to EXTRA_DIST if it should be
# distributed)
noinst_DATA = \
doc/examples/bash_completion-debug \
$(manhtml)
+if MANPAGES_IN_DOC
+noinst_DATA += doc/man-html
+endif
+
gnt_scripts = \
scripts/gnt-backup \
scripts/gnt-cluster \
PYTHON_BOOTSTRAP = \
$(PYTHON_BOOTSTRAP_SBIN) \
+ tools/burnin \
tools/ensure-dirs \
tools/node-cleanup \
tools/node-daemon-setup \
endif
python_scripts = \
- tools/burnin \
tools/cfgshell \
tools/cfgupgrade \
tools/cfgupgrade12 \
tools/check-cert-expired
nodist_pkglib_python_scripts = \
+ tools/burnin \
tools/ensure-dirs \
tools/node-daemon-setup \
tools/prepare-node-join
autotools/check-header \
autotools/check-imports \
autotools/check-man-dashes \
+ autotools/check-man-references \
autotools/check-man-warnings \
autotools/check-news \
autotools/check-python-code \
autotools/convert-constants \
autotools/docpp \
autotools/gen-py-coverage \
+ autotools/sphinx-wrapper \
autotools/testrunner \
autotools/wrong-hardcoded-paths \
$(RUN_IN_TEMPDIR) \
devel/webserver \
tools/kvm-ifup.in \
tools/vcluster-setup.in \
- $(docrst) \
- doc/conf.py \
+ $(docinput) \
doc/html \
$(BUILT_EXAMPLES:%=%.in) \
doc/examples/ganeti.default \
man/htools.1 \
man/mon-collector.7
-manrst = $(patsubst %.1,%.rst,$(patsubst %.7,%.rst,$(patsubst %.8,%.rst,$(man_MANS))))
+# Remove extensions from all filenames in man_MANS
+mannoext = $(patsubst %.1,%,$(patsubst %.7,%,$(patsubst %.8,%,$(man_MANS))))
+
+manrst = $(patsubst %,%.rst,$(mannoext))
manhtml = $(patsubst %.rst,%.html,$(manrst))
mangen = $(patsubst %.rst,%.gen,$(manrst))
maninput = \
test/data/bdev-drbd-net-ip6.txt \
test/data/cert1.pem \
test/data/cert2.pem \
+ test/data/instance-minor-pairing.txt \
test/data/ip-addr-show-dummy0.txt \
test/data/ip-addr-show-lo-ipv4.txt \
test/data/ip-addr-show-lo-ipv6.txt \
test/data/kvm_0.12.5_help.txt \
test/data/kvm_0.15.90_help.txt \
test/data/kvm_0.9.1_help.txt \
+ test/data/kvm_0.9.1_help_boot_test.txt \
test/data/kvm_1.0_help.txt \
+ test/data/kvm_1.1.2_help.txt \
test/data/ovfdata/compr_disk.vmdk.gz \
test/data/ovfdata/config.ini \
test/data/ovfdata/corrupted_resources.ovf \
test/py/ganeti.utils.io_unittest-runasroot.py \
test/py/ganeti.utils.io_unittest.py \
test/py/ganeti.utils.log_unittest.py \
+ test/py/ganeti.utils.lvm_unittest.py \
test/py/ganeti.utils.mlock_unittest.py \
test/py/ganeti.utils.nodesetup_unittest.py \
test/py/ganeti.utils.process_unittest.py \
test/hs/offline-test.sh \
test/hs/cli-tests-defs.sh \
$(all_python_code) \
- $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS)
+ $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS) \
+ $(docinput)
check_python_code = \
$(BUILD_BASH_COMPLETION) \
| $(RUN_IN_TEMPDIR) $(BUILT_PYTHON_SOURCES)
@echo "Checking $< for hardcoded paths..."
@if grep -nEf autotools/wrong-hardcoded-paths $<; then \
- echo "Man page $< has harcoded paths (see above)!" 1>&2 ; \
+ echo "Man page $< has hardcoded paths (see above)!" 1>&2 ; \
exit 1; \
fi
set -e ; \
trap 'echo auto-removing $@; rm $@' EXIT; \
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@ ;\
+ $(CHECK_MAN_REFERENCES) $@; \
trap - EXIT
man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.rst
echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \
echo "ENABLE_MONITORING = $(ENABLE_MONITORING)"; \
+## Write dictionary with man page name as the key and the section number as the
+## value
+ echo "MAN_PAGES = {"; \
+ for i in $(notdir $(man_MANS)); do \
+ echo "$$i" | sed -re 's/^(.*)\.([0-9]+)$$/ "\1": \2,/g'; \
+ done; \
+ echo "}"; \
} > $@
lib/_vcsversion.py: Makefile vcs-version | stamp-directories
daemons/ganeti-%: MODULE = ganeti.server.$(patsubst ganeti-%,%,$(notdir $@))
daemons/ganeti-watcher: MODULE = ganeti.watcher
scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
+tools/burnin: MODULE = ganeti.tools.burnin
tools/ensure-dirs: MODULE = ganeti.tools.ensure_dirs
tools/node-daemon-setup: MODULE = ganeti.tools.node_daemon_setup
tools/prepare-node-join: MODULE = ganeti.tools.prepare_node_join
$(MAKE) $(AM_MAKEFLAGS) regen-vcs-version
rm -f $(top_distdir)/vcs-version
cp -p $(srcdir)/vcs-version $(top_distdir)
+if MANPAGES_IN_DOC
+ echo 'Building distribution with man pages included in documentation is' \
+ 'not allowed as they can contain fixed paths' >&2; \
+ exit 1
+endif
# a distcheck hook rule for catching revision control directories
distcheck-hook: