X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/30f2802f21df7989e00aa82a37daecb3c7c3ecff..43c16a8a1adfd543751fcaf60ad4c8e04cf83688:/Makefile.am diff --git a/Makefile.am b/Makefile.am index c0d8129..7a2d359 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ @@ -361,9 +362,8 @@ HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools htools/hconfd HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS)) HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/%) test/hail -# 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 +HFLAGS = -O -Wall -Werror -fwarn-monomorphism-restriction -fwarn-tabs -ihtools +# extra flags that can be overriden on the command line (e.g. -Wwarn, etc.) HEXTRA = # internal extra flags (used for htools/test mainly) HEXTRA_INT = @@ -428,7 +428,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; } @@ -497,6 +498,7 @@ PYTHON_BOOTSTRAP = \ tools/ensure-dirs qa_scripts = \ + qa/__init__.py \ qa/ganeti-qa.py \ qa/qa_cluster.py \ qa/qa_config.py \ @@ -505,6 +507,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 \ @@ -634,6 +637,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 \ @@ -784,6 +788,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 \ @@ -844,6 +849,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 \ @@ -992,7 +998,13 @@ 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 +man/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py \ + lib/build/shell_example_lexer.py + @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 PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@ man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.man @@ -1051,7 +1063,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); } > $@ @@ -1087,6 +1100,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)'"; \