X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/07dde0c165b3ab1edcca96b61657f9274e7ebfc0..458a286a97f9def5b6d7f0d34d6730860226ac66:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6c1fe1d..9c7a33a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@ CHECK_VERSION = $(top_srcdir)/autotools/check-version
 CHECK_NEWS = $(top_srcdir)/autotools/check-news
 DOCPP = $(top_srcdir)/autotools/docpp
 REPLACE_VARS_SED = autotools/replace_vars.sed
+CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants
 
 # Note: these are automake-specific variables, and must be named after
 # the directory + 'dir' suffix
@@ -36,6 +37,7 @@ impexpddir = $(pkgpythondir)/impexpd
 utilsdir = $(pkgpythondir)/utils
 toolsdir = $(pkglibdir)/tools
 iallocatorsdir = $(pkglibdir)/iallocators
+pytoolsdir = $(pkgpythondir)/tools
 docdir = $(datadir)/doc/$(PACKAGE)
 
 # Delete output file if an error occurred while building it
@@ -44,7 +46,8 @@ docdir = $(datadir)/doc/$(PACKAGE)
 HTOOLS_DIRS = \
 	htools \
 	htools/Ganeti \
-	htools/Ganeti/HTools
+	htools/Ganeti/HTools \
+	htools/Ganeti/HTools/Program
 
 DIRS = \
 	autotools \
@@ -65,6 +68,7 @@ DIRS = \
 	lib/masterd \
 	lib/rapi \
 	lib/server \
+	lib/tools \
 	lib/utils \
 	lib/watcher \
 	man \
@@ -79,6 +83,7 @@ BUILDTIME_DIR_AUTOCREATE = \
 	$(APIDOC_PY_DIR) \
 	$(APIDOC_HS_DIR) \
 	$(APIDOC_HS_DIR)/Ganeti $(APIDOC_HS_DIR)/Ganeti/HTools \
+	$(APIDOC_HS_DIR)/Ganeti/HTools/Program \
 	$(COVERAGE_DIR) \
 	$(COVERAGE_PY_DIR) \
 	$(COVERAGE_HS_DIR) \
@@ -123,7 +128,6 @@ CLEANFILES = \
 	epydoc.conf \
 	autotools/replace_vars.sed \
 	daemons/daemon-util \
-	daemons/ensure-dirs \
 	daemons/ganeti-cleaner \
 	devel/upload \
 	doc/examples/bash_completion \
@@ -247,6 +251,10 @@ server_PYTHON = \
 	lib/server/noded.py \
 	lib/server/rapi.py
 
+pytools_PYTHON = \
+	lib/tools/__init__.py \
+	lib/tools/ensure_dirs.py
+
 utils_PYTHON = \
 	lib/utils/__init__.py \
 	lib/utils/algo.py \
@@ -272,11 +280,15 @@ docrst = \
 	doc/design-2.4.rst \
 	doc/design-draft.rst \
 	doc/design-oob.rst \
+	doc/design-cpu-pinning.rst \
 	doc/design-query2.rst \
 	doc/design-x509-ca.rst \
 	doc/design-http-server.rst \
 	doc/design-impexp2.rst \
 	doc/design-lu-generated-jobs.rst \
+	doc/design-multi-reloc.rst \
+	doc/design-network.rst \
+	doc/design-chained-jobs.rst \
 	doc/cluster-merge.rst \
 	doc/design-shared-storage.rst \
 	doc/devnotes.rst \
@@ -297,8 +309,8 @@ docrst = \
 HS_PROGS = \
 	htools/hbal \
 	htools/hscan \
-	htools/hail \
-	htools/hspace
+	htools/hspace \
+	htools/htools
 
 HS_ALL_PROGS = $(HS_PROGS) htools/test
 HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
@@ -307,11 +319,14 @@ HFLAGS = -O -Wall -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
 # extra flags that can be overriden on the command line
 HEXTRA =
 # exclude options for coverage reports
