REPLACE_VARS_SED = autotools/replace_vars.sed
CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants
BUILD_RPC = $(top_srcdir)/autotools/build-rpc
+SHELL_ENV_INIT = autotools/shell-env-init
# Note: these are automake-specific variables, and must be named after
# the directory + 'dir' suffix
htools/Ganeti \
htools/Ganeti/Confd \
htools/Ganeti/HTools \
- htools/Ganeti/HTools/Program
+ htools/Ganeti/HTools/Program \
+ htools/Ganeti/Query \
+ htest \
+ htest/Test \
+ htest/Test/Ganeti \
+ htest/Test/Ganeti/Confd \
+ htest/Test/Ganeti/HTools \
+ htest/Test/Ganeti/Query
DIRS = \
autotools \
qa \
test \
test/data \
- test/data/htools \
- test/data/htools/rapi \
test/data/ovfdata \
test/data/ovfdata/other \
+ htest/data \
+ htest/data/rapi \
+ htest/shelltests \
tools
BUILDTIME_DIR_AUTOCREATE = \
$(APIDOC_HS_DIR)/Ganeti/Confd \
$(APIDOC_HS_DIR)/Ganeti/HTools \
$(APIDOC_HS_DIR)/Ganeti/HTools/Program \
+ $(APIDOC_HS_DIR)/Ganeti/Query \
$(COVERAGE_DIR) \
$(COVERAGE_PY_DIR) \
$(COVERAGE_HS_DIR) \
$(PYTHON_BOOTSTRAP) \
epydoc.conf \
$(REPLACE_VARS_SED) \
+ $(SHELL_ENV_INIT) \
daemons/daemon-util \
daemons/ganeti-cleaner \
+ daemons/ganeti-master-cleaner \
devel/upload \
$(BUILT_EXAMPLES) \
doc/examples/bash_completion \
+ doc/examples/bash_completion-debug \
lib/_generated_rpc.py \
$(man_MANS) \
$(manhtml) \
tools/kvm-ifup \
+ tools/vcluster-setup \
stamp-directories \
stamp-srclinks \
$(nodist_pkgpython_PYTHON) \
$(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
$(HS_BUILT_TEST_HELPERS) \
- .hpc/*.mix htools/*.tix \
+ htools/ganeti-confd \
+ .hpc/*.mix htools/*.tix htest/*.tix \
doc/hs-lint.html
GENERATED_FILES = \
$(BUILT_PYTHON_SOURCES) \
$(PYTHON_BOOTSTRAP)
+HTOOLS_GENERATED_FILES =
+if WANT_HTOOLS
+HTOOLS_GENERATED_FILES += $(HS_PROGS)
+if ENABLE_CONFD
+HTOOLS_GENERATED_FILES += htools/hconfd
+endif
+endif
+
built_base_sources = \
stamp-directories \
stamp-srclinks
lib/mcpu.py \
lib/netutils.py \
lib/objects.py \
+ lib/objectutils.py \
lib/opcodes.py \
lib/ovf.py \
+ lib/pathutils.py \
lib/qlang.py \
lib/query.py \
lib/rpc.py \
lib/ssh.py \
lib/storage.py \
lib/uidpool.py \
+ lib/vcluster.py \
lib/workerpool.py
client_PYTHON = \
confd_PYTHON = \
lib/confd/__init__.py \
- lib/confd/client.py \
- lib/confd/querylib.py \
- lib/confd/server.py
+ lib/confd/client.py
masterd_PYTHON = \
lib/masterd/__init__.py \
+ lib/masterd/iallocator.py \
lib/masterd/instance.py
impexpd_PYTHON = \
server_PYTHON = \
lib/server/__init__.py \
- lib/server/confd.py \
lib/server/masterd.py \
lib/server/noded.py \
lib/server/rapi.py
doc/design-network.rst \
doc/design-chained-jobs.rst \
doc/design-ovf-support.rst \
+ doc/design-autorepair.rst \
doc/design-resource-model.rst \
doc/cluster-merge.rst \
doc/design-shared-storage.rst \
doc/design-node-state-cache.rst \
doc/design-virtual-clusters.rst \
doc/design-bulk-create.rst \
+ doc/design-query-splitting.rst \
doc/devnotes.rst \
doc/glossary.rst \
doc/hooks.rst \
doc/locking.rst \
doc/move-instance.rst \
doc/news.rst \
+ doc/ovfconverter.rst \
doc/rapi.rst \
doc/security.rst \
doc/upgrade.rst \
+ doc/virtual-cluster.rst \
doc/walkthrough.rst
HS_PROGS = htools/htools
HS_BIN_ROLES = hbal hscan hspace hinfo hcheck
+HS_HTOOLS_PROGS = $(HS_BIN_ROLES) hail
-HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools htools/hconfd
+HS_ALL_PROGS = $(HS_PROGS) htest/test htest/hpc-htools htools/hconfd
HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
-HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/%) test/hail
+HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=htest/%) htest/hail
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)
+# internal extra flags (used for htest/test mainly)
HEXTRA_INT =
# exclude options for coverage reports
HPCEXCL = --exclude Main \
--exclude Ganeti.Constants \
--exclude Ganeti.THH \
--exclude Ganeti.HTools.QC \
- --exclude Ganeti.HTools.QCHelper \
- --exclude Ganeti.HTools.Version
+ --exclude Ganeti.Version \
+ --exclude Test.Ganeti.TestCommon \
+ --exclude Test.Ganeti.TestHTools \
+ --exclude Test.Ganeti.TestHelper \
+ --exclude Test.Ganeti.TestImports \
+ $(patsubst htools.%,--exclude Test.%,$(subst /,.,$(patsubst %.hs,%, $(HS_LIB_SRCS))))
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 \
htools/Ganeti/HTools/IAlloc.hs \
htools/Ganeti/HTools/Instance.hs \
- htools/Ganeti/HTools/JSON.hs \
htools/Ganeti/HTools/Loader.hs \
htools/Ganeti/HTools/Luxi.hs \
htools/Ganeti/HTools/Node.hs \
htools/Ganeti/HTools/PeerMap.hs \
- htools/Ganeti/HTools/QC.hs \
- htools/Ganeti/HTools/QCHelper.hs \
htools/Ganeti/HTools/Rapi.hs \
htools/Ganeti/HTools/Simu.hs \
htools/Ganeti/HTools/Text.hs \
htools/Ganeti/HTools/Program/Hscan.hs \
htools/Ganeti/HTools/Program/Hspace.hs \
htools/Ganeti/BasicTypes.hs \
+ htools/Ganeti/Common.hs \
+ htools/Ganeti/Compat.hs \
htools/Ganeti/Confd.hs \
htools/Ganeti/Confd/Server.hs \
+ htools/Ganeti/Confd/Utils.hs \
htools/Ganeti/Config.hs \
htools/Ganeti/Daemon.hs \
htools/Ganeti/Hash.hs \
htools/Ganeti/Jobs.hs \
+ htools/Ganeti/JSON.hs \
htools/Ganeti/Logging.hs \
htools/Ganeti/Luxi.hs \
htools/Ganeti/Objects.hs \
htools/Ganeti/OpCodes.hs \
+ htools/Ganeti/Path.hs \
+ htools/Ganeti/Query/Common.hs \
+ htools/Ganeti/Query/Filter.hs \
+ htools/Ganeti/Query/Group.hs \
+ htools/Ganeti/Query/Language.hs \
+ htools/Ganeti/Query/Node.hs \
+ htools/Ganeti/Query/Query.hs \
+ htools/Ganeti/Query/Server.hs \
+ htools/Ganeti/Query/Types.hs \
+ htools/Ganeti/Rpc.hs \
htools/Ganeti/Runtime.hs \
htools/Ganeti/Ssconf.hs \
- htools/Ganeti/THH.hs \
- htools/Ganeti/Query2.hs
-
-HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs htools/Ganeti/Constants.hs
+ htools/Ganeti/THH.hs
+
+HS_TEST_SRCS = \
+ htest/Test/Ganeti/BasicTypes.hs \
+ htest/Test/Ganeti/Common.hs \
+ htest/Test/Ganeti/Daemon.hs \
+ htest/Test/Ganeti/Confd/Utils.hs \
+ htest/Test/Ganeti/HTools/CLI.hs \
+ htest/Test/Ganeti/HTools/Cluster.hs \
+ htest/Test/Ganeti/HTools/Container.hs \
+ htest/Test/Ganeti/HTools/Instance.hs \
+ htest/Test/Ganeti/HTools/Loader.hs \
+ htest/Test/Ganeti/HTools/Node.hs \
+ htest/Test/Ganeti/HTools/PeerMap.hs \
+ htest/Test/Ganeti/HTools/Simu.hs \
+ htest/Test/Ganeti/HTools/Text.hs \
+ htest/Test/Ganeti/HTools/Types.hs \
+ htest/Test/Ganeti/HTools/Utils.hs \
+ htest/Test/Ganeti/JSON.hs \
+ htest/Test/Ganeti/Jobs.hs \
+ htest/Test/Ganeti/Luxi.hs \
+ htest/Test/Ganeti/Objects.hs \
+ htest/Test/Ganeti/OpCodes.hs \
+ htest/Test/Ganeti/Query/Filter.hs \
+ htest/Test/Ganeti/Query/Language.hs \
+ htest/Test/Ganeti/Query/Query.hs \
+ htest/Test/Ganeti/Rpc.hs \
+ htest/Test/Ganeti/Ssconf.hs \
+ htest/Test/Ganeti/TestCommon.hs \
+ htest/Test/Ganeti/TestHTools.hs \
+ htest/Test/Ganeti/TestHelper.hs
+
+HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS)
+
+HS_BUILT_SRCS = \
+ htest/Test/Ganeti/TestImports.hs \
+ htools/Ganeti/Constants.hs \
+ htools/Ganeti/Version.hs
HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
$(RUN_IN_TEMPDIR): | stamp-directories
doc/html \
$(BUILT_EXAMPLES) \
doc/examples/bash_completion \
+ doc/examples/bash_completion-debug \
$(manhtml)
gnt_scripts = \
daemons/ganeti-rapi \
$(gnt_scripts)
-if PY_CONFD
-PYTHON_BOOTSTRAP_SBIN += daemons/ganeti-confd
-endif
-
PYTHON_BOOTSTRAP = \
$(PYTHON_BOOTSTRAP_SBIN) \
tools/ensure-dirs
$(LN_S) -f htools \
$(DESTDIR)$(bindir)/$$role ; \
done
-if HS_CONFD
- mv $(DESTDIR)$(sbindir)/hconfd $(DESTDIR)$(sbindir)/ganeti-confd
-endif
endif
-$(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile
+$(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile
@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 \
+ @if [ "$(notdir $@)" = "test" ] && [ -z "$(GHC_PKG_QUICKCHECK)" ]; then \
echo "Error: cannot run unittests without the QuickCheck library (see devnotes.rst)" 1>&2; \
exit 1; \
fi
- rm -f $(@:htools/%=%).tix
- BINARY=$(@:htools/%=%); $(GHC) --make \
+ @rm -f $(notdir $@).tix
+ $(GHC) --make \
$(HFLAGS) \
$(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \
- -osuf $$BINARY.o -hisuf $$BINARY.hi \
+ -osuf $(notdir $@).o -hisuf $(notdir $@).hi \
$(HEXTRA) $(HEXTRA_INT) $@
@touch "$@"
-# for the htools/test binary, we need to enable profiling/coverage
-htools/test: HEXTRA_INT=-fhpc
+# for the htest/test binary, we need to enable profiling/coverage
+htest/test: HEXTRA_INT=-fhpc -ihtest
# we compile the hpc-htools binary with the program coverage
-htools/hpc-htools: HEXTRA_INT=-fhpc
+htest/hpc-htools: HEXTRA_INT=-fhpc
# test dependency
-htools/offline-tests.sh: htools/hpc-htools
+htest/offline-tests.sh: htest/hpc-htools
# rules for building profiling-enabled versions of the haskell
# programs: hs-prof does the full two-step build, whereas
nodist_sbin_SCRIPTS = \
$(PYTHON_BOOTSTRAP_SBIN) \
- daemons/ganeti-cleaner
+ daemons/ganeti-cleaner \
+ daemons/ganeti-master-cleaner
-if HS_CONFD
-nodist_sbin_SCRIPTS += htools/hconfd
+if ENABLE_CONFD
+htools/ganeti-confd: htools/hconfd
+ cp -f $< $@
+
+nodist_sbin_SCRIPTS += htools/ganeti-confd
endif
python_scripts = \
tools/xm-console-wrapper \
tools/master-ip-setup
+nodist_tools_SCRIPTS = \
+ tools/vcluster-setup
+
pkglib_python_scripts = \
daemons/import-export \
tools/check-cert-expired
$(RUN_IN_TEMPDIR) \
daemons/daemon-util.in \
daemons/ganeti-cleaner.in \
+ daemons/ganeti-master-cleaner.in \
$(pkglib_python_scripts) \
devel/upload.in \
tools/kvm-ifup.in \
+ tools/vcluster-setup.in \
$(docdot) \
$(docpng) \
$(docrst) \
$(maninput) \
qa/qa-sample.json \
$(qa_scripts) \
- $(HS_LIB_SRCS) $(HS_BUILT_SRCS_IN) \
+ $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS_IN) \
$(HS_PROG_SRCS) \
htools/lint-hints.hs \
- htools/cli-tests-defs.sh \
- htools/offline-test.sh
+ htest/cli-tests-defs.sh \
+ htest/offline-test.sh
man_MANS = \
man/ganeti.7 \
man/ganeti-cleaner.8 \
+ man/ganeti-master-cleaner.8 \
man/ganeti-confd.8 \
man/ganeti-listrunner.8 \
man/ganeti-masterd.8 \
test/data/kvm_0.12.5_help.txt \
test/data/kvm_0.9.1_help.txt \
test/data/sys_drbd_usermode_helper.txt \
- test/data/htools/hail-alloc-drbd.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-split-insts.data \
- test/data/htools/common-suffix.data \
- test/data/htools/invalid-node.data \
- test/data/htools/missing-resources.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/ovfdata/compr_disk.vmdk.gz \
test/data/ovfdata/config.ini \
test/data/ovfdata/corrupted_resources.ovf \
test/import-export_unittest-helper \
test/gnt-cli.test \
test/ganeti-cli.test \
- test/htools-balancing.test \
- test/htools-basic.test \
- test/htools-dynutil.test \
- test/htools-excl.test \
- test/htools-hail.test \
- test/htools-hspace.test \
- test/htools-invalid.test \
- test/htools-multi-group.test \
- test/htools-no-backend.test \
- test/htools-rapi.test \
- test/htools-single-group.test \
- test/htools-text-backend.test
+ htest/shelltests/htools-balancing.test \
+ htest/shelltests/htools-basic.test \
+ htest/shelltests/htools-dynutil.test \
+ htest/shelltests/htools-excl.test \
+ htest/shelltests/htools-hail.test \
+ htest/shelltests/htools-hspace.test \
+ htest/shelltests/htools-invalid.test \
+ htest/shelltests/htools-multi-group.test \
+ htest/shelltests/htools-no-backend.test \
+ htest/shelltests/htools-rapi.test \
+ htest/shelltests/htools-single-group.test \
+ htest/shelltests/htools-text-backend.test \
+ htest/data/hail-alloc-drbd.json \
+ htest/data/hail-change-group.json \
+ htest/data/hail-invalid-reloc.json \
+ htest/data/hail-node-evac.json \
+ htest/data/hail-reloc-drbd.json \
+ htest/data/hbal-split-insts.data \
+ htest/data/common-suffix.data \
+ htest/data/invalid-node.data \
+ htest/data/missing-resources.data \
+ htest/data/rapi/groups.json \
+ htest/data/rapi/info.json \
+ htest/data/rapi/instances.json \
+ htest/data/rapi/nodes.json
python_tests = \
doc/examples/rapi_testutils.py \
test/ganeti.jstore_unittest.py \
test/ganeti.locking_unittest.py \
test/ganeti.luxi_unittest.py \
+ test/ganeti.masterd.iallocator_unittest.py \
test/ganeti.masterd.instance_unittest.py \
test/ganeti.mcpu_unittest.py \
test/ganeti.netutils_unittest.py \
test/ganeti.objects_unittest.py \
+ test/ganeti.objectutils_unittest.py \
test/ganeti.opcodes_unittest.py \
test/ganeti.ovf_unittest.py \
test/ganeti.qlang_unittest.py \
test/ganeti.utils.filelock_unittest.py \
test/ganeti.utils.hash_unittest.py \
test/ganeti.utils.io_unittest.py \
+ test/ganeti.utils.io_unittest-runasroot.py \
test/ganeti.utils.log_unittest.py \
test/ganeti.utils.mlock_unittest.py \
test/ganeti.utils.nodesetup_unittest.py \
test/ganeti.utils.wrapper_unittest.py \
test/ganeti.utils.x509_unittest.py \
test/ganeti.utils_unittest.py \
+ test/ganeti.vcluster_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 \
test/tempfile_fork_unittest.py
-if HAS_FAKEROOT
-python_tests += test/ganeti.utils.io_unittest-runasroot.py
-endif
-haskell_tests = htools/test
+haskell_tests = htest/test
dist_TESTS = \
test/check-cert-expired_unittest.bash \
test/ganeti-cleaner_unittest.bash \
test/import-export_unittest.bash \
test/cli-test.bash \
+ test/bash_completion.bash \
$(python_tests)
nodist_TESTS =
if WANT_HTOOLSTESTS
nodist_TESTS += $(haskell_tests)
-dist_TESTS += htools/offline-test.sh
-check_SCRIPTS += htools/hpc-htools $(HS_BUILT_TEST_HELPERS)
+dist_TESTS += htest/offline-test.sh
+check_SCRIPTS += htest/hpc-htools $(HS_BUILT_TEST_HELPERS)
endif
TESTS = $(dist_TESTS) $(nodist_TESTS)
test/ganeti-cleaner_unittest.bash \
test/import-export_unittest.bash \
test/cli-test.bash \
- htools/offline-test.sh \
- htools/cli-tests-defs.sh \
+ test/bash_completion.bash \
+ htest/offline-test.sh \
+ htest/cli-tests-defs.sh \
$(all_python_code) \
- $(HS_LIB_SRCS) $(HS_PROG_SRCS)
+ $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS)
check_python_code = \
$(BUILD_BASH_COMPLETION) \
test/daemon-util_unittest.bash: daemons/daemon-util
-test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
+test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner \
+ daemons/ganeti-master-cleaner
+
+test/bash_completion.bash: doc/examples/bash_completion-debug
tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod u+x $@
+tools/vcluster-setup: tools/vcluster-setup.in $(REPLACE_VARS_SED)
+ sed -f $(REPLACE_VARS_SED) < $< > $@
+ chmod +x $@
+
daemons/%:: daemons/%.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
doc/examples/%:: doc/examples/%.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
-doc/examples/bash_completion: $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
+doc/examples/bash_completion: BC_ARGS = --compact
+doc/examples/bash_completion-debug: BC_ARGS =
+
+doc/examples/bash_completion doc/examples/bash_completion-debug: \
+ $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin \
- $(GENERATED_FILES)
- PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_BASH_COMPLETION) > $@
+ $(GENERATED_FILES) $(HTOOLS_GENERATED_FILES)
+ PYTHONPATH=. $(RUN_IN_TEMPDIR) \
+ $(CURDIR)/$(BUILD_BASH_COMPLETION) $(BC_ARGS) > $@
doc/%.png: doc/%.dot
@test -n "$(DOT)" || { echo 'dot' not found during configure; exit 1; }
$(MAKE) $(AM_MAKEFLAGS) vcs-version; \
fi
-htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in \
+htools/Ganeti/Version.hs: htools/Ganeti/Version.hs.in \
vcs-version $(built_base_sources)
set -e; \
VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
set -e; \
{ cat $< ; PYTHONPATH=. $(CONVERT_CONSTANTS); } > $@
+htest/Test/Ganeti/TestImports.hs: htest/Test/Ganeti/TestImports.hs.in \
+ $(built_base_sources)
+ set -e; \
+ { cat $< ; \
+ echo ; \
+ for name in $(filter-out Ganeti.THH,$(subst /,.,$(patsubst %.hs,%,$(patsubst htools/%,%,$(HS_LIB_SRCS))))) ; do \
+ echo "import $$name ()" ; \
+ done ; \
+ } > $@
+
lib/_autoconf.py: Makefile | stamp-directories
set -e; \
{ echo '# This file is automatically generated, do not edit!'; \
echo "LOCALSTATEDIR = '$(localstatedir)'"; \
echo "SYSCONFDIR = '$(sysconfdir)'"; \
echo "SSH_CONFIG_DIR = '$(SSH_CONFIG_DIR)'"; \
+ echo "SSH_LOGIN_USER = '$(SSH_LOGIN_USER)'"; \
+ echo "SSH_CONSOLE_USER = '$(SSH_CONSOLE_USER)'"; \
echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \
echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
echo "TOOLSDIR = '$(toolsdir)'"; \
echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
+ echo "HTOOLS_PROGS = [$(foreach i,$(HS_HTOOLS_PROGS),'$(i)',)]"; \
echo "PKGLIBDIR = '$(pkglibdir)'"; \
echo "DRBD_BARRIERS = '$(DRBD_BARRIERS)'"; \
echo "DRBD_NO_META_FLUSH = $(DRBD_NO_META_FLUSH)"; \
echo "HTOOLS = False"; \
fi; \
echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
- echo "PY_CONFD = $(PY_CONFD)"; \
- echo "HS_CONFD = $(HS_CONFD)"; \
echo "XEN_CMD = '$(XEN_CMD)'"; \
+ echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
} > $@
lib/_vcsversion.py: Makefile vcs-version | stamp-directories
lib/_generated_rpc.py: lib/rpc_defs.py $(BUILD_RPC)
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_RPC) lib/rpc_defs.py > $@
-$(REPLACE_VARS_SED): Makefile stamp-directories
+$(SHELL_ENV_INIT): Makefile stamp-directories
+ set -e; \
+ { echo '# Allow overriding for tests'; \
+ echo 'readonly LOCALSTATEDIR=$${LOCALSTATEDIR:-$${GANETI_ROOTDIR:-}$(localstatedir)}'; \
+ echo 'readonly SYSCONFDIR=$${SYSCONFDIR:-$${GANETI_ROOTDIR:-}$(sysconfdir)}'; \
+ echo; \
+ echo 'readonly PKGLIBDIR=$(pkglibdir)'; \
+ echo 'readonly LOG_DIR="$$LOCALSTATEDIR/log/ganeti"'; \
+ echo 'readonly RUN_DIR="$$LOCALSTATEDIR/run/ganeti"'; \
+ echo 'readonly DATA_DIR="$$LOCALSTATEDIR/lib/ganeti"'; \
+ echo 'readonly CONF_DIR="$$SYSCONFDIR/ganeti"'; \
+ } > $@
+
+$(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
set -e; \
{ echo 's#@PREFIX@#$(prefix)#g'; \
echo 's#@SYSCONFDIR@#$(sysconfdir)#g'; \
echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
echo 's#@CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
echo 's#@MODULES@#$(strip $(lint_python_code))#g'; \
+ echo 's#@ENABLE_SPLIT_QUERY@#$(ENABLE_SPLIT_QUERY)#g'; \
+ echo; \
+ echo '/^@SHELL_ENV_INIT@$$/ {'; \
+ echo ' r $(SHELL_ENV_INIT)'; \
+ echo ' d'; \
+ echo '}'; \
} > $@
# Using deferred evaluation
daemons/ganeti-watcher: MODULE = ganeti.watcher
scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
tools/ensure-dirs: MODULE = ganeti.tools.ensure_dirs
-$(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst test/%,%,$@)
+$(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst htest/%,%,$@)
$(PYTHON_BOOTSTRAP): Makefile | stamp-directories
test -n "$(MODULE)" || { echo Missing module; exit 1; }
echo '# This file is automatically generated, do not edit!'; \
echo "# Edit Makefile.am instead."; \
echo; \
- echo "HTOOLS=$(TESTROLE) exec ./htools/hpc-htools \"\$$@\""; \
+ echo "HTOOLS=$(TESTROLE) exec ./htest/hpc-htools \"\$$@\""; \
} > $@
chmod u+x $@
echo "Incorrect version in README, expected $$expver"; \
exit 1; \
fi; \
- for file in doc/iallocator.rst doc/hooks.rst; do \
+ for file in doc/iallocator.rst doc/hooks.rst doc/virtual-cluster.rst; do \
if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \
"Documents Ganeti version $$expver"; then \
echo "Incorrect version in $$file, expected $$expver"; \
done
.PHONY: hs-check
-hs-check: htools/test htools/hpc-htools $(HS_BUILT_TEST_HELPERS)
+hs-check: htest/test htest/hpc-htools $(HS_BUILT_TEST_HELPERS)
@rm -f test.tix
- ./htools/test
- HBINARY="./htools/hpc-htools" ./htools/offline-test.sh
+ ./htest/test
+ HBINARY="./htest/hpc-htools" ./htest/offline-test.sh
# E111: indentation is not a multiple of four
+# E121: continuation line indentation is not a multiple of four
+# (since our indent level is not 4)
+# E125: continuation line does not distinguish itself from next logical line
+# (since our indent level is not 4)
+# E127: continuation line over-indented for visual indent
+# (since our indent level is not 4)
+# note: do NOT add E128 here; it's a valid style error in most cases!
+# I've seen real errors, but also some cases were we indent wrongly
+# due to line length; try to rework the cases where it is triggered,
+# instead of silencing it
# E261: at least two spaces before inline comment
# E501: line too long (80 characters)
-PEP8_IGNORE = E111,E261,E501
+PEP8_IGNORE = E111,E121,E125,E127,E261,E501
# For excluding pep8 expects filenames only, not whole paths
PEP8_EXCLUDE = $(subst $(space),$(comma),$(strip $(notdir $(BUILT_PYTHON_SOURCES))))
$(PEP8) --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \
--repeat $(pep8_python_code)
+# FIXME: remove ignore "Use void" when GHC 6.x is deprecated
.PHONY: hlint
hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs
@test -n "$(HLINT)" || { echo 'hlint' not found during configure; exit 1; }
--ignore "Use comparing" \
--ignore "Use on" \
--ignore "Reduce duplication" \
+ --ignore "Use &&&" \
+ --ignore "Use void" \
--hint htools/lint-hints \
- $(filter-out htools/Ganeti/THH.hs,$(HS_LIB_SRCS))
+ $(filter-out htools/Ganeti/THH.hs,$(HS_LIBTEST_SRCS))
# a dist hook rule for updating the vcs-version file; this is
# hardcoded due to where it needs to build the file...
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 \
rm -rf $(APIDOC_HS_DIR)/*
@mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Program
@mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Confd
+ @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Query
$(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
if [ "$(HTOOLS_PARALLEL3)" ]; \
then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_PARALLEL3)"; \
fi; \
- RELSRCS="$(HS_LIB_SRCS:htools/%=%) $(HS_BUILT_SRCS:htools/%=%)"; \
+ 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 ; \
.PHONY: TAGS
TAGS: $(GENERATED_FILES)
rm -f TAGS
- $(GHC) -e ":etags" -v0 $(HFLAGS) $(HS_LIB_SRCS)
+ $(GHC) -e ":etags" -v0 $(HFLAGS) $(HS_LIBTEST_SRCS)
find . -path './lib/*.py' -o -path './scripts/gnt-*' -o \
-path './daemons/ganeti-*' -o -path './tools/*' -o \
-path './qa/*.py' | \
$(python_tests)
.PHONY: hs-coverage
-hs-coverage: $(haskell_tests) htools/hpc-htools
+hs-coverage: $(haskell_tests) htest/hpc-htools
rm -f *.tix
$(MAKE) $(AM_MAKEFLAGS) hs-check
@mkdir_p@ $(COVERAGE_HS_DIR)
projects / ganeti-local / blobdiff