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 \
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
src/Ganeti/DataCollectors/CLI.hs \
src/Ganeti/DataCollectors/Drbd.hs \
src/Ganeti/DataCollectors/Program.hs \
+ src/Ganeti/DataCollectors/Types.hs \
src/Ganeti/Errors.hs \
src/Ganeti/HTools/Backend/IAlloc.hs \
src/Ganeti/HTools/Backend/Luxi.hs \
src/Ganeti/Query/Group.hs \
src/Ganeti/Query/Job.hs \
src/Ganeti/Query/Language.hs \
+ src/Ganeti/Query/Network.hs \
src/Ganeti/Query/Node.hs \
src/Ganeti/Query/Query.hs \
src/Ganeti/Query/Server.hs \
$(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: $(docinput) 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
+## Sphinx provides little control over what content should be included. Some
+## mechanisms exist, but they all have drawbacks or actual issues. Since we
+## build two different versions of the documentation--once without man pages and
+## once, if enabled, with them--some control is necessary. xmpp-wrapper provides
+## us with this, but requires running in a temporary directory. It moves the
+## correct files into place depending on environment variables.
+ dir=$(dir $@) && \
+ @mkdir_p@ $$dir && \
+ PYTHONPATH=. ENABLE_MANPAGES=$(ENABLE_MANPAGES) COPY_DOC=1 \
+ $(RUN_IN_TEMPDIR) 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_builddir)/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/convert-constants \
autotools/docpp \
autotools/gen-py-coverage \
+ autotools/sphinx-wrapper \
autotools/testrunner \
autotools/wrong-hardcoded-paths \
$(RUN_IN_TEMPDIR) \
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/vgreduce-removemissing-2.02.66-ok.txt \
test/data/vgs-missing-pvs-2.02.02.txt \
test/data/vgs-missing-pvs-2.02.66.txt \
+ test/data/xen-xm-info-4.0.1.txt \
+ test/data/xen-xm-list-4.0.1-dom0-only.txt \
+ test/data/xen-xm-list-4.0.1-four-instances.txt \
test/py/ganeti-cli.test \
test/py/gnt-cli.test \
test/py/import-export_unittest-helper
test/py/ganeti.ssconf_unittest.py \
test/py/ganeti.ssh_unittest.py \
test/py/ganeti.storage_unittest.py \
+ test/py/ganeti.tools.burnin_unittest.py \
test/py/ganeti.tools.ensure_dirs_unittest.py \
test/py/ganeti.tools.node_daemon_setup_unittest.py \
test/py/ganeti.tools.prepare_node_join_unittest.py \
echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
echo "ES_SEARCH_PATH = [$(ES_SEARCH_PATH)]"; \
echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
+ echo "XEN_CONFIG_DIR = '$(XEN_CONFIG_DIR)'"; \
echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
echo "XEN_INITRD = '$(XEN_INITRD)'"; \
echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \
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
echo 'readonly CONF_DIR="$$SYSCONFDIR/ganeti"'; \
} > $@
+## Writes sed script to replace placeholders with build-time values. The
+## additional quotes after the first @ sign are necessary to stop configure
+## from replacing those values as well.
$(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
set -e; \
- { echo 's#@PREFIX@#$(prefix)#g'; \
- echo 's#@SYSCONFDIR@#$(sysconfdir)#g'; \
- echo 's#@LOCALSTATEDIR@#$(localstatedir)#g'; \
- echo 's#@BINDIR@#$(bindir)#g'; \
- echo 's#@SBINDIR@#$(sbindir)#g'; \
- echo 's#@LIBDIR@#$(libdir)#g'; \
- echo 's#@GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
- echo 's#@CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
- echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
- echo 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
- echo 's#@CUSTOM_IALLOCATOR_SEARCH_PATH@#$(IALLOCATOR_SEARCH_PATH)#g'; \
- echo 's#@CUSTOM_EXPORT_DIR@#$(EXPORT_DIR)#g'; \
- echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
- echo 's#@RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \
- echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \
- echo 's#@GNTMASTERUSER@#$(MASTERD_USER)#g'; \
- echo 's#@GNTRAPIUSER@#$(RAPI_USER)#g'; \
- echo 's#@GNTCONFDUSER@#$(CONFD_USER)#g'; \
- echo 's#@GNTNODEDUSER@#$(NODED_USER)#g'; \
- echo 's#@GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
- echo 's#@GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
- echo 's#@GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
- echo 's#@GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
- echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
- echo 's#@CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
- echo 's#@MODULES@#$(strip $(lint_python_code))#g'; \
- echo 's#@ENABLE_SPLIT_QUERY@#$(ENABLE_SPLIT_QUERY)#g'; \
+ { echo 's#@''PREFIX@#$(prefix)#g'; \
+ echo 's#@''SYSCONFDIR@#$(sysconfdir)#g'; \
+ echo 's#@''LOCALSTATEDIR@#$(localstatedir)#g'; \
+ echo 's#@''BINDIR@#$(bindir)#g'; \
+ echo 's#@''SBINDIR@#$(sbindir)#g'; \
+ echo 's#@''LIBDIR@#$(libdir)#g'; \
+ echo 's#@''GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
+ echo 's#@''CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
+ echo 's#@''CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
+ echo 's#@''CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
+ echo 's#@''CUSTOM_IALLOCATOR_SEARCH_PATH@#$(IALLOCATOR_SEARCH_PATH)#g'; \
+ echo 's#@''CUSTOM_EXPORT_DIR@#$(EXPORT_DIR)#g'; \
+ echo 's#@''RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
+ echo 's#@''RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \
+ echo 's#@''PKGLIBDIR@#$(pkglibdir)#g'; \
+ echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
+ echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \
+ echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \
+ echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \
+ echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
+ echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
+ echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
+ echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
+ echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
+ echo 's#@''CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
+ echo 's#@''MODULES@#$(strip $(lint_python_code))#g'; \
+ echo 's#@''XEN_CONFIG_DIR@#$(XEN_CONFIG_DIR)#g'; \
echo; \
echo '/^@SHELL_ENV_INIT@$$/ {'; \
echo ' r $(SHELL_ENV_INIT)'; \
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
echo "Found unreleased version in NEWS." >&2; \
exit 1; \
fi
+ if test -e $(top_distdir)/doc/man-html; then \
+ echo "Found documentation including man pages in final archive" >&2; \
+ exit 1; \
+ fi
# When building a release, stricter checks should be used
distcheck-release dist-release: export BUILD_RELEASE = 1