-HPCEXCL = --exclude Main --exclude Ganeti.HTools.QC
+HPCEXCL = --exclude Main --exclude Ganeti.HTools.QC \
+	--exclude Ganeti.Constants \
+	--exclude Ganeti.HTools.Version
 
 HS_LIB_SRCS = \
 	htools/Ganeti/HTools/CLI.hs \
 	htools/Ganeti/HTools/Cluster.hs \
+	htools/Ganeti/HTools/Compat.hs \
 	htools/Ganeti/HTools/Container.hs \
 	htools/Ganeti/HTools/ExtLoader.hs \
 	htools/Ganeti/HTools/Group.hs \
@@ -327,11 +342,12 @@ HS_LIB_SRCS = \
 	htools/Ganeti/HTools/Text.hs \
 	htools/Ganeti/HTools/Types.hs \
 	htools/Ganeti/HTools/Utils.hs \
+	htools/Ganeti/HTools/Program/Hail.hs \
 	htools/Ganeti/Jobs.hs \
 	htools/Ganeti/Luxi.hs \
 	htools/Ganeti/OpCodes.hs
 
-HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs
+HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs htools/Ganeti/Constants.hs
 HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
 
 $(RUN_IN_TEMPDIR): | $(all_dirfiles)
@@ -399,7 +415,7 @@ gnt_scripts = \
 	scripts/gnt-node \
 	scripts/gnt-os
 
-PYTHON_BOOTSTRAP = \
+PYTHON_BOOTSTRAP_SBIN = \
 	daemons/ganeti-confd \
 	daemons/ganeti-masterd \
 	daemons/ganeti-noded \
@@ -414,6 +430,10 @@ PYTHON_BOOTSTRAP = \
 	scripts/gnt-node \
 	scripts/gnt-os
 
+PYTHON_BOOTSTRAP = \
+	$(PYTHON_BOOTSTRAP_SBIN) \
+	tools/ensure-dirs
+
 qa_scripts = \
 	qa/ganeti-qa.py \
 	qa/qa_cluster.py \
@@ -429,18 +449,28 @@ qa_scripts = \
 	qa/qa_utils.py
 
 bin_SCRIPTS =
-iallocators_SCRIPTS =
 if WANT_HTOOLS
 bin_SCRIPTS += $(filter-out htools/hail,$(HS_PROGS))
