X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/74e6074691a5c2d685e7487b9b1c9882a981fea1..8e5f43b1a4274923da6cbd70b1897d071748a7fb:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 90d5169..2e2b92f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -160,8 +160,8 @@ CLEANFILES = \ .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 should only be used as a dependency on phony +# targets. Otherwise it'll cause the target to rebuild every time. BUILT_SOURCES = \ $(built_base_sources) \ $(BUILT_PYTHON_SOURCES) \ @@ -197,7 +197,8 @@ nodist_pkgpython_PYTHON = \ noinst_PYTHON = \ lib/build/__init__.py \ - lib/build/sphinx_ext.py + lib/build/sphinx_ext.py \ + lib/build/shell_example_lexer.py pkgpython_PYTHON = \ lib/__init__.py \ @@ -339,6 +340,7 @@ docrst = \ doc/design-shared-storage.rst \ doc/design-node-state-cache.rst \ doc/design-virtual-clusters.rst \ + doc/design-query-splitting.rst \ doc/devnotes.rst \ doc/glossary.rst \ doc/hooks.rst \ @@ -349,13 +351,14 @@ docrst = \ doc/locking.rst \ doc/move-instance.rst \ doc/news.rst \ + doc/ovfconverter.rst \ doc/rapi.rst \ doc/security.rst \ doc/upgrade.rst \ doc/walkthrough.rst HS_PROGS = htools/htools -HS_BIN_ROLES = hbal hscan hspace hinfo +HS_BIN_ROLES = hbal hscan hspace hinfo hcheck HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools htools/hconfd HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS)) @@ -398,6 +401,7 @@ HS_LIB_SRCS = \ htools/Ganeti/HTools/Program.hs \ htools/Ganeti/HTools/Program/Hail.hs \ htools/Ganeti/HTools/Program/Hbal.hs \ + htools/Ganeti/HTools/Program/Hcheck.hs \ htools/Ganeti/HTools/Program/Hinfo.hs \ htools/Ganeti/HTools/Program/Hscan.hs \ htools/Ganeti/HTools/Program/Hspace.hs \ @@ -427,7 +431,8 @@ $(RUN_IN_TEMPDIR): | $(all_dirfiles) # 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 \ + $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \ + lib/build/shell_example_lexer.py lib/opcodes.py lib/ht.py \ | $(BUILT_PYTHON_SOURCES) @test -n "$(SPHINX)" || \ { echo 'sphinx-build' not found during configure; exit 1; } @@ -496,6 +501,7 @@ PYTHON_BOOTSTRAP = \ tools/ensure-dirs qa_scripts = \ + qa/__init__.py \ qa/ganeti-qa.py \ qa/qa_cluster.py \ qa/qa_config.py \ @@ -504,6 +510,7 @@ qa_scripts = \ qa/qa_error.py \ qa/qa_group.py \ qa/qa_instance.py \ + qa/qa_job.py \ qa/qa_node.py \ qa/qa_os.py \ qa/qa_rapi.py \ @@ -543,6 +550,8 @@ $(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \ -osuf $$BINARY.o -hisuf $$BINARY.hi \ $(HEXTRA) $(HEXTRA_INT) $@ + @touch "$@" + # for the htools/test binary, we need to enable profiling/coverage htools/test: HEXTRA_INT=-fhpc -Wwarn -fno-warn-missing-signatures \ -fno-warn-monomorphism-restriction -fno-warn-orphans \ @@ -633,6 +642,7 @@ EXTRA_DIST = \ autotools/docpp \ autotools/gen-coverage \ autotools/testrunner \ + autotools/wrong-hardcoded-paths \ $(RUN_IN_TEMPDIR) \ daemons/daemon-util.in \ daemons/ganeti-cleaner.in \ @@ -687,6 +697,7 @@ man_MANS = \ man/gnt-os.8 \ man/hail.1 \ man/hbal.1 \ + man/hcheck.1 \ man/hinfo.1 \ man/hscan.1 \ man/hspace.1 \ @@ -729,6 +740,7 @@ TEST_FILES = \ 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-split-insts.data \ test/data/htools/common-suffix.data \ test/data/htools/invalid-node.data \ test/data/htools/missing-resources.data \ @@ -783,6 +795,7 @@ TEST_FILES = \ test/htools-text-backend.test python_tests = \ + doc/examples/rapi_testutils.py \ test/ganeti.asyncnotifier_unittest.py \ test/ganeti.backend_unittest.py \ test/ganeti.bdev_unittest.py \ @@ -843,6 +856,7 @@ python_tests = \ test/ganeti.utils.x509_unittest.py \ test/ganeti.utils_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 \ @@ -991,8 +1005,18 @@ man/footer.html: man/footer.rst { 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/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py \ + lib/build/shell_example_lexer.py \ + | $(RUN_IN_TEMPDIR) $(BUILT_PYTHON_SOURCES) + @echo "Checking $< for hardcoded paths..." + @if grep -nEf autotools/wrong-hardcoded-paths $<; then \ + echo "Man page $< has harcoded paths (see above)!" 1>&2 ; \ + exit 1; \ + fi + set -e ; \ + trap 'echo auto-removing $@; rm $@' EXIT; \ + PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@ ;\ + trap - EXIT man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.man @test -n "$(PANDOC)" || \ @@ -1035,12 +1059,16 @@ vcs-version: echo "Cannot auto-generate $@ file"; exit 1; \ fi +.PHONY: clean-vcs-version +clean-vcs-version: + rm -f vcs-version + .PHONY: regen-vcs-version regen-vcs-version: set -e; \ cd $(srcdir); \ if test -d .git; then \ - rm -f vcs-version; \ + $(MAKE) clean-vcs-version; \ $(MAKE) vcs-version; \ fi @@ -1050,7 +1078,8 @@ htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in vcs-version sed -e "s/%ver%/$$VCSVER/" < $< > $@ htools/Ganeti/Constants.hs: htools/Ganeti/Constants.hs.in \ - lib/constants.py lib/_autoconf.py $(CONVERT_CONSTANTS) \ + lib/constants.py lib/_autoconf.py lib/luxi.py \ + $(CONVERT_CONSTANTS) \ | lib/_vcsversion.py set -e; \ { cat $< ; PYTHONPATH=. $(CONVERT_CONSTANTS); } > $@ @@ -1086,6 +1115,7 @@ lib/_autoconf.py: Makefile | lib/.dir echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \ echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \ echo "XEN_INITRD = '$(XEN_INITRD)'"; \ + echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \ echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \ echo "ENABLE_FILE_STORAGE = $(ENABLE_FILE_STORAGE)"; \ echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \ @@ -1123,6 +1153,7 @@ lib/_autoconf.py: Makefile | lib/.dir echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \ echo "PY_CONFD = $(PY_CONFD)"; \ echo "HS_CONFD = $(HS_CONFD)"; \ + echo "XEN_CMD = '$(XEN_CMD)'"; \ } > $@ lib/_vcsversion.py: Makefile vcs-version | lib/.dir @@ -1294,28 +1325,43 @@ PEP8_IGNORE = E111,E261,E501 # For excluding pep8 expects filenames only, not whole paths PEP8_EXCLUDE = $(subst $(space),$(comma),$(strip $(notdir $(BUILT_PYTHON_SOURCES)))) +LINT_TARGETS = pylint pylint-qa +if HAS_PEP8 +LINT_TARGETS += pep8 +endif +if HAS_HLINT +LINT_TARGETS += hlint +endif + .PHONY: lint -lint: $(BUILT_SOURCES) +lint: $(LINT_TARGETS) + +.PHONY: pylint +pylint: $(BUILT_SOURCES) @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; } - if test -z "$(PEP8)"; then \ - echo '"pep8" not found during configure' >&2; \ - else \ - $(PEP8) --repeat --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \ - $(pep8_python_code); \ - fi $(PYLINT) $(LINT_OPTS) $(lint_python_code) + +.PHONY: pylint-qa +pylint-qa: $(BUILT_SOURCES) + @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; } cd $(top_srcdir)/qa && \ PYTHONPATH=$(abs_top_srcdir) $(PYLINT) $(LINT_OPTS) \ --rcfile ../pylintrc $(patsubst qa/%.py,%,$(qa_scripts)) +.PHONY: pep8 +pep8: $(BUILT_SOURCES) + @test -n "$(PEP8)" || { echo 'pep8' not found during configure; exit 1; } + $(PEP8) --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \ + --repeat $(pep8_python_code) + .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) --report=doc/hs-lint.html --cross $$C \ --ignore "Use first" \ --ignore "Use comparing" \ --ignore "Use on" \ - --ignore "Use Control.Exception.catch" \ --ignore "Reduce duplication" \ --hint htools/lint-hints \ $(filter-out htools/Ganeti/THH.hs,$(HS_LIB_SRCS)) @@ -1323,8 +1369,8 @@ hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs # a dist hook rule for updating the vcs-version file; this is # hardcoded due to where it needs to build the file... dist-hook: - $(MAKE) regen-vcs-version && \ - rm -f $(top_distdir)/vcs-version && \ + $(MAKE) regen-vcs-version + rm -f $(top_distdir)/vcs-version cp -p $(srcdir)/vcs-version $(top_distdir) # a distcheck hook rule for catching revision control directories @@ -1360,6 +1406,19 @@ distcheck-hook: distcheck-release dist-release: export BUILD_RELEASE = 1 distcheck-release: distcheck +distrebuildcheck: dist + set -e; \ + builddir=$$(mktemp -d $(abs_srcdir)/distrebuildcheck.XXXXXXX); \ + trap "echo Removing $$builddir; cd $(abs_srcdir); rm -rf $$builddir" EXIT; \ + cd $$builddir; \ + tar xzf $(abs_srcdir)/$(distdir).tar.gz; \ + cd $(distdir); \ + ./configure; \ + $(MAKE) maintainer-clean; \ + cp $(abs_srcdir)/vcs-version .; \ + ./configure; \ + $(MAKE) $(AM_MAKEFLAGS) + dist-release: dist set -e; \ for i in $(DIST_ARCHIVES); do \ @@ -1450,7 +1509,8 @@ py-coverage: $(BUILT_SOURCES) $(python_tests) .PHONY: hs-coverage hs-coverage: $(haskell_tests) htools/hpc-htools - rm -f *.tix && $(MAKE) hs-check + rm -f *.tix + $(MAKE) hs-check @mkdir_p@ $(COVERAGE_HS_DIR) hpc combine $(HPCEXCL) test.tix hpc-htools.tix > coverage-htools.tix hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix @@ -1475,6 +1535,14 @@ live-test: all commit-check: distcheck lint apidoc +.PHONY: gitignore-check +gitignore-check: + @if [ -n "`git status --short`" ]; then \ + echo "Git status is not clean!" 1>&2 ; \ + git status --short; \ + exit 1; \ + fi + -include ./Makefile.local # vim: set noet :