X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/0cc3f0d7378522ba73662258792178e0e9f68ac0..f22433c0f9d678670139cf42df22188a57adeca3:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5b59bd8..24f6f22 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -107,9 +107,7 @@ 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 \
@@ -118,7 +116,12 @@ BUILDTIME_DIR_AUTOCREATE = \
 	$(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) \
@@ -132,7 +135,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
@@ -456,6 +460,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 \
@@ -507,6 +512,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 \
@@ -636,10 +642,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
 
@@ -1419,9 +1424,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 $@
 
@@ -1432,24 +1437,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
@@ -1461,24 +1463,29 @@ 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; \
+	  echo "File $(top_srcdir)/doc/design-$$expver.rst not found"; \
+	  exit 1; \
 	fi; \
-	if test $$(wc --max-line-length < $(top_srcdir)/configure.ac) -gt 80; then \
-		echo 'Longest line in configure.ac is longer than 80 characters' >&2; \
-	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)
@@ -1531,9 +1538,10 @@ 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; }
@@ -1546,7 +1554,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...
@@ -1558,30 +1566,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
@@ -1604,9 +1612,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:
@@ -1623,9 +1631,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)
@@ -1634,12 +1643,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/Block
-	@mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Block/Drbd
-	@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
@@ -1657,15 +1663,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)
@@ -1722,7 +1728,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
@@ -1738,7 +1744,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