test/hs/Test/Ganeti/Query/Language.hs \
test/hs/Test/Ganeti/Query/Query.hs \
test/hs/Test/Ganeti/Rpc.hs \
+ test/hs/Test/Ganeti/Runtime.hs \
test/hs/Test/Ganeti/Ssconf.hs \
test/hs/Test/Ganeti/THH.hs \
test/hs/Test/Ganeti/TestCommon.hs \
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) \
- $(RUN_IN_TEMPDIR) bash autotools/sphinx-wrapper $(SPHINX) -q -W -b html \
+ 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)" \
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 '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)'; \
.PHONY: hlint
hlint: $(HS_BUILT_SRCS) src/lint-hints.hs
@test -n "$(HLINT)" || { echo 'hlint' not found during configure; exit 1; }
+ @rm -f doc/hs-lint.html
if tty -s; then C="-c"; else C=""; fi; \
$(HLINT) --utf8 --report=doc/hs-lint.html --cross $$C \
--ignore "Use first" \
--ignore "Reduce duplication" \
--hint src/lint-hints \
$(filter-out $(HLINT_EXCLUDES),$(HS_LIBTEST_SRCS) $(HS_PROG_SRCS))
+ @if [ ! -f doc/hs-lint.html ]; then \
+ echo "All good" > doc/hs-lint.html; \
+ fi
# a dist hook rule for updating the vcs-version file; this is
# hardcoded due to where it needs to build the file...
$(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:
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