-iallocators_SCRIPTS += $(filter htools/hail,$(HS_PROGS))
+install-exec-hook:
+	@mkdir_p@ $(DESTDIR)$(iallocatorsdir)
+	$(LN_S) -f $(DESTDIR)$(bindir)/htools \
+		   $(DESTDIR)$(iallocatorsdir)/hail
 endif
 
 $(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile
-	BINARY=$(@:htools/%=%); \
-	$(GHC) --make \
-	  $(HFLAGS) $(HEXTRA) $(HTOOLS_NOCURL) \
-	  -osuf $$BINARY.o -hisuf $$BINARY.hi \
-	  $@
+	@if [ -z "$(HTOOLS)" ]; then \
+	  echo "Error: htools compilation disabled at configure time" 1>&2 ;\
+	  exit 1; \
+	fi
+	@BINARY=$(@:htools/%=%); \
+	if [ "$BINARY" = "test" ] && [ -z "$(GHC_PKG_QUICKCHECK)" ]; then \
+	  echo "Error: cannot run unittests without the QuickCheck library (see devnotes.rst)" 1>&2; \
+	  exit 1; \
+	fi
+	BINARY=$(@:htools/%=%); $(GHC) --make \
+	  $(HFLAGS) $(HEXTRA) \
+	  $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \
+	  -osuf $$BINARY.o -hisuf $$BINARY.hi $@
 
 # for the htools/test binary, we need to enable profiling/coverage
 htools/test: HEXTRA=-fhpc -Wwarn -fno-warn-missing-signatures \
@@ -451,10 +481,10 @@ dist_sbin_SCRIPTS = \
 	tools/ganeti-listrunner
 
 nodist_sbin_SCRIPTS = \
-	$(PYTHON_BOOTSTRAP) \
+	$(PYTHON_BOOTSTRAP_SBIN) \
 	daemons/ganeti-cleaner
 
-dist_tools_SCRIPTS = \
+dist_tools_PYTHON = \
 	tools/burnin \
 	tools/cfgshell \
 	tools/cfgupgrade \
@@ -465,16 +495,26 @@ dist_tools_SCRIPTS = \
 	tools/setup-ssh \
 	tools/sanitize-config
 
+dist_tools_SCRIPTS = \
+	$(dist_tools_PYTHON) \
+	tools/kvm-console-wrapper \
+	tools/xm-console-wrapper
+
 pkglib_python_scripts = \
 	daemons/import-export \
 	tools/check-cert-expired
 
+nodist_pkglib_python_scripts = \
+	tools/ensure-dirs
+
 pkglib_SCRIPTS = \
 	daemons/daemon-util \
-	daemons/ensure-dirs \
 	tools/kvm-ifup \
 	$(pkglib_python_scripts)
 
+nodist_pkglib_SCRIPTS = \
+	$(nodist_pkglib_python_scripts)
+
 EXTRA_DIST = \
 	NEWS \
 	UPGRADE \
@@ -486,12 +526,12 @@ EXTRA_DIST = \
 	autotools/check-news \
 	autotools/check-tar \
 	autotools/check-version \
+	autotools/convert-constants \
 	autotools/docpp \
 	autotools/gen-coverage \
 	autotools/testrunner \
 	$(RUN_IN_TEMPDIR) \
 	daemons/daemon-util.in \
-	daemons/ensure-dirs.in \
 	daemons/ganeti-cleaner.in \
 	$(pkglib_python_scripts) \
 	devel/upload.in \
@@ -545,7 +585,8 @@ man_MANS = \
 	man/hail.1 \
 	man/hbal.1 \
 	man/hscan.1 \
-	man/hspace.1
+	man/hspace.1 \
+	man/htools.1
 
 manrst = $(patsubst %.1,%.rst,$(patsubst %.7,%.rst,$(patsubst %.8,%.rst,$(man_MANS))))
 manhtml = $(patsubst %.rst,%.html,$(manrst))
@@ -610,6 +651,7 @@ python_tests = \
 	test/ganeti.runtime_unittest.py \
 	test/ganeti.serializer_unittest.py \
 	test/ganeti.ssh_unittest.py \
+	test/ganeti.tools.ensure_dirs_unittest.py \
 	test/ganeti.uidpool_unittest.py \
 	test/ganeti.utils.algo_unittest.py \
 	test/ganeti.utils.filelock_unittest.py \
@@ -639,7 +681,7 @@ dist_TESTS = \
 	$(python_tests)
 
 nodist_TESTS =
-if WANT_HTOOLS
+if WANT_HTOOLSTESTS
 nodist_TESTS += $(haskell_tests)
 endif
 
@@ -655,14 +697,16 @@ TESTS_ENVIRONMENT = \
 
 all_python_code = \
 	$(dist_sbin_SCRIPTS) \
-	$(dist_tools_SCRIPTS) \
+	$(dist_tools_PYTHON) \
 	$(pkglib_python_scripts) \
+	$(nodist_pkglib_python_scripts) \
 	$(python_tests) \
 	$(pkgpython_PYTHON) \
 	$(client_PYTHON) \
 	$(hypervisor_PYTHON) \
 	$(rapi_PYTHON) \
 	$(server_PYTHON) \
+	$(pytools_PYTHON) \
 	$(http_PYTHON) \
 	$(confd_PYTHON) \
 	$(masterd_PYTHON) \
@@ -690,7 +734,7 @@ lint_python_code = \
 	ganeti \
 	ganeti/http/server.py \
 	$(dist_sbin_SCRIPTS) \
-	$(dist_tools_SCRIPTS) \
+	$(dist_tools_PYTHON) \
 	$(pkglib_python_scripts) \
 	$(BUILD_BASH_COMPLETION) \
 	$(DOCPP) \
@@ -790,6 +834,11 @@ htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in vcs-version
 	VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
 	sed -e "s/%ver%/$$VCSVER/" < $< > $@
 
+htools/Ganeti/Constants.hs: htools/Ganeti/Constants.hs.in \
+	lib/constants.py lib/_autoconf.py $(CONVERT_CONSTANTS)
+	set -e; \
+	{ cat $< ; PYTHONPATH=. $(CONVERT_CONSTANTS); } > $@
+
 lib/_autoconf.py: Makefile vcs-version | lib/.dir
 	set -e; \
 	VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
@@ -846,8 +895,14 @@ lib/_autoconf.py: Makefile vcs-version | lib/.dir
 	  echo "CONFD_USER = '$(CONFD_USER)'"; \
 	  echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
 	  echo "NODED_USER = '$(NODED_USER)'"; \
+	  echo "NODED_GROUP = '$(NODED_GROUP)'"; \
 	  echo "VCS_VERSION = '$$VCSVER'"; \
 	  echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \
+	  if [ "$(HTOOLS)" ]; then \
+	    echo "HTOOLS = True"; \
+	  else \
+	    echo "HTOOLS = False"; \
+	  fi; \
 	} > $@
 
 $(REPLACE_VARS_SED): Makefile
