REPLACE_VARS_SED = autotools/replace_vars.sed
CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants
BUILD_RPC = $(top_srcdir)/autotools/build-rpc
+SHELL_ENV_INIT = autotools/shell-env-init
# Note: these are automake-specific variables, and must be named after
# the directory + 'dir' suffix
HTOOLS_DIRS = \
htools \
htools/Ganeti \
+ htools/Ganeti/Block \
+ htools/Ganeti/Block/Drbd \
htools/Ganeti/Confd \
+ htools/Ganeti/DataCollectors \
htools/Ganeti/HTools \
+ htools/Ganeti/HTools/Backend \
htools/Ganeti/HTools/Program \
htools/Ganeti/Query \
htest \
htest/Test \
htest/Test/Ganeti \
+ htest/Test/Ganeti/Block \
+ htest/Test/Ganeti/Block/Drbd \
htest/Test/Ganeti/Confd \
htest/Test/Ganeti/HTools \
+ htest/Test/Ganeti/HTools/Backend \
htest/Test/Ganeti/Query
DIRS = \
+ $(HTOOLS_DIRS) \
autotools \
daemons \
devel \
doc \
doc/examples \
- doc/examples/hooks \
doc/examples/gnt-debug \
- $(HTOOLS_DIRS) \
+ doc/examples/hooks \
+ htest/data \
+ htest/data/rapi \
+ htest/shelltests \
lib \
- lib/client \
lib/build \
+ lib/client \
lib/confd \
lib/http \
lib/hypervisor \
test/data \
test/data/ovfdata \
test/data/ovfdata/other \
- htest/data \
- htest/data/rapi \
- htest/shelltests \
tools
-BUILDTIME_DIR_AUTOCREATE = \
- scripts \
- $(APIDOC_DIR) \
- $(APIDOC_PY_DIR) \
+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 \
+ $(APIDOC_HS_DIR)/Ganeti/Query
+
+BUILDTIME_DIR_AUTOCREATE = \
+ scripts \
+ $(APIDOC_DIR) \
+ $(ALL_APIDOC_HS_DIRS) \
+ $(APIDOC_PY_DIR) \
$(COVERAGE_DIR) \
- $(COVERAGE_PY_DIR) \
$(COVERAGE_HS_DIR) \
+ $(COVERAGE_PY_DIR) \
.hpc
BUILDTIME_DIRS = \
DIRCHECK_EXCLUDE = \
$(BUILDTIME_DIRS) \
ganeti-[0-9]*.[0-9]*.[0-9]* \
- doc/html/_*
+ doc/html/_* \
+ autom4te.cache
# some helper vars
COVERAGE_DIR = doc/coverage
$(PYTHON_BOOTSTRAP) \
epydoc.conf \
$(REPLACE_VARS_SED) \
+ $(SHELL_ENV_INIT) \
daemons/daemon-util \
daemons/ganeti-cleaner \
- devel/upload \
$(BUILT_EXAMPLES) \
doc/examples/bash_completion \
doc/examples/bash_completion-debug \
$(man_MANS) \
$(manhtml) \
tools/kvm-ifup \
+ tools/vcluster-setup \
stamp-directories \
stamp-srclinks \
$(nodist_pkgpython_PYTHON) \
$(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
$(HS_BUILT_TEST_HELPERS) \
+ htools/ganeti-confd \
.hpc/*.mix htools/*.tix htest/*.tix \
doc/hs-lint.html
$(BUILT_PYTHON_SOURCES) \
$(PYTHON_BOOTSTRAP)
+HTOOLS_GENERATED_FILES =
+if WANT_HTOOLS
+HTOOLS_GENERATED_FILES += $(HS_PROGS)
+if ENABLE_CONFD
+HTOOLS_GENERATED_FILES += htools/hconfd htools/ganeti-confd
+endif
+endif
+
built_base_sources = \
stamp-directories \
stamp-srclinks
doc/examples/ganeti-kvm-poweroff.initd \
doc/examples/ganeti.cron \
doc/examples/ganeti.initd \
+ doc/examples/ganeti-master-role.ocf \
+ doc/examples/ganeti-node-role.ocf \
doc/examples/gnt-config-backup \
doc/examples/hooks/ipsec
noinst_PYTHON = \
lib/build/__init__.py \
- lib/build/sphinx_ext.py \
- lib/build/shell_example_lexer.py
+ lib/build/shell_example_lexer.py \
+ lib/build/sphinx_ext.py
pkgpython_PYTHON = \
lib/__init__.py \
lib/storage.py \
lib/uidpool.py \
lib/vcluster.py \
+ lib/network.py \
lib/workerpool.py
client_PYTHON = \
lib/client/gnt_instance.py \
lib/client/gnt_job.py \
lib/client/gnt_node.py \
+ lib/client/gnt_network.py \
lib/client/gnt_os.py
hypervisor_PYTHON = \
confd_PYTHON = \
lib/confd/__init__.py \
- lib/confd/client.py \
- lib/confd/querylib.py \
- lib/confd/server.py
+ lib/confd/client.py
masterd_PYTHON = \
lib/masterd/__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
+ lib/tools/ensure_dirs.py \
+ lib/tools/node_cleanup.py \
+ lib/tools/node_daemon_setup.py \
+ lib/tools/prepare_node_join.py
utils_PYTHON = \
lib/utils/__init__.py \
docrst = \
doc/admin.rst \
+ doc/cluster-merge.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-2.5.rst \
- doc/design-draft.rst \
- doc/design-oob.rst \
+ doc/design-2.6.rst \
+ doc/design-2.7.rst \
+ doc/design-autorepair.rst \
+ doc/design-bulk-create.rst \
+ doc/design-chained-jobs.rst \
doc/design-cpu-pinning.rst \
- doc/design-query2.rst \
- doc/design-x509-ca.rst \
+ doc/design-draft.rst \
+ doc/design-htools-2.3.rst \
doc/design-http-server.rst \
doc/design-impexp2.rst \
doc/design-lu-generated-jobs.rst \
+ doc/design-linuxha.rst \
doc/design-multi-reloc.rst \
doc/design-network.rst \
- doc/design-chained-jobs.rst \
+ doc/design-node-add.rst \
+ doc/design-oob.rst \
doc/design-ovf-support.rst \
- doc/design-autorepair.rst \
+ doc/design-opportunistic-locking.rst \
+ doc/design-partitioned.rst \
+ doc/design-query-splitting.rst \
+ doc/design-query2.rst \
+ doc/design-remote-commands.rst \
doc/design-resource-model.rst \
- doc/cluster-merge.rst \
doc/design-shared-storage.rst \
- doc/design-node-state-cache.rst \
+ doc/design-monitoring-agent.rst \
doc/design-virtual-clusters.rst \
- doc/design-bulk-create.rst \
- doc/design-query-splitting.rst \
+ doc/design-x509-ca.rst \
doc/devnotes.rst \
doc/glossary.rst \
doc/hooks.rst \
doc/rapi.rst \
doc/security.rst \
doc/upgrade.rst \
+ doc/virtual-cluster.rst \
doc/walkthrough.rst
-HS_PROGS = htools/htools
+HS_PROGS = htools/htools htools/mon-collector
HS_BIN_ROLES = hbal hscan hspace hinfo hcheck
+HS_HTOOLS_PROGS = $(HS_BIN_ROLES) hail
+
+HS_ALL_PROGS = \
+ $(HS_PROGS) \
+ htest/hpc-htools \
+ htest/hpc-mon-collector \
+ htest/test \
+ htools/hconfd \
+ htools/rpc-test
-HS_ALL_PROGS = $(HS_PROGS) htest/test htest/hpc-htools htools/hconfd
HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=htest/%) htest/hail
-HFLAGS = -O -Wall -Werror -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
+HFLAGS = \
+ -O -Wall -Werror -ihtools \
+ -fwarn-monomorphism-restriction \
+ -fwarn-tabs \
+ $(GHC_BYVERSION_FLAGS)
+
# extra flags that can be overriden on the command line (e.g. -Wwarn, etc.)
HEXTRA =
# internal extra flags (used for htest/test mainly)
# exclude options for coverage reports
HPCEXCL = --exclude Main \
--exclude Ganeti.Constants \
- --exclude Ganeti.THH \
--exclude Ganeti.HTools.QC \
+ --exclude Ganeti.THH \
--exclude Ganeti.Version \
+ --exclude Test.Ganeti.Attoparsec \
--exclude Test.Ganeti.TestCommon \
--exclude Test.Ganeti.TestHTools \
--exclude Test.Ganeti.TestHelper \
$(patsubst htools.%,--exclude Test.%,$(subst /,.,$(patsubst %.hs,%, $(HS_LIB_SRCS))))
HS_LIB_SRCS = \
+ htools/Ganeti/Block/Drbd/Types.hs \
+ htools/Ganeti/Block/Drbd/Parser.hs \
+ htools/Ganeti/BasicTypes.hs \
+ htools/Ganeti/Common.hs \
+ htools/Ganeti/Compat.hs \
+ htools/Ganeti/Confd/Server.hs \
+ htools/Ganeti/Confd/Types.hs \
+ htools/Ganeti/Confd/Utils.hs \
+ htools/Ganeti/Config.hs \
+ htools/Ganeti/Daemon.hs \
+ htools/Ganeti/DataCollectors/CLI.hs \
+ htools/Ganeti/DataCollectors/Drbd.hs \
+ htools/Ganeti/DataCollectors/Program.hs \
+ htools/Ganeti/Errors.hs \
+ htools/Ganeti/HTools/Backend/IAlloc.hs \
+ htools/Ganeti/HTools/Backend/Luxi.hs \
+ htools/Ganeti/HTools/Backend/Rapi.hs \
+ htools/Ganeti/HTools/Backend/Simu.hs \
+ htools/Ganeti/HTools/Backend/Text.hs \
htools/Ganeti/HTools/CLI.hs \
htools/Ganeti/HTools/Cluster.hs \
htools/Ganeti/HTools/Container.hs \
htools/Ganeti/HTools/ExtLoader.hs \
+ htools/Ganeti/HTools/Graph.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/Rapi.hs \
- htools/Ganeti/HTools/Simu.hs \
- htools/Ganeti/HTools/Text.hs \
- htools/Ganeti/HTools/Types.hs \
- htools/Ganeti/HTools/Utils.hs \
htools/Ganeti/HTools/Program.hs \
htools/Ganeti/HTools/Program/Hail.hs \
htools/Ganeti/HTools/Program/Hbal.hs \
htools/Ganeti/HTools/Program/Hinfo.hs \
htools/Ganeti/HTools/Program/Hscan.hs \
htools/Ganeti/HTools/Program/Hspace.hs \
- htools/Ganeti/BasicTypes.hs \
- htools/Ganeti/Common.hs \
- htools/Ganeti/Compat.hs \
- htools/Ganeti/Confd.hs \
- htools/Ganeti/Confd/Server.hs \
- htools/Ganeti/Confd/Utils.hs \
- htools/Ganeti/Config.hs \
- htools/Ganeti/Daemon.hs \
+ htools/Ganeti/HTools/Types.hs \
htools/Ganeti/Hash.hs \
- htools/Ganeti/Jobs.hs \
+ htools/Ganeti/JQueue.hs \
htools/Ganeti/JSON.hs \
+ htools/Ganeti/Jobs.hs \
htools/Ganeti/Logging.hs \
htools/Ganeti/Luxi.hs \
+ htools/Ganeti/Network.hs \
htools/Ganeti/Objects.hs \
htools/Ganeti/OpCodes.hs \
+ htools/Ganeti/OpParams.hs \
htools/Ganeti/Path.hs \
htools/Ganeti/Query/Common.hs \
htools/Ganeti/Query/Filter.hs \
+ htools/Ganeti/Query/Group.hs \
+ htools/Ganeti/Query/Job.hs \
htools/Ganeti/Query/Language.hs \
htools/Ganeti/Query/Node.hs \
htools/Ganeti/Query/Query.hs \
htools/Ganeti/Rpc.hs \
htools/Ganeti/Runtime.hs \
htools/Ganeti/Ssconf.hs \
- htools/Ganeti/THH.hs
+ htools/Ganeti/THH.hs \
+ htools/Ganeti/Types.hs \
+ htools/Ganeti/Utils.hs
HS_TEST_SRCS = \
+ htest/Test/Ganeti/Attoparsec.hs \
htest/Test/Ganeti/BasicTypes.hs \
+ htest/Test/Ganeti/Block/Drbd/Parser.hs \
+ htest/Test/Ganeti/Block/Drbd/Types.hs \
htest/Test/Ganeti/Common.hs \
- htest/Test/Ganeti/Daemon.hs \
+ htest/Test/Ganeti/Confd/Types.hs \
htest/Test/Ganeti/Confd/Utils.hs \
+ htest/Test/Ganeti/Daemon.hs \
+ htest/Test/Ganeti/Errors.hs \
+ htest/Test/Ganeti/HTools/Backend/Simu.hs \
+ htest/Test/Ganeti/HTools/Backend/Text.hs \
htest/Test/Ganeti/HTools/CLI.hs \
htest/Test/Ganeti/HTools/Cluster.hs \
htest/Test/Ganeti/HTools/Container.hs \
+ htest/Test/Ganeti/HTools/Graph.hs \
htest/Test/Ganeti/HTools/Instance.hs \
htest/Test/Ganeti/HTools/Loader.hs \
htest/Test/Ganeti/HTools/Node.hs \
htest/Test/Ganeti/HTools/PeerMap.hs \
- htest/Test/Ganeti/HTools/Simu.hs \
- htest/Test/Ganeti/HTools/Text.hs \
htest/Test/Ganeti/HTools/Types.hs \
- htest/Test/Ganeti/HTools/Utils.hs \
htest/Test/Ganeti/JSON.hs \
htest/Test/Ganeti/Jobs.hs \
+ htest/Test/Ganeti/JQueue.hs \
htest/Test/Ganeti/Luxi.hs \
+ htest/Test/Ganeti/Network.hs \
htest/Test/Ganeti/Objects.hs \
htest/Test/Ganeti/OpCodes.hs \
htest/Test/Ganeti/Query/Filter.hs \
htest/Test/Ganeti/Query/Query.hs \
htest/Test/Ganeti/Rpc.hs \
htest/Test/Ganeti/Ssconf.hs \
+ htest/Test/Ganeti/THH.hs \
htest/Test/Ganeti/TestCommon.hs \
htest/Test/Ganeti/TestHTools.hs \
- htest/Test/Ganeti/TestHelper.hs
+ htest/Test/Ganeti/TestHelper.hs \
+ htest/Test/Ganeti/Types.hs \
+ htest/Test/Ganeti/Utils.hs
HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS)
# Things to build but not to install (add it to EXTRA_DIST if it should be
# distributed)
noinst_DATA = \
- devel/upload \
doc/html \
$(BUILT_EXAMPLES) \
doc/examples/bash_completion \
scripts/gnt-group \
scripts/gnt-instance \
scripts/gnt-job \
+ scripts/gnt-network \
scripts/gnt-node \
scripts/gnt-os
PYTHON_BOOTSTRAP_SBIN = \
daemons/ganeti-masterd \
daemons/ganeti-noded \
- daemons/ganeti-watcher \
daemons/ganeti-rapi \
+ daemons/ganeti-watcher \
$(gnt_scripts)
-if PY_CONFD
-PYTHON_BOOTSTRAP_SBIN += daemons/ganeti-confd
-endif
-
PYTHON_BOOTSTRAP = \
$(PYTHON_BOOTSTRAP_SBIN) \
- tools/ensure-dirs
+ tools/ensure-dirs \
+ tools/node-cleanup \
+ tools/node-daemon-setup \
+ tools/prepare-node-join
qa_scripts = \
qa/__init__.py \
@mkdir_p@ $(DESTDIR)$(iallocatorsdir)
# FIXME: this is a hardcoded logic, instead of auto-resolving
$(LN_S) -f ../../../bin/htools \
- $(DESTDIR)$(iallocatorsdir)/hail
+ $(DESTDIR)$(iallocatorsdir)/hail
for role in $(HS_BIN_ROLES); do \
- $(LN_S) -f htools \
- $(DESTDIR)$(bindir)/$$role ; \
+ $(LN_S) -f htools $(DESTDIR)$(bindir)/$$role ; \
done
-if HS_CONFD
- mv $(DESTDIR)$(sbindir)/hconfd $(DESTDIR)$(sbindir)/ganeti-confd
-endif
endif
$(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile
- @if [ -z "$(HTOOLS)" ]; then \
- echo "Error: htools compilation disabled at configure time" 1>&2 ;\
- exit 1; \
- fi
- @if [ "$(notdir $@)" = "test" ] && [ -z "$(GHC_PKG_QUICKCHECK)" ]; then \
- echo "Error: cannot run unittests without the QuickCheck library (see devnotes.rst)" 1>&2; \
+ @if [ "$(notdir $@)" = "test" ] && [ "$(HTOOLS_NODEV)" ]; then \
+ echo "Error: cannot run unittests without the development" \
+ " libraries (see devnotes.rst)" 1>&2; \
exit 1; \
fi
@rm -f $(notdir $@).tix
$(GHC) --make \
$(HFLAGS) \
- $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \
+ $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) $(HTOOLS_REGEX_PCRE) \
-osuf $(notdir $@).o -hisuf $(notdir $@).hi \
$(HEXTRA) $(HEXTRA_INT) $@
@touch "$@"
# we compile the hpc-htools binary with the program coverage
htest/hpc-htools: HEXTRA_INT=-fhpc
+# we compile the hpc-mon-collector binary with the program coverage
+htest/hpc-mon-collector: HEXTRA_INT=-fhpc
+
# test dependency
-htest/offline-tests.sh: htest/hpc-htools
+htest/offline-tests.sh: htest/hpc-htools htest/hpc-mon-collector
# rules for building profiling-enabled versions of the haskell
# programs: hs-prof does the full two-step build, whereas
# run before)
.PHONY: hs-prof hs-prof-quick
hs-prof:
+ @if [ -z "$(TARGET)" ]; then \
+ echo "You need to define TARGET when running this rule" 1>&2; \
+ exit 1; \
+ fi
$(MAKE) $(AM_MAKEFLAGS) clean
- $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf .o"
+ $(MAKE) $(AM_MAKEFLAGS) $(TARGET) HEXTRA="-osuf o"
rm -f $(HS_ALL_PROGS)
$(MAKE) $(AM_MAKEFLAGS) hs-prof-quick
hs-prof-quick:
- $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf .prof_o -prof -auto-all"
+ @if [ -z "$(TARGET)" ]; then \
+ echo "You need to define TARGET when running this rule" 1>&2; \
+ exit 1; \
+ fi
+ $(MAKE) $(AM_MAKEFLAGS) $(TARGET) HEXTRA="-osuf prof_o -prof -auto-all"
dist_sbin_SCRIPTS = \
tools/ganeti-listrunner
$(PYTHON_BOOTSTRAP_SBIN) \
daemons/ganeti-cleaner
-if HS_CONFD
-nodist_sbin_SCRIPTS += htools/hconfd
+if ENABLE_CONFD
+htools/ganeti-confd: htools/hconfd
+ cp -f $< $@
+
+nodist_sbin_SCRIPTS += htools/ganeti-confd
endif
python_scripts = \
tools/lvmstrap \
tools/move-instance \
tools/ovfconverter \
- tools/setup-ssh \
tools/sanitize-config
dist_tools_SCRIPTS = \
$(python_scripts) \
tools/kvm-console-wrapper \
- tools/xm-console-wrapper \
- tools/master-ip-setup
+ tools/master-ip-setup \
+ tools/xen-console-wrapper
+
+nodist_tools_python_scripts = \
+ tools/node-cleanup
+
+nodist_tools_SCRIPTS = \
+ $(nodist_tools_python_scripts) \
+ tools/vcluster-setup
pkglib_python_scripts = \
daemons/import-export \
tools/check-cert-expired
nodist_pkglib_python_scripts = \
- tools/ensure-dirs
+ tools/ensure-dirs \
+ tools/node-daemon-setup \
+ tools/prepare-node-join
myexeclib_SCRIPTS = \
daemons/daemon-util \
tools/kvm-ifup \
- $(pkglib_python_scripts)
+ $(pkglib_python_scripts) \
+ htools/mon-collector
nodist_myexeclib_SCRIPTS = \
$(nodist_pkglib_python_scripts)
autotools/build-bash-completion \
autotools/build-rpc \
autotools/check-header \
- autotools/check-python-code \
autotools/check-imports \
autotools/check-man-dashes \
autotools/check-man-warnings \
autotools/check-news \
+ autotools/check-python-code \
autotools/check-tar \
autotools/check-version \
autotools/convert-constants \
daemons/daemon-util.in \
daemons/ganeti-cleaner.in \
$(pkglib_python_scripts) \
- devel/upload.in \
+ devel/upload \
tools/kvm-ifup.in \
+ tools/vcluster-setup.in \
$(docdot) \
$(docpng) \
$(docrst) \
$(HS_PROG_SRCS) \
htools/lint-hints.hs \
htest/cli-tests-defs.sh \
- htest/offline-test.sh
+ htest/offline-test.sh \
+ .ghci
man_MANS = \
- man/ganeti.7 \
man/ganeti-cleaner.8 \
man/ganeti-confd.8 \
man/ganeti-listrunner.8 \
man/ganeti-os-interface.7 \
man/ganeti-rapi.8 \
man/ganeti-watcher.8 \
+ man/ganeti.7 \
man/gnt-backup.8 \
man/gnt-cluster.8 \
man/gnt-debug.8 \
man/gnt-group.8 \
+ man/gnt-network.8 \
man/gnt-instance.8 \
man/gnt-job.8 \
man/gnt-node.8 \
man/hinfo.1 \
man/hscan.1 \
man/hspace.1 \
- man/htools.1
+ man/htools.1 \
+ man/mon-collector.7
manrst = $(patsubst %.1,%.rst,$(patsubst %.7,%.rst,$(patsubst %.8,%.rst,$(man_MANS))))
manhtml = $(patsubst %.rst,%.html,$(manrst))
man/footer.man man/footer.html $(mangen)
TEST_FILES = \
+ htest/data/common-suffix.data \
+ htest/data/hail-alloc-drbd.json \
+ htest/data/hail-change-group.json \
+ htest/data/hail-invalid-reloc.json \
+ htest/data/hail-node-evac.json \
+ htest/data/hail-reloc-drbd.json \
+ htest/data/hbal-excl-tags.data \
+ htest/data/hbal-split-insts.data \
+ htest/data/invalid-node.data \
+ htest/data/missing-resources.data \
+ htest/data/rapi/groups.json \
+ htest/data/rapi/info.json \
+ htest/data/rapi/instances.json \
+ htest/data/rapi/nodes.json \
+ htest/shelltests/htools-balancing.test \
+ htest/shelltests/htools-basic.test \
+ htest/shelltests/htools-dynutil.test \
+ htest/shelltests/htools-excl.test \
+ htest/shelltests/htools-hail.test \
+ htest/shelltests/htools-hspace.test \
+ htest/shelltests/htools-invalid.test \
+ htest/shelltests/htools-multi-group.test \
+ htest/shelltests/htools-no-backend.test \
+ htest/shelltests/htools-rapi.test \
+ htest/shelltests/htools-single-group.test \
+ htest/shelltests/htools-text-backend.test \
+ htest/shelltests/htools-mon-collector.test \
test/data/bdev-drbd-8.0.txt \
test/data/bdev-drbd-8.3.txt \
test/data/bdev-drbd-disk.txt \
test/data/bdev-drbd-net-ip4.txt \
test/data/bdev-drbd-net-ip6.txt \
test/data/cert1.pem \
+ test/data/cert2.pem \
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/ip-addr-show-lo-oneline-ipv6.txt \
test/data/ip-addr-show-lo-oneline.txt \
test/data/ip-addr-show-lo.txt \
- test/data/proc_drbd8.txt \
- test/data/proc_drbd80-emptyline.txt \
- test/data/proc_drbd83.txt \
- test/data/proc_drbd83_sync.txt \
- test/data/proc_drbd83_sync_krnl2.6.39.txt \
- test/data/kvm_1.0_help.txt \
- test/data/kvm_0.15.90_help.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/sys_drbd_usermode_helper.txt \
+ test/data/kvm_1.0_help.txt \
test/data/ovfdata/compr_disk.vmdk.gz \
test/data/ovfdata/config.ini \
test/data/ovfdata/corrupted_resources.ovf \
test/data/ovfdata/no_disk_in_ref.ovf \
test/data/ovfdata/no_os.ini \
test/data/ovfdata/no_ovf.ova \
+ test/data/ovfdata/other/rawdisk.raw \
test/data/ovfdata/ova.ova \
- test/data/ovfdata/second_disk.vmdk \
test/data/ovfdata/rawdisk.raw \
+ test/data/ovfdata/second_disk.vmdk \
test/data/ovfdata/unsafe_path.ini \
test/data/ovfdata/virtualbox.ovf \
- test/data/ovfdata/wrong_extension.ovd \
test/data/ovfdata/wrong_config.ini \
+ test/data/ovfdata/wrong_extension.ovd \
test/data/ovfdata/wrong_manifest.mf \
test/data/ovfdata/wrong_manifest.ovf \
test/data/ovfdata/wrong_ova.ova \
test/data/ovfdata/wrong_xml.ovf \
- test/data/ovfdata/other/rawdisk.raw \
+ test/data/proc_drbd8.txt \
+ test/data/proc_drbd80-emptyline.txt \
+ test/data/proc_drbd83.txt \
+ test/data/proc_drbd83_sync.txt \
+ test/data/proc_drbd83_sync_want.txt \
+ test/data/proc_drbd83_sync_krnl2.6.39.txt \
+ test/data/sys_drbd_usermode_helper.txt \
test/data/vgreduce-removemissing-2.02.02.txt \
test/data/vgreduce-removemissing-2.02.66-fail.txt \
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/import-export_unittest-helper \
- test/gnt-cli.test \
test/ganeti-cli.test \
- htest/shelltests/htools-balancing.test \
- htest/shelltests/htools-basic.test \
- htest/shelltests/htools-dynutil.test \
- htest/shelltests/htools-excl.test \
- htest/shelltests/htools-hail.test \
- htest/shelltests/htools-hspace.test \
- htest/shelltests/htools-invalid.test \
- htest/shelltests/htools-multi-group.test \
- htest/shelltests/htools-no-backend.test \
- htest/shelltests/htools-rapi.test \
- htest/shelltests/htools-single-group.test \
- htest/shelltests/htools-text-backend.test \
- htest/data/hail-alloc-drbd.json \
- htest/data/hail-change-group.json \
- htest/data/hail-invalid-reloc.json \
- htest/data/hail-node-evac.json \
- htest/data/hail-reloc-drbd.json \
- htest/data/hbal-split-insts.data \
- htest/data/common-suffix.data \
- htest/data/invalid-node.data \
- htest/data/missing-resources.data \
- htest/data/rapi/groups.json \
- htest/data/rapi/info.json \
- htest/data/rapi/instances.json \
- htest/data/rapi/nodes.json
+ test/gnt-cli.test \
+ test/import-export_unittest-helper
python_tests = \
doc/examples/rapi_testutils.py \
+ test/cfgupgrade_unittest.py \
+ test/docs_unittest.py \
test/ganeti.asyncnotifier_unittest.py \
+ test/ganeti.backend_unittest-runasroot.py \
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.client.gnt_job_unittest.py \
test/ganeti.cmdlib_unittest.py \
test/ganeti.compat_unittest.py \
test/ganeti.confd.client_unittest.py \
test/ganeti.config_unittest.py \
test/ganeti.constants_unittest.py \
+ test/ganeti.daemon_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.hypervisor_unittest.py \
test/ganeti.impexpd_unittest.py \
test/ganeti.jqueue_unittest.py \
test/ganeti.jstore_unittest.py \
test/ganeti.rpc_unittest.py \
test/ganeti.runtime_unittest.py \
test/ganeti.serializer_unittest.py \
+ test/ganeti.server.rapi_unittest.py \
+ test/ganeti.ssconf_unittest.py \
test/ganeti.ssh_unittest.py \
test/ganeti.storage_unittest.py \
test/ganeti.tools.ensure_dirs_unittest.py \
+ test/ganeti.tools.node_daemon_setup_unittest.py \
+ test/ganeti.tools.prepare_node_join_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-runasroot.py \
test/ganeti.utils.io_unittest.py \
test/ganeti.utils.log_unittest.py \
test/ganeti.utils.mlock_unittest.py \
test/ganeti.utils_unittest.py \
test/ganeti.vcluster_unittest.py \
test/ganeti.workerpool_unittest.py \
- test/qa.qa_config_unittest.py \
- test/cfgupgrade_unittest.py \
- test/docs_unittest.py \
test/pycurl_reset_unittest.py \
+ test/qa.qa_config_unittest.py \
test/tempfile_fork_unittest.py
-if HAS_FAKEROOT
-python_tests += test/ganeti.utils.io_unittest-runasroot.py
-endif
haskell_tests = htest/test
test/ganeti-cleaner_unittest.bash \
test/import-export_unittest.bash \
test/cli-test.bash \
+ test/bash_completion.bash \
$(python_tests)
nodist_TESTS =
if WANT_HTOOLSTESTS
nodist_TESTS += $(haskell_tests)
dist_TESTS += htest/offline-test.sh
-check_SCRIPTS += htest/hpc-htools $(HS_BUILT_TEST_HELPERS)
+check_SCRIPTS += \
+ htest/hpc-htools \
+ htest/hpc-mon-collector \
+ $(HS_BUILT_TEST_HELPERS)
endif
TESTS = $(dist_TESTS) $(nodist_TESTS)
$(python_scripts) \
$(pkglib_python_scripts) \
$(nodist_pkglib_python_scripts) \
+ $(nodist_tools_python_scripts) \
$(python_tests) \
$(pkgpython_PYTHON) \
$(client_PYTHON) \
test/ganeti-cleaner_unittest.bash \
test/import-export_unittest.bash \
test/cli-test.bash \
+ test/bash_completion.bash \
htest/offline-test.sh \
htest/cli-tests-defs.sh \
$(all_python_code) \
test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
+test/bash_completion.bash: doc/examples/bash_completion-debug
+
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)
+tools/vcluster-setup: tools/vcluster-setup.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
- chmod u+x $@
+ chmod +x $@
daemons/%:: daemons/%.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
doc/examples/bash_completion doc/examples/bash_completion-debug: \
$(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin \
- $(GENERATED_FILES)
+ daemons/ganeti-cleaner \
+ $(GENERATED_FILES) $(HTOOLS_GENERATED_FILES)
PYTHONPATH=. $(RUN_IN_TEMPDIR) \
$(CURDIR)/$(BUILD_BASH_COMPLETION) $(BC_ARGS) > $@
.PHONY: regen-vcs-version
regen-vcs-version:
- set -e; \
+ @set -e; \
cd $(srcdir); \
if test -d .git; then \
- $(MAKE) $(AM_MAKEFLAGS) clean-vcs-version; \
- $(MAKE) $(AM_MAKEFLAGS) vcs-version; \
+ T=`mktemp` ; trap 'rm -f $$T' EXIT; \
+ git describe > $$T; \
+ if ! cmp --quiet $$T vcs-version; then \
+ mv $$T vcs-version; \
+ fi; \
fi
htools/Ganeti/Version.hs: htools/Ganeti/Version.hs.in \
sed -e "s/%ver%/$$VCSVER/" < $< > $@
htools/Ganeti/Constants.hs: htools/Ganeti/Constants.hs.in \
- lib/constants.py lib/_autoconf.py lib/luxi.py \
+ lib/constants.py lib/_autoconf.py lib/luxi.py lib/errors.py \
+ lib/jstore.py \
$(CONVERT_CONSTANTS) $(built_base_sources) \
| lib/_vcsversion.py
set -e; \
echo "LOCALSTATEDIR = '$(localstatedir)'"; \
echo "SYSCONFDIR = '$(sysconfdir)'"; \
echo "SSH_CONFIG_DIR = '$(SSH_CONFIG_DIR)'"; \
+ echo "SSH_LOGIN_USER = '$(SSH_LOGIN_USER)'"; \
+ echo "SSH_CONSOLE_USER = '$(SSH_CONSOLE_USER)'"; \
echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \
echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
echo "TOOLSDIR = '$(toolsdir)'"; \
echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
+ echo "HTOOLS_PROGS = [$(foreach i,$(HS_HTOOLS_PROGS),'$(i)',)]"; \
echo "PKGLIBDIR = '$(pkglibdir)'"; \
echo "DRBD_BARRIERS = '$(DRBD_BARRIERS)'"; \
echo "DRBD_NO_META_FLUSH = $(DRBD_NO_META_FLUSH)"; \
echo "NODED_GROUP = '$(NODED_GROUP)'"; \
echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \
echo "QEMUIMG_PATH = '$(QEMUIMG_PATH)'"; \
- if [ "$(HTOOLS)" ]; then \
- echo "HTOOLS = True"; \
- else \
- echo "HTOOLS = False"; \
- fi; \
+ echo "HTOOLS = True"; \
echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
- echo "PY_CONFD = $(PY_CONFD)"; \
- echo "HS_CONFD = $(HS_CONFD)"; \
echo "XEN_CMD = '$(XEN_CMD)'"; \
echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
+ echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \
+ echo "ENABLE_MONITORING = $(ENABLE_MONITORING)"; \
} > $@
lib/_vcsversion.py: Makefile vcs-version | stamp-directories
lib/_generated_rpc.py: lib/rpc_defs.py $(BUILD_RPC)
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_RPC) lib/rpc_defs.py > $@
-$(REPLACE_VARS_SED): Makefile stamp-directories
+$(SHELL_ENV_INIT): Makefile stamp-directories
+ set -e; \
+ { echo '# Allow overriding for tests'; \
+ echo 'readonly LOCALSTATEDIR=$${LOCALSTATEDIR:-$${GANETI_ROOTDIR:-}$(localstatedir)}'; \
+ echo 'readonly SYSCONFDIR=$${SYSCONFDIR:-$${GANETI_ROOTDIR:-}$(sysconfdir)}'; \
+ echo; \
+ echo 'readonly PKGLIBDIR=$(pkglibdir)'; \
+ echo 'readonly LOG_DIR="$$LOCALSTATEDIR/log/ganeti"'; \
+ echo 'readonly RUN_DIR="$$LOCALSTATEDIR/run/ganeti"'; \
+ echo 'readonly DATA_DIR="$$LOCALSTATEDIR/lib/ganeti"'; \
+ echo 'readonly CONF_DIR="$$SYSCONFDIR/ganeti"'; \
+ } > $@
+
+$(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_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
echo 's#@MODULES@#$(strip $(lint_python_code))#g'; \
echo 's#@ENABLE_SPLIT_QUERY@#$(ENABLE_SPLIT_QUERY)#g'; \
+ echo; \
+ echo '/^@SHELL_ENV_INIT@$$/ {'; \
+ echo ' r $(SHELL_ENV_INIT)'; \
+ echo ' d'; \
+ echo '}'; \
} > $@
# Using deferred evaluation
daemons/ganeti-watcher: MODULE = ganeti.watcher
scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
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
+tools/node-cleanup: MODULE = ganeti.tools.node_cleanup
$(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst htest/%,%,$@)
$(PYTHON_BOOTSTRAP): Makefile | stamp-directories
stamp-srclinks: Makefile | stamp-directories
set -e; \
for i in $(srclink_files); do \
- if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
- $(LN_S) $(abs_top_srcdir)/$$i $$i; \
- fi; \
+ if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
+ $(LN_S) $(abs_top_srcdir)/$$i $$i; \
+ fi; \
done
touch $@
.PHONY: check-dirs
check-dirs: $(GENERATED_FILES)
@set -e; \
- find . -type d \( \( -name . \) -o \( \
- -name .git -o \
- -name autom4te.cache \
- \) -prune -o -print \) | { \
- error=; \
- while read dir; do \
- case "$$dir" in \
- $(strip $(patsubst %,(./%) ;;,$(DIRCHECK_EXCLUDE) $(DIRS))) \
- *) error=1; echo "Directory $$dir not listed in Makefile" >&2 ;; \
- esac; \
- done; \
- for dir in $(DIRS); do \
- if ! test -d "$$dir"; then \
- echo "Directory $$dir listed in DIRS does not exist" >&2; \
- error=1; \
- fi \
- done; \
- if test -n "$$error"; then exit 1; else exit 0; fi; \
+ find . -type d \( -name . -o -name .git -prune -o -print \) | { \
+ error=; \
+ while read dir; do \
+ case "$$dir" in \
+ $(strip $(patsubst %,(./%) ;;,$(DIRCHECK_EXCLUDE) $(DIRS))) \
+ *) error=1; echo "Directory $$dir not listed in Makefile" >&2 ;; \
+ esac; \
+ done; \
+ for dir in $(DIRS); do \
+ if ! test -d "$$dir"; then \
+ echo "Directory $$dir listed in DIRS does not exist" >&2; \
+ error=1; \
+ fi \
+ done; \
+ test -z "$$error"; \
}
.PHONY: check-local
$(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
$(CHECK_NEWS) < $(top_srcdir)/NEWS
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
- expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
+ @expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
+ error= ; \
if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \
- echo "Incorrect version in README, expected $$expver"; \
- exit 1; \
+ echo "Incorrect version in README, expected $$expver" >&2; \
+ error=1; \
fi; \
- for file in doc/iallocator.rst doc/hooks.rst; do \
- if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \
- "Documents Ganeti version $$expver"; then \
- echo "Incorrect version in $$file, expected $$expver"; \
- exit 1; \
- fi; \
- done
+ for file in doc/iallocator.rst doc/hooks.rst doc/virtual-cluster.rst \
+ doc/security.rst; do \
+ if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \
+ "Documents Ganeti version $$expver"; then \
+ echo "Incorrect version in $$file, expected $$expver" >&2; \
+ error=1; \
+ fi; \
+ done; \
+ if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \
+ echo "File $(top_srcdir)/doc/design-$$expver.rst not found" >&2; \
+ error=1; \
+ fi; \
+ if test "`sed -ne '5 p' $(top_srcdir)/doc/design-draft.rst`" != \
+ ".. Last updated for Ganeti $$expver"; then \
+ echo "doc/design-draft.rst was not updated for version $$expver" >&2; \
+ error=1; \
+ fi; \
+ for file in configure.ac $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS); do \
+ if test $$(wc --max-line-length < $(top_srcdir)/$$file) -gt 80; then \
+ echo "Longest line in $$file is longer than 80 characters" >&2; \
+ error=1; \
+ fi; \
+ done; \
+ test -z "$$error"
.PHONY: hs-check
-hs-check: htest/test htest/hpc-htools $(HS_BUILT_TEST_HELPERS)
- @rm -f test.tix
+hs-check: htest/test htest/hpc-htools htest/hpc-mon-collector $(HS_BUILT_TEST_HELPERS)
+ @rm -f *.tix
./htest/test
HBINARY="./htest/hpc-htools" ./htest/offline-test.sh
pep8: $(GENERATED_FILES)
@test -n "$(PEP8)" || { echo 'pep8' not found during configure; exit 1; }
$(PEP8) --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \
- --repeat $(pep8_python_code)
+ --repeat $(pep8_python_code)
# FIXME: remove ignore "Use void" when GHC 6.x is deprecated
+HLINT_EXCLUDES = htools/Ganeti/THH.hs htest/hpc-htools.hs
.PHONY: hlint
hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs
@test -n "$(HLINT)" || { echo 'hlint' not found during configure; exit 1; }
if tty -s; then C="-c"; else C=""; fi; \
- $(HLINT) --report=doc/hs-lint.html --cross $$C \
+ $(HLINT) --utf8 --report=doc/hs-lint.html --cross $$C \
--ignore "Use first" \
- --ignore "Use comparing" \
- --ignore "Use on" \
- --ignore "Reduce duplication" \
--ignore "Use &&&" \
--ignore "Use void" \
+ --ignore "Reduce duplication" \
--hint htools/lint-hints \
- $(filter-out htools/Ganeti/THH.hs,$(HS_LIBTEST_SRCS))
+ $(filter-out $(HLINT_EXCLUDES),$(HS_LIBTEST_SRCS) $(HS_PROG_SRCS))
# a dist hook rule for updating the vcs-version file; this is
# hardcoded due to where it needs to build the file...
# a distcheck hook rule for catching revision control directories
distcheck-hook:
if find $(top_distdir) -name .svn -or -name .git | grep .; then \
- echo "Found revision control files in final archive." 1>&2; \
- exit 1; \
+ echo "Found revision control files in final archive." 1>&2; \
+ exit 1; \
fi
if find $(top_distdir) -name '*.py[co]' | grep .; then \
- echo "Found Python byte code in final archive." 1>&2; \
- exit 1; \
+ echo "Found Python byte code in final archive." 1>&2; \
+ exit 1; \
fi
if find $(top_distdir) -name '*~' | grep .; then \
- echo "Found backup files in final archive." 1>&2; \
- exit 1; \
+ 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; \
+ -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; \
- exit 1; \
+ echo "Found unreleased version in NEWS." >&2; \
+ exit 1; \
fi
# When building a release, stricter checks should be used
dist-release: dist
set -e; \
for i in $(DIST_ARCHIVES); do \
- echo -n "Checking $$i ... "; \
- autotools/check-tar < $$i; \
- echo OK; \
+ echo -n "Checking $$i ... "; \
+ autotools/check-tar < $$i; \
+ echo OK; \
done
install-exec-local:
.PHONY: py-apidoc
py-apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(GENERATED_FILES)
+ env - PATH="$$PATH" PYTHONPATH="$$PYTHONPATH" \
$(RUN_IN_TEMPDIR) epydoc -v \
- --conf $(CURDIR)/epydoc.conf \
- --output $(CURDIR)/$(APIDOC_PY_DIR)
+ --conf $(CURDIR)/epydoc.conf \
+ --output $(CURDIR)/$(APIDOC_PY_DIR)
.PHONY: hs-apidoc
hs-apidoc: $(HS_BUILT_SRCS)
@test -n "$(HADDOCK)" || \
{ echo 'haddock' not found during configure; exit 1; }
rm -rf $(APIDOC_HS_DIR)/*
- @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Program
- @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Confd
- @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Query
+ for i in $(ALL_APIDOC_HS_DIRS); do \
+ @mkdir_p@ $$i; \
+ 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
if [ "$(HTOOLS_PARALLEL3)" ]; \
then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_PARALLEL3)"; \
fi; \
+ if [ "$(HTOOLS_REGEX_PCRE)" ]; \
+ then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_REGEX_PCRE)"; \
+ fi; \
RELSRCS="$(HS_LIB_SRCS:htools/%=%) $(patsubst htools/%,%,$(filter htools/%,$(HS_BUILT_SRCS)))"; \
for file in $$RELSRCS; do \
- hfile=`echo $$file|sed 's/\\.hs$$//'`.html; \
- $(HSCOLOUR) -css -anchor $$file > ../$(APIDOC_HS_DIR)/$$hfile ; \
+ 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/%=%))
+ -t ganeti -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: $(GENERATED_FILES)
rm -f TAGS
- $(GHC) -e ":etags" -v0 $(HFLAGS) $(HS_LIBTEST_SRCS)
+ $(GHC) -e ":etags" -v0 \
+ $(filter-out -O -Werror,$(HFLAGS)) \
+ $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) $(HTOOLS_REGEX_PCRE) \
+ $(HS_LIBTEST_SRCS)
find . -path './lib/*.py' -o -path './scripts/gnt-*' -o \
-path './daemons/ganeti-*' -o -path './tools/*' -o \
-path './qa/*.py' | \
.PHONY: py-coverage
py-coverage: $(GENERATED_FILES) $(python_tests)
+ @test -n "$(PYCOVERAGE)" || \
+ { echo 'python-coverage' not found during configure; exit 1; }
set -e; \
+ COVERAGE=$(PYCOVERAGE) \
COVERAGE_FILE=$(CURDIR)/$(COVERAGE_PY_DIR)/data \
TEXT_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR)/report.txt \
HTML_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR) \
$(python_tests)
.PHONY: hs-coverage
-hs-coverage: $(haskell_tests) htest/hpc-htools
+hs-coverage: $(haskell_tests) htest/hpc-htools htest/hpc-mon-collector
rm -f *.tix
$(MAKE) $(AM_MAKEFLAGS) hs-check
@mkdir_p@ $(COVERAGE_HS_DIR)
- hpc combine --union $(HPCEXCL) \
- test.tix hpc-htools.tix > coverage-htools.tix
+ hpc sum --union $(HPCEXCL) \
+ test.tix hpc-htools.tix hpc-mon-collector.tix > coverage-htools.tix
hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix
hpc report coverage-htools.tix
$(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html
--output=live-test.tix ; \
@mkdir_p@ ../$(COVERAGE_HS_DIR) ; \
hpc markup --destdir=../$(COVERAGE_HS_DIR) live-test \
- --srcdir=.. $(HPCEXCL) ; \
+ --srcdir=.. $(HPCEXCL) ; \
hpc report --srcdir=.. live-test $(HPCEXCL)
commit-check: distcheck lint apidoc
exit 1; \
fi
+# Target that builds all binaries (including those that are not
+# rebuilt except when running the tests)
+.PHONY: really-all
+really-all: all $(check_SCRIPTS) $(haskell_tests) $(HS_ALL_PROGS)
+
# we don't need the ancient implicit rules:
%: %,v
%: RCS/%,v