X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/1707159764a26f2feeadffcbb77bf06d1bd4e24c..383477e9c27967731bbe871d266b309dbe4ac43d:/Makefile.am?ds=inline diff --git a/Makefile.am b/Makefile.am index 5ea9925..c7865e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,7 +57,10 @@ myexeclibdir = $(pkglibdir) 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 \ @@ -65,6 +68,8 @@ HTOOLS_DIRS = \ 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 \ @@ -103,16 +108,22 @@ DIRS = \ test/data/ovfdata/other \ tools -BUILDTIME_DIR_AUTOCREATE = \ - scripts \ - $(APIDOC_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_HS_DIR) \ @@ -126,7 +137,8 @@ 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 @@ -257,6 +269,7 @@ pkgpython_PYTHON = \ lib/storage.py \ lib/uidpool.py \ lib/vcluster.py \ + lib/network.py \ lib/workerpool.py client_PYTHON = \ @@ -268,6 +281,7 @@ 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 = \ @@ -320,6 +334,8 @@ server_PYTHON = \ pytools_PYTHON = \ lib/tools/__init__.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 = \ @@ -360,15 +376,16 @@ docrst = \ doc/design-linuxha.rst \ doc/design-multi-reloc.rst \ doc/design-network.rst \ + doc/design-node-add.rst \ doc/design-oob.rst \ doc/design-ovf-support.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/design-shared-storage.rst \ - doc/design-ssh-setup.rst \ doc/design-monitoring-agent.rst \ doc/design-virtual-clusters.rst \ doc/design-x509-ca.rst \ @@ -389,13 +406,14 @@ docrst = \ 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 @@ -419,6 +437,7 @@ HPCEXCL = --exclude Main \ --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 \ @@ -426,6 +445,8 @@ HPCEXCL = --exclude Main \ $(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 \ @@ -434,6 +455,8 @@ HS_LIB_SRCS = \ htools/Ganeti/Confd/Utils.hs \ htools/Ganeti/Config.hs \ htools/Ganeti/Daemon.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 \ @@ -444,6 +467,7 @@ HS_LIB_SRCS = \ 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/Instance.hs \ htools/Ganeti/HTools/Loader.hs \ @@ -462,8 +486,10 @@ HS_LIB_SRCS = \ 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 \ @@ -477,11 +503,14 @@ HS_LIB_SRCS = \ htools/Ganeti/Runtime.hs \ htools/Ganeti/Ssconf.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/Confd/Utils.hs \ htest/Test/Ganeti/Daemon.hs \ @@ -491,6 +520,7 @@ HS_TEST_SRCS = \ 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 \ @@ -499,6 +529,7 @@ HS_TEST_SRCS = \ htest/Test/Ganeti/JSON.hs \ htest/Test/Ganeti/Jobs.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 \ @@ -510,6 +541,7 @@ HS_TEST_SRCS = \ htest/Test/Ganeti/TestCommon.hs \ htest/Test/Ganeti/TestHTools.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) @@ -579,6 +611,7 @@ gnt_scripts = \ scripts/gnt-group \ scripts/gnt-instance \ scripts/gnt-job \ + scripts/gnt-network \ scripts/gnt-node \ scripts/gnt-os @@ -592,6 +625,8 @@ PYTHON_BOOTSTRAP_SBIN = \ PYTHON_BOOTSTRAP = \ $(PYTHON_BOOTSTRAP_SBIN) \ tools/ensure-dirs \ + tools/node-cleanup \ + tools/node-daemon-setup \ tools/prepare-node-join qa_scripts = \ @@ -618,10 +653,9 @@ install-exec-hook: @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 endif @@ -645,8 +679,11 @@ htest/test: HEXTRA_INT=-fhpc -ihtest # 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 @@ -655,12 +692,12 @@ htest/offline-tests.sh: htest/hpc-htools .PHONY: hs-prof hs-prof-quick hs-prof: $(MAKE) $(AM_MAKEFLAGS) clean - $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf .o" + $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) 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" + $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf prof_o -prof -auto-all" dist_sbin_SCRIPTS = \ tools/ganeti-listrunner @@ -695,7 +732,11 @@ dist_tools_SCRIPTS = \ 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 = \ @@ -704,12 +745,14 @@ pkglib_python_scripts = \ nodist_pkglib_python_scripts = \ 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) @@ -784,6 +827,7 @@ man_MANS = \ 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 \ @@ -794,7 +838,8 @@ man_MANS = \ 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)) @@ -831,6 +876,7 @@ TEST_FILES = \ 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 \ @@ -878,6 +924,7 @@ TEST_FILES = \ 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 \ @@ -894,6 +941,7 @@ python_tests = \ 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 \ @@ -940,9 +988,11 @@ python_tests = \ 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 \ @@ -982,7 +1032,10 @@ check_SCRIPTS = 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) @@ -1003,6 +1056,7 @@ all_python_code = \ $(python_scripts) \ $(pkglib_python_scripts) \ $(nodist_pkglib_python_scripts) \ + $(nodist_tools_python_scripts) \ $(python_tests) \ $(pkgpython_PYTHON) \ $(client_PYTHON) \ @@ -1181,7 +1235,7 @@ 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 \ $(CONVERT_CONSTANTS) $(built_base_sources) \ | lib/_vcsversion.py set -e; \ @@ -1265,6 +1319,7 @@ lib/_autoconf.py: Makefile | stamp-directories echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \ echo "XEN_CMD = '$(XEN_CMD)'"; \ echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \ + echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \ } > $@ lib/_vcsversion.py: Makefile vcs-version | stamp-directories @@ -1345,7 +1400,9 @@ 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 +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 @@ -1396,9 +1453,9 @@ stamp-directories: Makefile 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 $@ @@ -1409,24 +1466,21 @@ ganeti: .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 @@ -1438,24 +1492,32 @@ check-local: check-dirs $(GENERATED_FILES) PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules) @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; \ + echo "Incorrect version in README, expected $$expver"; \ + exit 1; \ fi; \ 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"; \ - exit 1; \ - fi; \ + 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"; \ + exit 1; \ + fi; \ done; \ if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \ - echo "File $(top_srcdir)/doc/design-$$expver.rst not found"; \ - exit 1; \ - fi + echo "File $(top_srcdir)/doc/design-$$expver.rst not found"; \ + exit 1; \ + fi; \ + error= ; \ + 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) +hs-check: htest/test htest/hpc-htools htest/hpc-mon-collector $(HS_BUILT_TEST_HELPERS) @rm -f test.tix ./htest/test HBINARY="./htest/hpc-htools" ./htest/offline-test.sh @@ -1505,14 +1567,15 @@ pylint-qa: $(GENERATED_FILES) 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" \ @@ -1520,7 +1583,7 @@ hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs --ignore "Use &&&" \ --ignore "Use void" \ --hint htools/lint-hints \ - $(filter-out htools/Ganeti/THH.hs,$(HS_LIBTEST_SRCS) $(HS_PROG_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... @@ -1532,30 +1595,30 @@ dist-hook: # 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 @@ -1578,9 +1641,9 @@ distrebuildcheck: dist 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: @@ -1597,9 +1660,10 @@ endif .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) @@ -1608,10 +1672,9 @@ 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/Backend - @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 @@ -1629,15 +1692,15 @@ hs-apidoc: $(HS_BUILT_SRCS) 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 -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) @@ -1671,12 +1734,12 @@ py-coverage: $(GENERATED_FILES) $(python_tests) $(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 @@ -1694,7 +1757,7 @@ live-test: all --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 @@ -1710,7 +1773,7 @@ gitignore-check: # 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) +really-all: all $(check_SCRIPTS) $(haskell_tests) $(HS_ALL_PROGS) # we don't need the ancient implicit rules: %: %,v