@@ -881,6 +936,7 @@ $(REPLACE_VARS_SED): Makefile
 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
 
 $(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
 	test -n "$(MODULE)" || { echo Missing module; exit 1; }
@@ -949,6 +1005,21 @@ check-local: check-dirs
 	$(CHECK_PYTHON_CODE) $(check_python_code)
 	$(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
 	$(CHECK_NEWS) < $(top_srcdir)/NEWS
+	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; \
+	fi; \
+	if test "`sed -ne '4 p' $(top_srcdir)/doc/iallocator.rst`" != \
+					"Documents Ganeti version $$expver"; then \
+		echo "Incorrect version in iallocator.rst, expected $$expver"; \
+		exit 1; \
+	fi
+
+.PHONY: hs-check
+hs-check: htools/test
+	@rm -f test.tix
+	./htools/test
 
 .PHONY: lint
 lint: $(BUILT_SOURCES)
@@ -1041,7 +1112,7 @@ 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
+	@mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Program
 	$(HSCOLOUR) -print-css > $(APIDOC_HS_DIR)/Ganeti/hscolour.css
 	ln -s ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/HTools/hscolour.css
 	set -e ; \
@@ -1050,7 +1121,10 @@ hs-apidoc: $(HS_BUILT_SRCS)
 	then OPTGHC="--optghc=$(HTOOLS_NOCURL)"; \
 	else OPTGHC=""; \
 	fi; \
-	RELSRCS="$(HS_LIB_SRCS:htools/%=%)"; \
+	if [ "$(HTOOLS_PARALLEL3)" ]; \
+	then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_PARALLEL3)"; \
+	fi; \
+	RELSRCS="$(HS_LIB_SRCS:htools/%=%)  $(HS_BUILT_SRCS:htools/%=%)"; \
 	for file in $$RELSRCS; do \
 		hfile=`echo $$file|sed 's/\\.hs$$//'`.html; \
 		$(HSCOLOUR) -css -anchor $$file > ../$(APIDOC_HS_DIR)/$$hfile ; \
@@ -1089,10 +1163,10 @@ py-coverage: $(BUILT_SOURCES) $(python_tests)
 .PHONY: hs-coverage
 hs-coverage: $(haskell_tests)
 	cd htools && rm -f *.tix *.mix && ./test
-	mkdir -p $(COVERAGE_HS_DIR)
+	@mkdir_p@ $(COVERAGE_HS_DIR)
 	hpc markup --destdir=$(COVERAGE_HS_DIR) htools/test $(HPCEXCL)
 	hpc report htools/test $(HPCEXCL)
-	ln -s hpc_index.html $(COVERAGE_HS_DIR)/index.html
+	ln -sf hpc_index.html $(COVERAGE_HS_DIR)/index.html
 
 # Special "kind-of-QA" target for htools, needs special setup (all
 # tools compiled with -fhpc)