X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/df1d5c8f684a54b98e9cbcbf7a6f852b42ca327f..31b836b8b1d17c70023ef5b8307a5df1b9a0d7db:/Makefile.am diff --git a/Makefile.am b/Makefile.am index b992c86..cc9d2d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,9 @@ empty := 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 @@ -37,6 +40,7 @@ SHELL_ENV_INIT = autotools/shell-env-init # Note: these are automake-specific variables, and must be named after # the directory + 'dir' suffix clientdir = $(pkgpythondir)/client +cmdlibdir = $(pkgpythondir)/cmdlib hypervisordir = $(pkgpythondir)/hypervisor httpdir = $(pkgpythondir)/http masterddir = $(pkgpythondir)/masterd @@ -61,10 +65,14 @@ HS_DIRS = \ src/Ganeti/Block \ src/Ganeti/Block/Drbd \ src/Ganeti/Confd \ + src/Ganeti/Curl \ src/Ganeti/DataCollectors \ src/Ganeti/HTools \ src/Ganeti/HTools/Backend \ src/Ganeti/HTools/Program \ + src/Ganeti/Hypervisor \ + src/Ganeti/Hypervisor/Xen \ + src/Ganeti/Monitoring \ src/Ganeti/Query \ test/hs \ test/hs/Test \ @@ -74,13 +82,19 @@ HS_DIRS = \ test/hs/Test/Ganeti/Confd \ test/hs/Test/Ganeti/HTools \ test/hs/Test/Ganeti/HTools/Backend \ + test/hs/Test/Ganeti/Hypervisor \ + test/hs/Test/Ganeti/Hypervisor/Xen \ 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 \ daemons \ devel \ + devel/data \ doc \ doc/css \ doc/examples \ @@ -92,6 +106,7 @@ DIRS = \ lib \ lib/build \ lib/client \ + lib/cmdlib \ lib/confd \ lib/http \ lib/hypervisor \ @@ -106,6 +121,7 @@ DIRS = \ qa \ test \ test/data \ + test/data/bdev-rbd \ test/data/ovfdata \ test/data/ovfdata/other \ test/py \ @@ -113,15 +129,7 @@ DIRS = \ 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 \ @@ -173,6 +181,8 @@ CLEANFILES = \ $(SHELL_ENV_INIT) \ daemons/daemon-util \ daemons/ganeti-cleaner \ + devel/squeeze-amd64.tar.gz \ + devel/squeeze-amd64.conf \ $(mandocrst) \ doc/manpages-enabled.rst \ $(BUILT_EXAMPLES) \ @@ -182,6 +192,7 @@ CLEANFILES = \ $(man_MANS) \ $(manhtml) \ tools/kvm-ifup \ + tools/users-setup \ tools/vcluster-setup \ stamp-directories \ stamp-srclinks \ @@ -189,6 +200,7 @@ CLEANFILES = \ $(HS_ALL_PROGS) $(HS_BUILT_SRCS) \ $(HS_BUILT_TEST_HELPERS) \ src/ganeti-confd \ + src/ganeti-mond \ .hpc/*.mix src/*.tix test/hs/*.tix \ doc/hs-lint.html @@ -203,6 +215,10 @@ HS_GENERATED_FILES += $(HS_PROGS) if ENABLE_CONFD HS_GENERATED_FILES += src/hconfd src/ganeti-confd endif + +if ENABLE_MOND +HS_GENERATED_FILES += src/ganeti-mond +endif endif built_base_sources = \ @@ -246,12 +262,12 @@ pkgpython_PYTHON = \ lib/bdev.py \ lib/bootstrap.py \ lib/cli.py \ - lib/cmdlib.py \ lib/compat.py \ lib/config.py \ lib/constants.py \ lib/daemon.py \ lib/errors.py \ + lib/hooksmaster.py \ lib/ht.py \ lib/jqueue.py \ lib/jstore.py \ @@ -260,8 +276,8 @@ pkgpython_PYTHON = \ 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 \ @@ -291,6 +307,17 @@ client_PYTHON = \ lib/client/gnt_os.py \ lib/client/gnt_storage.py +cmdlib_PYTHON = \ + lib/cmdlib/__init__.py \ + lib/cmdlib/common.py \ + lib/cmdlib/base.py \ + lib/cmdlib/cluster.py \ + lib/cmdlib/group.py \ + lib/cmdlib/node.py \ + lib/cmdlib/tags.py \ + lib/cmdlib/network.py \ + lib/cmdlib/test.py + hypervisor_PYTHON = \ lib/hypervisor/__init__.py \ lib/hypervisor/hv_base.py \ @@ -379,6 +406,7 @@ docinput = \ doc/design-bulk-create.rst \ doc/design-chained-jobs.rst \ doc/design-cpu-pinning.rst \ + doc/design-device-uuid-name.rst \ doc/design-draft.rst \ doc/design-htools-2.3.rst \ doc/design-http-server.rst \ @@ -394,12 +422,15 @@ docinput = \ doc/design-partitioned.rst \ doc/design-query-splitting.rst \ doc/design-query2.rst \ - doc/design-remote-commands.rst \ + doc/design-reason-trail.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 \ doc/design-x509-ca.rst \ + doc/design-hroller.rst \ + doc/design-storagetypes.rst \ doc/devnotes.rst \ doc/glossary.rst \ doc/hooks.rst \ @@ -425,18 +456,22 @@ mandocrst = $(addprefix doc/man-,$(notdir $(manrst))) HS_BIN_PROGS=src/htools # Haskell programs to be installed in the MYEXECLIB dir +if ENABLE_MOND 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 +# Haskell programs to be compiled by "make really-all" HS_COMPILE_PROGS= \ + src/ganeti-mond \ src/hconfd \ src/rpc-test # All Haskell non-test programs to be compiled but not automatically installed HS_PROGS = $(HS_BIN_PROGS) $(HS_MYEXECLIB_PROGS) -HS_BIN_ROLES = hbal hscan hspace hinfo hcheck hroller +HS_BIN_ROLES = harep hbal hscan hspace hinfo hcheck hroller HS_HTOOLS_PROGS = $(HS_BIN_ROLES) hail HS_ALL_PROGS = \ @@ -483,6 +518,7 @@ HS_LIB_SRCS = \ src/Ganeti/Confd/Types.hs \ src/Ganeti/Confd/Utils.hs \ src/Ganeti/Config.hs \ + src/Ganeti/Curl/Multi.hs \ src/Ganeti/Daemon.hs \ src/Ganeti/DataCollectors/CLI.hs \ src/Ganeti/DataCollectors/Drbd.hs \ @@ -505,6 +541,7 @@ HS_LIB_SRCS = \ src/Ganeti/HTools/Node.hs \ src/Ganeti/HTools/PeerMap.hs \ src/Ganeti/HTools/Program/Hail.hs \ + src/Ganeti/HTools/Program/Harep.hs \ src/Ganeti/HTools/Program/Hbal.hs \ src/Ganeti/HTools/Program/Hcheck.hs \ src/Ganeti/HTools/Program/Hinfo.hs \ @@ -513,22 +550,27 @@ HS_LIB_SRCS = \ src/Ganeti/HTools/Program/Hroller.hs \ src/Ganeti/HTools/Program/Main.hs \ src/Ganeti/HTools/Types.hs \ + src/Ganeti/Hypervisor/Xen/XmParser.hs \ + src/Ganeti/Hypervisor/Xen/Types.hs \ src/Ganeti/Hash.hs \ src/Ganeti/JQueue.hs \ src/Ganeti/JSON.hs \ src/Ganeti/Jobs.hs \ src/Ganeti/Logging.hs \ src/Ganeti/Luxi.hs \ + src/Ganeti/Monitoring/Server.hs \ src/Ganeti/Network.hs \ src/Ganeti/Objects.hs \ src/Ganeti/OpCodes.hs \ src/Ganeti/OpParams.hs \ src/Ganeti/Path.hs \ src/Ganeti/Query/Common.hs \ + src/Ganeti/Query/Export.hs \ src/Ganeti/Query/Filter.hs \ src/Ganeti/Query/Group.hs \ src/Ganeti/Query/Job.hs \ src/Ganeti/Query/Language.hs \ + src/Ganeti/Query/Network.hs \ src/Ganeti/Query/Node.hs \ src/Ganeti/Query/Query.hs \ src/Ganeti/Query/Server.hs \ @@ -561,6 +603,7 @@ HS_TEST_SRCS = \ test/hs/Test/Ganeti/HTools/Node.hs \ test/hs/Test/Ganeti/HTools/PeerMap.hs \ test/hs/Test/Ganeti/HTools/Types.hs \ + test/hs/Test/Ganeti/Hypervisor/Xen/XmParser.hs \ test/hs/Test/Ganeti/JSON.hs \ test/hs/Test/Ganeti/Jobs.hs \ test/hs/Test/Ganeti/JQueue.hs \ @@ -570,8 +613,10 @@ HS_TEST_SRCS = \ test/hs/Test/Ganeti/OpCodes.hs \ test/hs/Test/Ganeti/Query/Filter.hs \ test/hs/Test/Ganeti/Query/Language.hs \ + test/hs/Test/Ganeti/Query/Network.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 \ @@ -585,8 +630,13 @@ HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS) HS_BUILT_SRCS = \ test/hs/Test/Ganeti/TestImports.hs \ src/Ganeti/Constants.hs \ + src/Ganeti/Curl/Internal.hs \ src/Ganeti/Version.hs -HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS)) +HS_BUILT_SRCS_IN = \ + $(patsubst %,%.in,$(filter-out src/Ganeti/Curl/Internal.hs,$(HS_BUILT_SRCS))) \ + src/Ganeti/Curl/Internal.hsc + +HS_LIBTESTBUILT_SRCS = $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) $(RUN_IN_TEMPDIR): | stamp-directories @@ -602,7 +652,7 @@ doc/man-html/index.html: doc/manpages-enabled.rst $(mandocrst) doc/html/index.html doc/man-html/index.html: $(docinput) doc/conf.py \ configure.ac $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \ lib/build/shell_example_lexer.py lib/opcodes.py lib/ht.py \ - doc/css/style.css \ + doc/css/style.css lib/rapi/connector.py lib/rapi/rlib2.py \ | $(BUILT_PYTHON_SOURCES) @test -n "$(SPHINX)" || \ { echo 'sphinx-build' not found during configure; exit 1; } @@ -745,7 +795,7 @@ install-exec-hook: 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; \ @@ -754,7 +804,7 @@ $(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile @rm -f $(notdir $@).tix $(GHC) --make \ $(HFLAGS) \ - $(HS_NOCURL) $(HS_PARALLEL3) $(HS_REGEX_PCRE) \ + $(HS_PARALLEL3) $(HS_REGEX_PCRE) \ -osuf $(notdir $@).o -hisuf $(notdir $@).hi \ $(HEXTRA) $(HEXTRA_INT) $@ @touch "$@" @@ -807,6 +857,10 @@ src/ganeti-confd: src/hconfd nodist_sbin_SCRIPTS += src/ganeti-confd endif +if ENABLE_MOND +nodist_sbin_SCRIPTS += src/ganeti-mond +endif + python_scripts = \ tools/cfgshell \ tools/cfgupgrade \ @@ -821,6 +875,7 @@ python_scripts = \ dist_tools_SCRIPTS = \ $(python_scripts) \ + tools/burnin \ tools/kvm-console-wrapper \ tools/master-ip-setup \ tools/xen-console-wrapper @@ -830,6 +885,7 @@ nodist_tools_python_scripts = \ nodist_tools_SCRIPTS = \ $(nodist_tools_python_scripts) \ + tools/users-setup \ tools/vcluster-setup pkglib_python_scripts = \ @@ -837,7 +893,6 @@ pkglib_python_scripts = \ tools/check-cert-expired nodist_pkglib_python_scripts = \ - tools/burnin \ tools/ensure-dirs \ tools/node-daemon-setup \ tools/prepare-node-join @@ -880,6 +935,7 @@ EXTRA_DIST = \ devel/upload \ devel/webserver \ tools/kvm-ifup.in \ + tools/users-setup.in \ tools/vcluster-setup.in \ $(docinput) \ doc/html \ @@ -912,6 +968,7 @@ man_MANS = \ man/ganeti-confd.8 \ man/ganeti-listrunner.8 \ man/ganeti-masterd.8 \ + man/ganeti-mond.8 \ man/ganeti-noded.8 \ man/ganeti-os-interface.7 \ man/ganeti-extstorage-interface.7 \ @@ -954,24 +1011,31 @@ TEST_FILES = \ 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-dualspec.data \ + test/data/htools/hspace-tiered.data \ test/data/htools/invalid-node.data \ test/data/htools/missing-resources.data \ + test/data/htools/multiple-master.data \ test/data/htools/n1-failure.data \ test/data/htools/rapi/groups.json \ test/data/htools/rapi/info.json \ test/data/htools/rapi/instances.json \ test/data/htools/rapi/nodes.json \ + test/data/htools/unique-reboot-order.data \ test/hs/shelltests/htools-balancing.test \ test/hs/shelltests/htools-basic.test \ test/hs/shelltests/htools-dynutil.test \ test/hs/shelltests/htools-excl.test \ test/hs/shelltests/htools-hail.test \ + test/hs/shelltests/htools-hroller.test \ test/hs/shelltests/htools-hspace.test \ test/hs/shelltests/htools-invalid.test \ test/hs/shelltests/htools-multi-group.test \ @@ -985,8 +1049,22 @@ TEST_FILES = \ 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/cluster_config_2.7.json \ + test/data/cluster_config_downgraded_2.7.json \ test/data/instance-minor-pairing.txt \ test/data/ip-addr-show-dummy0.txt \ test/data/ip-addr-show-lo-ipv4.txt \ @@ -1032,12 +1110,18 @@ TEST_FILES = \ test/data/proc_drbd83_sync.txt \ test/data/proc_drbd83_sync_want.txt \ test/data/proc_drbd83_sync_krnl2.6.39.txt \ + test/data/qa-minimal-nodes-instances-only.json \ 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/data/xen-xm-info-4.0.1.txt \ + test/data/xen-xm-list-4.0.1-dom0-only.txt \ + test/data/xen-xm-list-4.0.1-four-instances.txt \ + test/data/xen-xm-list-long-4.0.1.txt \ + test/data/xen-xm-uptime-4.0.1.txt \ test/py/ganeti-cli.test \ test/py/gnt-cli.test \ test/py/import-export_unittest-helper @@ -1080,8 +1164,8 @@ python_tests = \ 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 \ @@ -1168,6 +1252,7 @@ all_python_code = \ $(python_tests) \ $(pkgpython_PYTHON) \ $(client_PYTHON) \ + $(cmdlib_PYTHON) \ $(hypervisor_PYTHON) \ $(rapi_PYTHON) \ $(server_PYTHON) \ @@ -1240,6 +1325,10 @@ tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED) 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 $@ @@ -1279,7 +1368,7 @@ man/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py \ 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' > $@; \ @@ -1339,6 +1428,9 @@ src/Ganeti/Constants.hs: src/Ganeti/Constants.hs.in \ PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CONVERT_CONSTANTS); \ } > $@ +src/Ganeti/Curl/Internal.hs: src/Ganeti/Curl/Internal.hsc | stamp-directories + hsc2hs -o $@ $< + test/hs/Test/Ganeti/TestImports.hs: test/hs/Test/Ganeti/TestImports.hs.in \ $(built_base_sources) set -e; \ @@ -1381,6 +1473,7 @@ lib/_autoconf.py: Makefile | stamp-directories 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)'"; \ @@ -1412,6 +1505,8 @@ lib/_autoconf.py: Makefile | stamp-directories echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \ echo "NODED_USER = '$(NODED_USER)'"; \ echo "NODED_GROUP = '$(NODED_GROUP)'"; \ + echo "MOND_USER = '$(MOND_USER)'"; \ + echo "MOND_GROUP = '$(MOND_GROUP)'"; \ echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \ echo "QEMUIMG_PATH = '$(QEMUIMG_PATH)'"; \ echo "HTOOLS = True"; \ @@ -1419,7 +1514,7 @@ lib/_autoconf.py: Makefile | stamp-directories echo "XEN_CMD = '$(XEN_CMD)'"; \ echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \ echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \ - echo "ENABLE_MONITORING = $(ENABLE_MONITORING)"; \ + echo "ENABLE_MOND = $(ENABLE_MOND)"; \ ## Write dictionary with man page name as the key and the section number as the ## value echo "MAN_PAGES = {"; \ @@ -1490,13 +1585,17 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \ echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \ echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \ + echo 's#@''GNTMONDUSER@#$(MOND_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#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \ echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \ echo 's#@''CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \ + echo 's#@''CUSTOM_ENABLE_MOND@#$(ENABLE_MOND)#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)'; \ @@ -1598,7 +1697,7 @@ check-local: check-dirs $(GENERATED_FILES) $(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= ; \ @@ -1696,6 +1795,7 @@ HLINT_EXCLUDES = src/Ganeti/THH.hs test/hs/hpc-htools.hs .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" \ @@ -1704,6 +1804,9 @@ hlint: $(HS_BUILT_SRCS) src/lint-hints.hs --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... @@ -1735,18 +1838,12 @@ 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; \ - fi if test -e $(top_distdir)/doc/man-html; then \ echo "Found documentation including man pages in final archive" >&2; \ exit 1; \ fi -# When building a release, stricter checks should be used -distcheck-release dist-release: export BUILD_RELEASE = 1 +# Backwards compatible distcheck-release target distcheck-release: distcheck distrebuildcheck: dist @@ -1790,7 +1887,9 @@ py-apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(GENERATED_FILES) --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)" || \ @@ -1798,40 +1897,36 @@ hs-apidoc: $(HS_BUILT_SRCS) 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; \ - if [ "$(HS_NOCURL)" ]; \ - then OPTGHC="--optghc=$(HS_NOCURL)"; \ - else OPTGHC=""; \ - fi; \ + export LC_ALL=en_US.UTF-8; \ + OPTGHC="--optghc=-isrc --optghc=-itest/hs"; \ if [ "$(HS_PARALLEL3)" ]; \ then OPTGHC="$$OPTGHC --optghc=$(HS_PARALLEL3)"; \ fi; \ 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) rm -f TAGS $(GHC) -e ":etags" -v0 \ $(filter-out -O -Werror,$(HFLAGS)) \ - $(HS_NOCURL) $(HS_PARALLEL3) $(HS_REGEX_PCRE) \ + $(HS_PARALLEL3) $(HS_REGEX_PCRE) \ $(HS_LIBTEST_SRCS) find . -path './lib/*.py' -o -path './scripts/gnt-*' -o \ -path './daemons/ganeti-*' -o -path './tools/*' -o \