space := $(empty) $(empty)
comma := ,
+# Helper function to strip src/ and test/hs/ from a list
+strip_hsroot = $(patsubst src/%,%,$(patsubst test/hs/%,%,$(1)))
+
# Use bash in order to be able to use pipefail
SHELL=/bin/bash
test/hs/Test/Ganeti/HTools/Backend \
test/hs/Test/Ganeti/Query
+# Haskell directories without the roots (src, test/hs)
+HS_DIRS_NOROOT = $(filter-out src,$(filter-out test/hs,$(HS_DIRS)))
+
DIRS = \
$(HS_DIRS) \
autotools \
qa \
test \
test/data \
+ test/data/bdev-rbd \
test/data/ovfdata \
test/data/ovfdata/other \
test/py \
ALL_APIDOC_HS_DIRS = \
$(APIDOC_HS_DIR) \
- $(APIDOC_HS_DIR)/Ganeti \
- $(APIDOC_HS_DIR)/Ganeti/Block \
- $(APIDOC_HS_DIR)/Ganeti/Block/Drbd \
- $(APIDOC_HS_DIR)/Ganeti/Confd \
- $(APIDOC_HS_DIR)/Ganeti/DataCollectors \
- $(APIDOC_HS_DIR)/Ganeti/HTools \
- $(APIDOC_HS_DIR)/Ganeti/HTools/Backend \
- $(APIDOC_HS_DIR)/Ganeti/HTools/Program \
- $(APIDOC_HS_DIR)/Ganeti/Query
+ $(patsubst %,$(APIDOC_HS_DIR)/%,$(call strip_hsroot,$(HS_DIRS_NOROOT)))
BUILDTIME_DIR_AUTOCREATE = \
scripts \
$(man_MANS) \
$(manhtml) \
tools/kvm-ifup \
+ tools/users-setup \
tools/vcluster-setup \
stamp-directories \
stamp-srclinks \
doc/examples/ganeti-kvm-poweroff.initd \
doc/examples/ganeti.cron \
doc/examples/ganeti.initd \
+ doc/examples/ganeti.logrotate \
doc/examples/ganeti-master-role.ocf \
doc/examples/ganeti-node-role.ocf \
doc/examples/gnt-config-backup \
lib/constants.py \
lib/daemon.py \
lib/errors.py \
+ lib/hooksmaster.py \
lib/ht.py \
lib/jqueue.py \
lib/jstore.py \
lib/mcpu.py \
lib/netutils.py \
lib/objects.py \
- lib/objectutils.py \
lib/opcodes.py \
+ lib/outils.py \
lib/ovf.py \
lib/pathutils.py \
lib/qlang.py \
doc/design-partitioned.rst \
doc/design-query-splitting.rst \
doc/design-query2.rst \
- doc/design-remote-commands.rst \
doc/design-resource-model.rst \
+ doc/design-restricted-commands.rst \
doc/design-shared-storage.rst \
doc/design-monitoring-agent.rst \
doc/design-virtual-clusters.rst \
HS_BIN_PROGS=src/htools
# Haskell programs to be installed in the MYEXECLIB dir
+if ENABLE_MONITORING
HS_MYEXECLIB_PROGS=src/mon-collector
+else
+HS_MYEXECLIB_PROGS=
+endif
# Haskell programs to compiled but not installed automatically
# Usually they have their own specific installation rules
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 \
src/Ganeti/Version.hs
HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
+HS_LIBTESTBUILT_SRCS = $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS)
+
$(RUN_IN_TEMPDIR): | stamp-directories
doc/html/index.html: ENABLE_MANPAGES =
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)" \
done
endif
-$(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile
+$(HS_ALL_PROGS): %: %.hs $(HS_LIBTESTBUILT_SRCS) Makefile
@if [ "$(notdir $@)" = "test" ] && [ "$(HS_NODEV)" ]; then \
echo "Error: cannot run unittests without the development" \
" libraries (see devnotes.rst)" 1>&2; \
dist_tools_SCRIPTS = \
$(python_scripts) \
+ tools/burnin \
tools/kvm-console-wrapper \
tools/master-ip-setup \
tools/xen-console-wrapper
nodist_tools_SCRIPTS = \
$(nodist_tools_python_scripts) \
+ tools/users-setup \
tools/vcluster-setup
pkglib_python_scripts = \
tools/check-cert-expired
nodist_pkglib_python_scripts = \
- tools/burnin \
tools/ensure-dirs \
tools/node-daemon-setup \
tools/prepare-node-join
devel/upload \
devel/webserver \
tools/kvm-ifup.in \
+ tools/users-setup.in \
tools/vcluster-setup.in \
$(docinput) \
doc/html \
test/data/htools/common-suffix.data \
test/data/htools/empty-cluster.data \
test/data/htools/hail-alloc-drbd.json \
+ test/data/htools/hail-alloc-invalid-twodisks.json \
+ test/data/htools/hail-alloc-twodisks.json \
test/data/htools/hail-change-group.json \
test/data/htools/hail-invalid-reloc.json \
test/data/htools/hail-node-evac.json \
test/data/htools/hail-reloc-drbd.json \
test/data/htools/hbal-excl-tags.data \
test/data/htools/hbal-split-insts.data \
+ test/data/htools/hspace-tiered-ipolicy.data \
test/data/htools/invalid-node.data \
test/data/htools/missing-resources.data \
test/data/htools/n1-failure.data \
test/data/bdev-drbd-disk.txt \
test/data/bdev-drbd-net-ip4.txt \
test/data/bdev-drbd-net-ip6.txt \
+ test/data/bdev-rbd/json_output_empty.txt \
+ test/data/bdev-rbd/json_output_extra_matches.txt \
+ test/data/bdev-rbd/json_output_no_matches.txt \
+ test/data/bdev-rbd/json_output_ok.txt \
+ test/data/bdev-rbd/plain_output_new_extra_matches.txt \
+ test/data/bdev-rbd/plain_output_new_no_matches.txt \
+ test/data/bdev-rbd/plain_output_new_ok.txt \
+ test/data/bdev-rbd/plain_output_old_empty.txt \
+ test/data/bdev-rbd/plain_output_old_extra_matches.txt \
+ test/data/bdev-rbd/plain_output_old_no_matches.txt \
+ test/data/bdev-rbd/plain_output_old_ok.txt \
+ test/data/bdev-rbd/output_invalid.txt \
test/data/cert1.pem \
test/data/cert2.pem \
test/data/instance-minor-pairing.txt \
test/py/ganeti.mcpu_unittest.py \
test/py/ganeti.netutils_unittest.py \
test/py/ganeti.objects_unittest.py \
- test/py/ganeti.objectutils_unittest.py \
test/py/ganeti.opcodes_unittest.py \
+ test/py/ganeti.outils_unittest.py \
test/py/ganeti.ovf_unittest.py \
test/py/ganeti.qlang_unittest.py \
test/py/ganeti.query_unittest.py \
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
+tools/users-setup: tools/users-setup.in $(REPLACE_VARS_SED)
+ sed -f $(REPLACE_VARS_SED) < $< > $@
+ chmod +x $@
+
tools/vcluster-setup: tools/vcluster-setup.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.rst
@test -n "$(PANDOC)" || \
{ echo 'pandoc' not found during configure; exit 1; }
- set -o pipefail ; \
+ set -o pipefail -e; \
trap 'echo auto-removing $@; rm $@' EXIT; \
$(PANDOC) -s -f rst -t man $< man/footer.rst | \
sed -e 's/\\@/@/g' > $@; \
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)'; \
$(CHECK_PYTHON_CODE) $(check_python_code)
PYTHONPATH=. $(CHECK_HEADER) $(check_python_code)
$(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
- $(CHECK_NEWS) < $(top_srcdir)/NEWS
+ RELEASE=$(PACKAGE_VERSION) $(CHECK_NEWS) < $(top_srcdir)/NEWS
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
@expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
error= ; \
.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 empty files or directories in final archive." 1>&2; \
exit 1; \
fi
- if test -n "$(BUILD_RELEASE)" && \
- grep -n -H -E '^\*.*unreleased' $(top_distdir)/NEWS; then \
- echo "Found unreleased version in NEWS." >&2; \
- exit 1; \
+ 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
+# Backwards compatible distcheck-release target
distcheck-release: distcheck
distrebuildcheck: dist
--output $(CURDIR)/$(APIDOC_PY_DIR)
.PHONY: hs-apidoc
-hs-apidoc: $(HS_BUILT_SRCS)
+hs-apidoc: $(APIDOC_HS_DIR)/index.html
+
+$(APIDOC_HS_DIR)/index.html: $(HS_LIBTESTBUILT_SRCS) Makefile
@test -n "$(HSCOLOUR)" || \
{ echo 'HsColour' not found during configure; exit 1; }
@test -n "$(HADDOCK)" || \
rm -rf $(APIDOC_HS_DIR)/*
for i in $(ALL_APIDOC_HS_DIRS); do \
@mkdir_p@ $$i; \
+ $(HSCOLOUR) -print-css > $$i/hscolour.css; \
done
- $(HSCOLOUR) -print-css > $(APIDOC_HS_DIR)/Ganeti/hscolour.css
- $(LN_S) ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/HTools/hscolour.css
- $(LN_S) ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/Confd/hscolour.css
set -e ; \
- cd src; \
+ export LC_ALL=en_US.UTF-8; \
+ OPTGHC="--optghc=-isrc --optghc=-itest/hs"; \
if [ "$(HS_NOCURL)" ]; \
- then OPTGHC="--optghc=$(HS_NOCURL)"; \
- else OPTGHC=""; \
+ then OPTGHC="$$OPTGHC --optghc=$(HS_NOCURL)"; \
fi; \
if [ "$(HS_PARALLEL3)" ]; \
then OPTGHC="$$OPTGHC --optghc=$(HS_PARALLEL3)"; \
if [ "$(HS_REGEX_PCRE)" ]; \
then OPTGHC="$$OPTGHC --optghc=$(HS_REGEX_PCRE)"; \
fi; \
- RELSRCS="$(HS_LIB_SRCS:src/%=%) $(patsubst src/%,%,$(filter src/%,$(HS_BUILT_SRCS)))"; \
- for file in $$RELSRCS; do \
- hfile=`echo $$file|sed 's/\\.hs$$//'`.html; \
- $(HSCOLOUR) -css -anchor $$file > ../$(APIDOC_HS_DIR)/$$hfile ; \
+ for file in $(HS_LIBTESTBUILT_SRCS); do \
+ f_nosrc=$${file##src/}; \
+ f_notst=$${f_nosrc##test/hs/}; \
+ f_html=$${f_notst%%.hs}.html; \
+ $(HSCOLOUR) -css -anchor $$file > $(APIDOC_HS_DIR)/$$f_html ; \
done ; \
- $(HADDOCK) --odir ../$(APIDOC_HS_DIR) --html --ignore-all-exports -w \
- -t ganeti -p haddock-prologue \
+ $(HADDOCK) --odir $(APIDOC_HS_DIR) --html --ignore-all-exports -w \
+ -t ganeti -p src/haddock-prologue \
--source-module="%{MODULE/.//}.html" \
--source-entity="%{MODULE/.//}.html#%{NAME}" \
$$OPTGHC \
- $(filter-out Ganeti/HTools/ExtLoader.hs,$(HS_LIB_SRCS:src/%=%))
+ $(HS_LIBTESTBUILT_SRCS)
.PHONY: TAGS
TAGS: $(GENERATED_FILES)