abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+# Use bash in order to be able to use pipefail
+SHELL=/bin/bash
+
ACLOCAL_AMFLAGS = -I autotools
-DOCBOOK_WRAPPER = $(top_srcdir)/autotools/docbook-wrapper
BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion
RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
CHECK_MAN = $(top_srcdir)/autotools/check-man
CHECK_VERSION = $(top_srcdir)/autotools/check-version
+CHECK_NEWS = $(top_srcdir)/autotools/check-news
+DOCPP = $(top_srcdir)/autotools/docpp
REPLACE_VARS_SED = autotools/replace_vars.sed
+CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants
+# Note: these are automake-specific variables, and must be named after
+# the directory + 'dir' suffix
+clientdir = $(pkgpythondir)/client
hypervisordir = $(pkgpythondir)/hypervisor
httpdir = $(pkgpythondir)/http
masterddir = $(pkgpythondir)/masterd
confddir = $(pkgpythondir)/confd
rapidir = $(pkgpythondir)/rapi
+serverdir = $(pkgpythondir)/server
+watcherdir = $(pkgpythondir)/watcher
impexpddir = $(pkgpythondir)/impexpd
+utilsdir = $(pkgpythondir)/utils
toolsdir = $(pkglibdir)/tools
+iallocatorsdir = $(pkglibdir)/iallocators
+pytoolsdir = $(pkgpythondir)/tools
docdir = $(datadir)/doc/$(PACKAGE)
# Delete output file if an error occurred while building it
.DELETE_ON_ERROR:
+HTOOLS_DIRS = \
+ htools \
+ htools/Ganeti \
+ htools/Ganeti/HTools
+
DIRS = \
autotools \
daemons \
doc/examples \
doc/examples/hooks \
doc/examples/gnt-debug \
+ $(HTOOLS_DIRS) \
lib \
+ lib/client \
lib/build \
lib/confd \
lib/http \
lib/impexpd \
lib/masterd \
lib/rapi \
+ lib/server \
+ lib/tools \
+ lib/utils \
+ lib/watcher \
man \
qa \
- scripts \
test \
test/data \
tools
+BUILDTIME_DIR_AUTOCREATE = \
+ scripts \
+ $(APIDOC_DIR) \
+ $(APIDOC_PY_DIR) \
+ $(APIDOC_HS_DIR) \
+ $(APIDOC_HS_DIR)/Ganeti $(APIDOC_HS_DIR)/Ganeti/HTools \
+ $(COVERAGE_DIR) \
+ $(COVERAGE_PY_DIR) \
+ $(COVERAGE_HS_DIR) \
+ .hpc
+
BUILDTIME_DIRS = \
- doc/api \
- doc/coverage \
+ $(BUILDTIME_DIR_AUTOCREATE) \
doc/html
DIRCHECK_EXCLUDE = \
ganeti-[0-9]*.[0-9]*.[0-9]* \
doc/html/_*
+all_dirfiles = $(addsuffix /.dir,$(DIRS) $(BUILDTIME_DIR_AUTOCREATE))
+
+# some helper vars
+COVERAGE_DIR = doc/coverage
+COVERAGE_PY_DIR = $(COVERAGE_DIR)/py
+COVERAGE_HS_DIR = $(COVERAGE_DIR)/hs
+APIDOC_DIR = doc/api
+APIDOC_PY_DIR = $(APIDOC_DIR)/py
+APIDOC_HS_DIR = $(APIDOC_DIR)/hs
+
MAINTAINERCLEANFILES = \
$(docpng) \
$(maninput) \
doc/install-quick.rst \
doc/news.rst \
+ doc/upgrade.rst \
vcs-version
maintainer-clean-local:
CLEANFILES = \
$(addsuffix /*.py[co],$(DIRS)) \
+ $(addsuffix /*.hi,$(HTOOLS_DIRS)) \
+ $(addsuffix /*.o,$(HTOOLS_DIRS)) \
+ $(all_dirfiles) \
+ $(PYTHON_BOOTSTRAP) \
+ epydoc.conf \
autotools/replace_vars.sed \
daemons/daemon-util \
- daemons/ensure-dirs \
daemons/ganeti-cleaner \
devel/upload \
doc/examples/bash_completion \
doc/examples/ganeti.initd \
+ doc/examples/ganeti-kvm-poweroff.initd \
doc/examples/ganeti.cron \
doc/examples/gnt-config-backup \
doc/examples/hooks/ipsec \
$(man_MANS) \
$(manhtml) \
- stamp-directories \
+ tools/kvm-ifup \
stamp-srclinks \
- $(nodist_pkgpython_PYTHON)
+ $(nodist_pkgpython_PYTHON) \
+ $(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
+ .hpc/*.mix htools/*.tix \
+ doc/hs-lint.html
+# BUILT_SOURCES should only be used as a dependency on phony targets. Otherwise
+# it'll cause the target to rebuild every time.
BUILT_SOURCES = \
ganeti \
stamp-srclinks \
- stamp-directories \
- lib/_autoconf.py
+ lib/_autoconf.py \
+ $(all_dirfiles) \
+ $(PYTHON_BOOTSTRAP)
nodist_pkgpython_PYTHON = \
lib/_autoconf.py
noinst_PYTHON = \
- lib/build/__init__.py
+ lib/build/__init__.py \
+ lib/build/sphinx_ext.py
pkgpython_PYTHON = \
lib/__init__.py \
lib/constants.py \
lib/daemon.py \
lib/errors.py \
+ lib/ht.py \
lib/jqueue.py \
lib/jstore.py \
lib/locking.py \
lib/netutils.py \
lib/objects.py \
lib/opcodes.py \
+ lib/qlang.py \
+ lib/query.py \
lib/rpc.py \
+ lib/runtime.py \
lib/serializer.py \
lib/ssconf.py \
lib/ssh.py \
lib/storage.py \
- lib/utils.py \
lib/uidpool.py \
lib/workerpool.py
+client_PYTHON = \
+ lib/client/__init__.py \
+ lib/client/gnt_backup.py \
+ lib/client/gnt_cluster.py \
+ lib/client/gnt_debug.py \
+ lib/client/gnt_group.py \
+ lib/client/gnt_instance.py \
+ lib/client/gnt_job.py \
+ lib/client/gnt_node.py \
+ lib/client/gnt_os.py
+
hypervisor_PYTHON = \
lib/hypervisor/__init__.py \
lib/hypervisor/hv_base.py \
impexpd_PYTHON = \
lib/impexpd/__init__.py
+watcher_PYTHON = \
+ lib/watcher/__init__.py
+
+server_PYTHON = \
+ lib/server/__init__.py \
+ lib/server/confd.py \
+ lib/server/masterd.py \
+ lib/server/noded.py \
+ lib/server/rapi.py
+
+pytools_PYTHON = \
+ lib/tools/__init__.py \
+ lib/tools/ensure_dirs.py
+
+utils_PYTHON = \
+ lib/utils/__init__.py \
+ lib/utils/algo.py \
+ lib/utils/filelock.py \
+ lib/utils/hash.py \
+ lib/utils/io.py \
+ lib/utils/log.py \
+ lib/utils/mlock.py \
+ lib/utils/nodesetup.py \
+ lib/utils/process.py \
+ lib/utils/retry.py \
+ lib/utils/text.py \
+ lib/utils/wrapper.py \
+ lib/utils/x509.py
+
docrst = \
doc/admin.rst \
doc/design-2.0.rst \
doc/design-2.1.rst \
doc/design-2.2.rst \
+ doc/design-2.3.rst \
+ doc/design-htools-2.3.rst \
+ doc/design-2.4.rst \
+ doc/design-draft.rst \
+ doc/design-oob.rst \
+ doc/design-cpu-pinning.rst \
+ doc/design-query2.rst \
+ doc/design-x509-ca.rst \
+ doc/design-http-server.rst \
+ doc/design-impexp2.rst \
+ doc/design-lu-generated-jobs.rst \
+ doc/design-multi-reloc.rst \
+ doc/design-network.rst \
doc/cluster-merge.rst \
+ doc/design-shared-storage.rst \
doc/devnotes.rst \
doc/glossary.rst \
doc/hooks.rst \
doc/news.rst \
doc/rapi.rst \
doc/security.rst \
+ doc/upgrade.rst \
doc/walkthrough.rst
-doc/html/.stamp: $(docrst) $(docpng) doc/conf.py configure.ac
+HS_PROGS = \
+ htools/hbal \
+ htools/hscan \
+ htools/hail \
+ htools/hspace
+
+HS_ALL_PROGS = $(HS_PROGS) htools/test
+HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
+# we don't add -Werror by default
+HFLAGS = -O -Wall -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
+# extra flags that can be overriden on the command line
+HEXTRA =
+# exclude options for coverage reports
+HPCEXCL = --exclude Main --exclude Ganeti.HTools.QC
+
+HS_LIB_SRCS = \
+ htools/Ganeti/HTools/CLI.hs \
+ htools/Ganeti/HTools/Cluster.hs \
+ htools/Ganeti/HTools/Container.hs \
+ htools/Ganeti/HTools/ExtLoader.hs \
+ htools/Ganeti/HTools/Group.hs \
+ htools/Ganeti/HTools/IAlloc.hs \
+ htools/Ganeti/HTools/Instance.hs \
+ htools/Ganeti/HTools/Loader.hs \
+ htools/Ganeti/HTools/Luxi.hs \
+ htools/Ganeti/HTools/Node.hs \
+ htools/Ganeti/HTools/PeerMap.hs \
+ htools/Ganeti/HTools/QC.hs \
+ htools/Ganeti/HTools/Rapi.hs \
+ htools/Ganeti/HTools/Simu.hs \
+ htools/Ganeti/HTools/Text.hs \
+ htools/Ganeti/HTools/Types.hs \
+ htools/Ganeti/HTools/Utils.hs \
+ htools/Ganeti/Jobs.hs \
+ htools/Ganeti/Luxi.hs \
+ htools/Ganeti/OpCodes.hs
+
+HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs htools/Ganeti/Constants.hs
+HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
+
+$(RUN_IN_TEMPDIR): | $(all_dirfiles)
+
+# 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) $(docpng) doc/conf.py configure.ac \
+ $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py lib/opcodes.py lib/ht.py \
+ | lib/_autoconf.py
@test -n "$(SPHINX)" || \
{ echo 'sphinx-build' not found during configure; exit 1; }
+ @mkdir_p@ $(dir $@)
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -W -b html \
-d . \
-D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
rm -f doc/html/.buildinfo doc/html/objects.inv
touch $@
-doc/html: doc/html/.stamp
+doc/html: doc/html/index.html
+doc/install-quick.rst: INSTALL
doc/news.rst: NEWS
- set -e; \
- { echo '.. This file is automatically updated at build time from $<.'; \
- echo '.. Do not edit.'; \
- echo; \
- cat $<; \
- } > $@
+doc/upgrade.rst: UPGRADE
-doc/install-quick.rst: INSTALL
+doc/install-quick.rst doc/news.rst doc/upgrade.rst:
set -e; \
{ echo '.. This file is automatically updated at build time from $<.'; \
echo '.. Do not edit.'; \
doc/examples/bash_completion \
doc/examples/ganeti.cron \
doc/examples/ganeti.initd \
+ doc/examples/ganeti-kvm-poweroff.initd \
doc/examples/gnt-config-backup \
doc/examples/hooks/ipsec \
$(manhtml)
scripts/gnt-backup \
scripts/gnt-cluster \
scripts/gnt-debug \
+ scripts/gnt-group \
scripts/gnt-instance \
scripts/gnt-job \
scripts/gnt-node \
scripts/gnt-os
-dist_sbin_SCRIPTS = \
+PYTHON_BOOTSTRAP_SBIN = \
+ daemons/ganeti-confd \
+ daemons/ganeti-masterd \
daemons/ganeti-noded \
daemons/ganeti-watcher \
- daemons/ganeti-masterd \
- daemons/ganeti-confd \
daemons/ganeti-rapi \
- $(gnt_scripts)
+ scripts/gnt-backup \
+ scripts/gnt-cluster \
+ scripts/gnt-debug \
+ scripts/gnt-group \
+ scripts/gnt-instance \
+ scripts/gnt-job \
+ scripts/gnt-node \
+ scripts/gnt-os
+
+PYTHON_BOOTSTRAP = \
+ $(PYTHON_BOOTSTRAP_SBIN) \
+ tools/ensure-dirs
+
+qa_scripts = \
+ qa/ganeti-qa.py \
+ qa/qa_cluster.py \
+ qa/qa_config.py \
+ qa/qa_daemon.py \
+ qa/qa_env.py \
+ qa/qa_error.py \
+ qa/qa_instance.py \
+ qa/qa_node.py \
+ qa/qa_os.py \
+ qa/qa_rapi.py \
+ qa/qa_tags.py \
+ qa/qa_utils.py
+
+bin_SCRIPTS =
+iallocators_SCRIPTS =
+if WANT_HTOOLS
+bin_SCRIPTS += $(filter-out htools/hail,$(HS_PROGS))
+iallocators_SCRIPTS += $(filter htools/hail,$(HS_PROGS))
+endif
+
+$(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile
+ @if [ -z "$(HTOOLS)" ]; then \
+ echo "Error: htools compilation disabled at configure time" 1>&2 ;\
+ exit 1; \
+ fi
+ @BINARY=$(@:htools/%=%); \
+ if [ "$BINARY" = "test" ] && [ -z "$(GHC_PKG_QUICKCHECK)" ]; then \
+ echo "Error: cannot run unittests without the QuickCheck library (see devnotes.rst)" 1>&2; \
+ exit 1; \
+ fi
+ BINARY=$(@:htools/%=%); $(GHC) --make \
+ $(HFLAGS) $(HEXTRA) $(HTOOLS_NOCURL) \
+ -osuf $$BINARY.o -hisuf $$BINARY.hi $@
+
+# for the htools/test binary, we need to enable profiling/coverage
+htools/test: HEXTRA=-fhpc -Wwarn -fno-warn-missing-signatures \
+ -fno-warn-monomorphism-restriction -fno-warn-orphans \
+ -fno-warn-missing-methods -fno-warn-unused-imports
+
+dist_sbin_SCRIPTS = \
+ tools/ganeti-listrunner
nodist_sbin_SCRIPTS = \
+ $(PYTHON_BOOTSTRAP_SBIN) \
daemons/ganeti-cleaner
dist_tools_SCRIPTS = \
daemons/import-export \
tools/check-cert-expired
+nodist_pkglib_python_scripts = \
+ tools/ensure-dirs
+
pkglib_SCRIPTS = \
daemons/daemon-util \
- daemons/ensure-dirs \
+ tools/kvm-ifup \
$(pkglib_python_scripts)
+nodist_pkglib_SCRIPTS = \
+ $(nodist_pkglib_python_scripts)
+
EXTRA_DIST = \
NEWS \
+ UPGRADE \
+ epydoc.conf.in \
pylintrc \
autotools/build-bash-completion \
autotools/check-python-code \
autotools/check-man \
+ autotools/check-news \
autotools/check-tar \
autotools/check-version \
- autotools/docbook-wrapper \
+ autotools/convert-constants \
+ autotools/docpp \
autotools/gen-coverage \
autotools/testrunner \
$(RUN_IN_TEMPDIR) \
daemons/daemon-util.in \
- daemons/ensure-dirs.in \
daemons/ganeti-cleaner.in \
$(pkglib_python_scripts) \
devel/upload.in \
+ tools/kvm-ifup.in \
$(docdot) \
$(docpng) \
$(docrst) \
doc/conf.py \
doc/html \
doc/examples/ganeti.initd.in \
+ doc/examples/ganeti-kvm-poweroff.initd.in \
doc/examples/ganeti.cron.in \
doc/examples/gnt-config-backup.in \
- doc/examples/dumb-allocator \
doc/examples/ganeti.default \
doc/examples/ganeti.default-debug \
doc/examples/hooks/ethers \
test/mocks.py \
$(dist_TESTS) \
$(TEST_FILES) \
- man/footer.sgml \
- $(mansgml) \
+ man/footer.rst \
+ $(manrst) \
$(maninput) \
- qa/ganeti-qa.py \
qa/qa-sample.json \
- qa/qa_cluster.py \
- qa/qa_config.py \
- qa/qa_daemon.py \
- qa/qa_env.py \
- qa/qa_error.py \
- qa/qa_instance.py \
- qa/qa_node.py \
- qa/qa_os.py \
- qa/qa_rapi.py \
- qa/qa_tags.py \
- qa/qa_utils.py
+ $(qa_scripts) \
+ $(HS_LIB_SRCS) $(HS_BUILT_SRCS_IN) \
+ $(HS_PROG_SRCS)
man_MANS = \
man/ganeti.7 \
man/ganeti-cleaner.8 \
man/ganeti-confd.8 \
+ man/ganeti-listrunner.8 \
man/ganeti-masterd.8 \
man/ganeti-noded.8 \
man/ganeti-os-interface.7 \
man/gnt-backup.8 \
man/gnt-cluster.8 \
man/gnt-debug.8 \
+ man/gnt-group.8 \
man/gnt-instance.8 \
man/gnt-job.8 \
man/gnt-node.8 \
- man/gnt-os.8
-
-mansgml = $(patsubst %.7,%.sgml,$(patsubst %.8,%.sgml,$(man_MANS)))
-manhtml = $(patsubst %.sgml,%.html,$(mansgml))
+ man/gnt-os.8 \
+ man/hail.1 \
+ man/hbal.1 \
+ man/hscan.1 \
+ man/hspace.1
+
+manrst = $(patsubst %.1,%.rst,$(patsubst %.7,%.rst,$(patsubst %.8,%.rst,$(man_MANS))))
+manhtml = $(patsubst %.rst,%.html,$(manrst))
+mangen = $(patsubst %.rst,%.gen,$(manrst))
maninput = \
- $(patsubst %.7,%.7.in,$(patsubst %.8,%.8.in,$(man_MANS))) \
- $(patsubst %.html,%.html.in,$(manhtml))
+ $(patsubst %.1,%.1.in,$(patsubst %.7,%.7.in,$(patsubst %.8,%.8.in,$(man_MANS)))) \
+ $(patsubst %.html,%.html.in,$(manhtml)) \
+ man/footer.man man/footer.html $(mangen)
TEST_FILES = \
test/data/bdev-drbd-8.0.txt \
test/ganeti.backend_unittest.py \
test/ganeti.bdev_unittest.py \
test/ganeti.cli_unittest.py \
+ test/ganeti.client.gnt_cluster_unittest.py \
+ test/ganeti.client.gnt_instance_unittest.py \
test/ganeti.daemon_unittest.py \
test/ganeti.cmdlib_unittest.py \
test/ganeti.compat_unittest.py \
test/ganeti.constants_unittest.py \
test/ganeti.errors_unittest.py \
test/ganeti.hooks_unittest.py \
+ test/ganeti.ht_unittest.py \
test/ganeti.http_unittest.py \
+ test/ganeti.hypervisor_unittest.py \
+ test/ganeti.hypervisor.hv_chroot_unittest.py \
+ test/ganeti.hypervisor.hv_fake_unittest.py \
test/ganeti.hypervisor.hv_kvm_unittest.py \
+ test/ganeti.hypervisor.hv_lxc_unittest.py \
+ test/ganeti.hypervisor.hv_xen_unittest.py \
test/ganeti.impexpd_unittest.py \
test/ganeti.jqueue_unittest.py \
test/ganeti.locking_unittest.py \
test/ganeti.netutils_unittest.py \
test/ganeti.objects_unittest.py \
test/ganeti.opcodes_unittest.py \
+ test/ganeti.qlang_unittest.py \
+ test/ganeti.query_unittest.py \
+ test/ganeti.rapi.baserlib_unittest.py \
test/ganeti.rapi.client_unittest.py \
test/ganeti.rapi.resources_unittest.py \
test/ganeti.rapi.rlib2_unittest.py \
test/ganeti.rpc_unittest.py \
+ test/ganeti.runtime_unittest.py \
test/ganeti.serializer_unittest.py \
test/ganeti.ssh_unittest.py \
+ test/ganeti.tools.ensure_dirs_unittest.py \
test/ganeti.uidpool_unittest.py \
+ test/ganeti.utils.algo_unittest.py \
+ test/ganeti.utils.filelock_unittest.py \
+ test/ganeti.utils.hash_unittest.py \
+ test/ganeti.utils.io_unittest.py \
+ test/ganeti.utils.log_unittest.py \
+ test/ganeti.utils.mlock_unittest.py \
+ test/ganeti.utils.nodesetup_unittest.py \
+ test/ganeti.utils.process_unittest.py \
+ test/ganeti.utils.retry_unittest.py \
+ test/ganeti.utils.text_unittest.py \
+ test/ganeti.utils.wrapper_unittest.py \
+ test/ganeti.utils.x509_unittest.py \
test/ganeti.utils_unittest.py \
- test/ganeti.utils_mlockall_unittest.py \
test/ganeti.workerpool_unittest.py \
test/cfgupgrade_unittest.py \
test/docs_unittest.py \
test/tempfile_fork_unittest.py
+haskell_tests = htools/test
+
dist_TESTS = \
test/check-cert-expired_unittest.bash \
test/daemon-util_unittest.bash \
$(python_tests)
nodist_TESTS =
+if WANT_HTOOLS
+nodist_TESTS += $(haskell_tests)
+endif
TESTS = $(dist_TESTS) $(nodist_TESTS)
$(dist_sbin_SCRIPTS) \
$(dist_tools_SCRIPTS) \
$(pkglib_python_scripts) \
+ $(nodist_pkglib_python_scripts) \
$(python_tests) \
$(pkgpython_PYTHON) \
+ $(client_PYTHON) \
$(hypervisor_PYTHON) \
$(rapi_PYTHON) \
+ $(server_PYTHON) \
+ $(pytools_PYTHON) \
$(http_PYTHON) \
$(confd_PYTHON) \
$(masterd_PYTHON) \
$(impexpd_PYTHON) \
- $(noinst_PYTHON)
+ $(utils_PYTHON) \
+ $(watcher_PYTHON) \
+ $(noinst_PYTHON) \
+ $(qa_scripts)
srclink_files = \
- man/footer.sgml \
+ man/footer.rst \
test/check-cert-expired_unittest.bash \
test/daemon-util_unittest.bash \
test/ganeti-cleaner_unittest.bash \
test/import-export_unittest.bash \
- $(all_python_code)
+ $(all_python_code) \
+ $(HS_LIB_SRCS) $(HS_PROG_SRCS)
check_python_code = \
$(BUILD_BASH_COMPLETION) \
+ $(DOCPP) \
$(all_python_code)
lint_python_code = \
$(dist_sbin_SCRIPTS) \
$(dist_tools_SCRIPTS) \
$(pkglib_python_scripts) \
- $(BUILD_BASH_COMPLETION)
+ $(BUILD_BASH_COMPLETION) \
+ $(DOCPP) \
+ $(PYTHON_BOOTSTRAP)
test/daemon-util_unittest.bash: daemons/daemon-util
test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
+tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED)
+ sed -f $(REPLACE_VARS_SED) < $< > $@
+ chmod +x $@
+
devel/upload: devel/upload.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod u+x $@
-daemons/%: daemons/%.in \
- $(REPLACE_VARS_SED)
+daemons/%: daemons/%.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
-doc/examples/%: doc/examples/%.in \
- $(REPLACE_VARS_SED)
+doc/examples/%: doc/examples/%.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
-doc/examples/hooks/%: doc/examples/hooks/%.in \
- $(REPLACE_VARS_SED)
+doc/examples/hooks/%: doc/examples/hooks/%.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
doc/examples/bash_completion: $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
- lib/cli.py $(gnt_scripts) tools/burnin
+ lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_BASH_COMPLETION) > $@
doc/%.png: doc/%.dot
@test -n "$(DOT)" || { echo 'dot' not found during configure; exit 1; }
$(DOT) -Tpng -o $@ $<
-man/%.7.in man/%.8.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
- @test -n "$(DOCBOOK2MAN)" || \
- { echo 'docbook2man' not found during configure; exit 1; }
- $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $(notdir $(@:.in=)) $@
+man/footer.man: man/footer.rst
+ @test -n "$(PANDOC)" || \
+ { echo 'pandoc' not found during configure; exit 1; }
+ $(PANDOC) -f rst -t man -o $@ $<
+
+man/footer.html: man/footer.rst
+ @test -n "$(PANDOC)" || \
+ { echo 'pandoc' not found during configure; exit 1; }
+ $(PANDOC) -f rst -t html -o $@ $<
+
+man/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py
+ PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@
+
+man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.man
+ @test -n "$(PANDOC)" || \
+ { echo 'pandoc' not found during configure; exit 1; }
+ set -o pipefail ; \
+ $(PANDOC) -s -f rst -t man -A man/footer.man $< | \
+ sed -e 's/\\@/@/g' > $@
if test -n "$(MAN_HAS_WARNINGS)"; then $(CHECK_MAN) $@; fi
-man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
- @test -n "$(DOCBOOK2HTML)" || \
- { echo 'docbook2html' not found during configure; exit 1; }
- $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $(notdir $(@:.in=)) $@
+man/%.html.in: man/%.gen man/footer.html
+ @test -n "$(PANDOC)" || \
+ { echo 'pandoc' not found during configure; exit 1; }
+ set -o pipefail ; \
+ $(PANDOC) -s -f rst -t html -A man/footer.html $< | \
+ sed -e 's/\\@/@/g' > $@
+
+man/%.1: man/%.1.in $(REPLACE_VARS_SED)
+ sed -f $(REPLACE_VARS_SED) < $< > $@
man/%.7: man/%.7.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
man/%.html: man/%.html.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
+epydoc.conf: epydoc.conf.in Makefile
+ sed -e 's#@MODULES@#$(strip $(lint_python_code))#g' < $< > $@
+
vcs-version:
if test -d .git; then \
git describe > $@; \
$(MAKE) vcs-version; \
fi
-lib/_autoconf.py: Makefile stamp-directories vcs-version
+htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in vcs-version
+ set -e; \
+ VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
+ sed -e "s/%ver%/$$VCSVER/" < $< > $@
+
+htools/Ganeti/Constants.hs: htools/Ganeti/Constants.hs.in \
+ lib/constants.py lib/_autoconf.py $(CONVERT_CONSTANTS)
+ set -e; \
+ { cat $< ; PYTHONPATH=. $(CONVERT_CONSTANTS); } > $@
+
+lib/_autoconf.py: Makefile vcs-version | lib/.dir
set -e; \
VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
{ echo '# This file is automatically generated, do not edit!'; \
echo "XEN_INITRD = '$(XEN_INITRD)'"; \
echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
echo "ENABLE_FILE_STORAGE = $(ENABLE_FILE_STORAGE)"; \
+ echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \
+ echo "ENABLE_SHARED_FILE_STORAGE = $(ENABLE_SHARED_FILE_STORAGE)"; \
echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
echo "KVM_PATH = '$(KVM_PATH)'"; \
echo "SOCAT_PATH = '$(SOCAT)'"; \
echo "SOCAT_USE_ESCAPE = $(SOCAT_USE_ESCAPE)"; \
+ echo "SOCAT_USE_COMPRESS = $(SOCAT_USE_COMPRESS)"; \
echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
echo "TOOLSDIR = '$(toolsdir)'"; \
echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
echo "DRBD_BARRIERS = $(DRBD_BARRIERS)"; \
echo "SYSLOG_USAGE = '$(SYSLOG_USAGE)'"; \
echo "DAEMONS_GROUP = '$(DAEMONS_GROUP)'"; \
+ echo "ADMIN_GROUP = '$(ADMIN_GROUP)'"; \
echo "MASTERD_USER = '$(MASTERD_USER)'"; \
+ echo "MASTERD_GROUP = '$(MASTERD_GROUP)'"; \
echo "RAPI_USER = '$(RAPI_USER)'"; \
+ echo "RAPI_GROUP = '$(RAPI_GROUP)'"; \
+ echo "CONFD_USER = '$(CONFD_USER)'"; \
+ echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
+ echo "NODED_USER = '$(NODED_USER)'"; \
+ echo "NODED_GROUP = '$(NODED_GROUP)'"; \
echo "VCS_VERSION = '$$VCSVER'"; \
+ echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \
+ if [ "$(HTOOLS)" ]; then \
+ echo "HTOOLS = True"; \
+ else \
+ echo "HTOOLS = False"; \
+ fi; \
} > $@
$(REPLACE_VARS_SED): Makefile
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#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
} > $@
+# Using deferred evaluation
+daemons/ganeti-%: MODULE = ganeti.server.$(patsubst ganeti-%,%,$(notdir $@))
+daemons/ganeti-watcher: MODULE = ganeti.watcher
+scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
+tools/ensure-dirs: MODULE = ganeti.tools.ensure_dirs
+
+$(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
+ test -n "$(MODULE)" || { echo Missing module; exit 1; }
+ set -e; \
+ { echo '#!/usr/bin/python'; \
+ echo '# This file is automatically generated, do not edit!'; \
+ echo "# Edit $(MODULE) instead."; \
+ echo; \
+ echo '"""Bootstrap script for L{$(MODULE)}"""'; \
+ echo; \
+ echo '# pylint: disable-msg=C0103'; \
+ echo '# C0103: Invalid name'; \
+ echo; \
+ echo 'import sys'; \
+ echo 'import $(MODULE) as main'; \
+ echo; \
+ echo '# Temporarily alias commands until bash completion'; \
+ echo '# generator is changed'; \
+ echo 'if hasattr(main, "commands"):'; \
+ echo ' commands = main.commands # pylint: disable-msg=E1101'; \
+ echo; \
+ echo 'if __name__ == "__main__":'; \
+ echo ' sys.exit(main.Main())'; \
+ } > $@
+ chmod u+x $@
+
# We need to create symlinks because "make distcheck" will not install Python
# files when building.
-stamp-srclinks: Makefile stamp-directories
+stamp-srclinks: Makefile | $(all_dirfiles)
set -e; \
for i in $(srclink_files); do \
if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
check-local: check-dirs
$(CHECK_PYTHON_CODE) $(check_python_code)
$(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
+ $(CHECK_NEWS) < $(top_srcdir)/NEWS
+ expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
+ if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \
+ echo "Incorrect version in README, expected $$expver"; \
+ exit 1; \
+ fi; \
+ if test "`sed -ne '4 p' $(top_srcdir)/doc/iallocator.rst`" != \
+ "Documents Ganeti version $$expver"; then \
+ echo "Incorrect version in iallocator.rst, expected $$expver"; \
+ exit 1; \
+ fi
+
+.PHONY: hs-check
+hs-check: htools/test
+ @rm -f test.tix
+ ./htools/test
.PHONY: lint
-lint: ganeti $(BUILT_SOURCES)
+lint: $(BUILT_SOURCES)
@test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }
$(PYLINT) $(LINT_OPTS) $(lint_python_code)
+ cd $(top_srcdir)/qa && \
+ PYTHONPATH=$(abs_top_srcdir) $(PYLINT) $(LINT_OPTS) \
+ --rcfile ../pylintrc $(patsubst qa/%.py,%,$(qa_scripts))
+
+.PHONY: hlint
+hlint: $(HS_BUILT_SRCS)
+ if tty -s; then C="-c"; else C=""; fi; \
+ hlint --report=doc/hs-lint.html $$C htools
# a dist hook rule for updating the vcs-version file; this is
# hardcoded due to where it needs to build the file...
echo "Found backup files in final archive." 1>&2; \
exit 1; \
fi
+# Empty files or directories should not be distributed. They can cause
+# unnecessary warnings for packagers. Directories used by automake during
+# distcheck must be excluded.
+ if find $(top_distdir) -empty -and -not \( \
+ -path $(top_distdir)/_build -or \
+ -path $(top_distdir)/_inst \) | grep .; then \
+ 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; \
"$(DESTDIR)${localstatedir}/log/ganeti" \
"$(DESTDIR)${localstatedir}/run/ganeti"
-stamp-directories: Makefile
- @mkdir_p@ $(DIRS)
- touch $@
+# To avoid conflicts between directory names and other targets, a file inside
+# the directory is used to ensure its existence.
+%.dir:
+ @mkdir_p@ $* && touch $@
.PHONY: apidoc
-apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(BUILT_SOURCES)
- test -e doc/api || mkdir doc/api
+if WANT_HTOOLSAPIDOC
+apidoc: py-apidoc hs-apidoc
+else
+apidoc: py-apidoc
+endif
+
+.PHONY: py-apidoc
+py-apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(BUILT_SOURCES)
$(RUN_IN_TEMPDIR) epydoc -v \
--conf $(CURDIR)/epydoc.conf \
- --output $(CURDIR)/doc/api
+ --output $(CURDIR)/$(APIDOC_PY_DIR)
+
+.PHONY: hs-apidoc
+hs-apidoc: $(HS_BUILT_SRCS)
+ @test -n "$(HSCOLOUR)" || \
+ { echo 'HsColour' not found during configure; exit 1; }
+ @test -n "$(HADDOCK)" || \
+ { echo 'haddock' not found during configure; exit 1; }
+ rm -rf $(APIDOC_HS_DIR)/*
+ @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools
+ $(HSCOLOUR) -print-css > $(APIDOC_HS_DIR)/Ganeti/hscolour.css
+ ln -s ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/HTools/hscolour.css
+ set -e ; \
+ cd htools; \
+ if [ "$(HTOOLS_NOCURL)" ]; \
+ then OPTGHC="--optghc=$(HTOOLS_NOCURL)"; \
+ else OPTGHC=""; \
+ fi; \
+ RELSRCS="$(HS_LIB_SRCS:htools/%=%)"; \
+ for file in $$RELSRCS; do \
+ hfile=`echo $$file|sed 's/\\.hs$$//'`.html; \
+ $(HSCOLOUR) -css -anchor $$file > ../$(APIDOC_HS_DIR)/$$hfile ; \
+ done ; \
+ $(HADDOCK) --odir ../$(APIDOC_HS_DIR) --html --ignore-all-exports -w \
+ -t ganeti-htools -p haddock-prologue \
+ --source-module="%{MODULE/.//}.html" \
+ --source-entity="%{MODULE/.//}.html#%{NAME}" \
+ $$OPTGHC \
+ $(filter-out Ganeti/HTools/ExtLoader.hs,$(HS_LIB_SRCS:htools/%=%))
.PHONY: TAGS
TAGS: $(BUILT_SOURCES)
etags -l python -
.PHONY: coverage
-coverage: $(BUILT_SOURCES) $(python_tests)
+if WANT_HTOOLS
+coverage: py-coverage hs-coverage
+else
+coverage: py-coverage
+endif
+
+.PHONY: py-coverage
+py-coverage: $(BUILT_SOURCES) $(python_tests)
set -e; \
- mkdir -p doc/coverage; \
- COVERAGE_FILE=$(CURDIR)/doc/coverage/data \
- TEXT_COVERAGE=$(CURDIR)/doc/coverage/report.txt \
- HTML_COVERAGE=$(CURDIR)/doc/coverage \
+ COVERAGE_FILE=$(CURDIR)/$(COVERAGE_PY_DIR)/data \
+ TEXT_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR)/report.txt \
+ HTML_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR) \
$(PLAIN_TESTS_ENVIRONMENT) $(abs_top_srcdir)/autotools/gen-coverage \
$(python_tests)
+.PHONY: hs-coverage
+hs-coverage: $(haskell_tests)
+ cd htools && rm -f *.tix *.mix && ./test
+ mkdir -p $(COVERAGE_HS_DIR)
+ hpc markup --destdir=$(COVERAGE_HS_DIR) htools/test $(HPCEXCL)
+ hpc report htools/test $(HPCEXCL)
+ ln -sf hpc_index.html $(COVERAGE_HS_DIR)/index.html
+
+# Special "kind-of-QA" target for htools, needs special setup (all
+# tools compiled with -fhpc)
+.PHONY: live-test
+live-test: all
+ set -e ; \
+ cd htools; \
+ rm -f .hpc; ln -s ../.hpc .hpc; \
+ rm -f *.tix *.mix; \
+ ./live-test.sh; \
+ hpc sum --union $(HPCEXCL) $(addsuffix .tix,$(HS_PROGS:htools/%=%)) \
+ --output=live-test.tix ; \
+ @mkdir_p@ ../$(COVERAGE_HS_DIR) ; \
+ hpc markup --destdir=../$(COVERAGE_HS_DIR) live-test \
+ --srcdir=.. $(HPCEXCL) ; \
+ hpc report --srcdir=.. live-test $(HPCEXCL)
+
commit-check: distcheck lint apidoc
-include ./Makefile.local
projects / ganeti-local / blobdiff