BUILD_RPC = $(top_srcdir)/autotools/build-rpc
SHELL_ENV_INIT = autotools/shell-env-init
+# starting as of Ganeti 2.10, all files are stored in a single directory,
+# with only symbolic links added at other places.
+versiondir = $(libdir)/ganeti-$(VERSION)
+
# Note: these are automake-specific variables, and must be named after
# the directory + 'dir' suffix
+pkglibdir = $(versiondir)$(libdir)/ganeti
+myexeclibdir = $(pkglibdir)
+bindir = $(versiondir)$(exec_prefix)/bin
+sbindir = $(versiondir)$(exec_prefix)/sbin
+mandir = $(versiondir)$(datarootdir)/man
+pkgpythondir = $(versiondir)$(pythondir)/ganeti
+
clientdir = $(pkgpythondir)/client
cmdlibdir = $(pkgpythondir)/cmdlib
hypervisordir = $(pkgpythondir)/hypervisor
toolsdir = $(pkglibdir)/tools
iallocatorsdir = $(pkglibdir)/iallocators
pytoolsdir = $(pkgpythondir)/tools
-docdir = $(datadir)/doc/$(PACKAGE)
-myexeclibdir = $(pkglibdir)
+docdir = $(versiondir)$(datadir)/doc/$(PACKAGE)
+
+SYMLINK_TARGET_DIRS = \
+ $(pythondir) \
+ $(libdir)/ganeti/iallocators \
+ $(exec_prefix)/bin \
+ $(exec_prefix)/sbin \
+ $(datarootdir)/man/man1 \
+ $(datarootdir)/man/man7 \
+ $(datarootdir)/man/man8
+SYMLINK_DIRS = \
+ $(pythondir)/ganeti \
+ $(libdir)/ganeti/tools
# Delete output file if an error occurred while building it
.DELETE_ON_ERROR:
src/ganeti-confd \
src/ganeti-luxid \
src/ganeti-mond \
+ src/hs2py-constants \
.hpc/*.mix src/*.tix test/hs/*.tix \
doc/hs-lint.html
built_python_base_sources = \
lib/_autoconf.py \
+ lib/_constants.py \
lib/_vcsversion.py \
lib/opcodes.py
doc/design-x509-ca.rst \
doc/design-hroller.rst \
doc/design-storagetypes.rst \
+ doc/design-upgrade.rst \
doc/devnotes.rst \
doc/glossary.rst \
doc/hooks.rst \
test/hs/htest \
$(HS_COMPILE_PROGS)
-HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
+HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS)) src/hs2py-constants.hs
HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/hs/%) test/hs/hail
HFLAGS = \
src/Ganeti/Confd/Utils.hs \
src/Ganeti/Config.hs \
src/Ganeti/ConfigReader.hs \
+ src/Ganeti/Constants.hs \
src/Ganeti/Cpu/LoadParser.hs \
src/Ganeti/Cpu/Types.hs \
src/Ganeti/Curl/Multi.hs \
src/Ganeti/Hypervisor/Xen/XmParser.hs \
src/Ganeti/Hypervisor/Xen/Types.hs \
src/Ganeti/Hash.hs \
+ src/Ganeti/Hs2Py/GenConstants.hs \
src/Ganeti/Hs2Py/GenOpCodes.hs \
src/Ganeti/Hs2Py/OpDoc.hs \
+ src/Ganeti/HsConstants.hs \
src/Ganeti/JQueue.hs \
src/Ganeti/JSON.hs \
src/Ganeti/Jobs.hs \
src/Ganeti/OpParams.hs \
src/Ganeti/Path.hs \
src/Ganeti/Parsers.hs \
+ src/Ganeti/PyValueInstances.hs \
src/Ganeti/Query/Cluster.hs \
src/Ganeti/Query/Common.hs \
src/Ganeti/Query/Export.hs \
HS_BUILT_SRCS = \
test/hs/Test/Ganeti/TestImports.hs \
- src/Ganeti/Constants.hs \
+ src/Ganeti/Hs2Py/ListConstants.hs \
+ src/Ganeti/PyConstants.hs \
src/Ganeti/Curl/Internal.hs \
src/Ganeti/Version.hs
HS_BUILT_SRCS_IN = \
$(patsubst %,%.in,$(filter-out src/Ganeti/Curl/Internal.hs,$(HS_BUILT_SRCS))) \
src/Ganeti/Curl/Internal.hsc \
+ lib/_constants.py.in \
lib/opcodes.py.in_after \
lib/opcodes.py.in_before
done
endif
+# This target cannot be merged with the '$(HS_ALL_PROGS)' target
+# because 'hs2py-constants' cannot depend on 'Ganeti.Constants'. And
+# the reason for this is because 'hs2py-constants' needs to generate
+# Python code, and 'Ganeti.Constants' is generated by Python.
+src/hs2py-constants: src/hs2py-constants.hs src/Ganeti/BasicTypes.hs \
+ src/Ganeti/JSON.hs src/Ganeti/THH.hs \
+ src/Ganeti/Hs2Py/GenConstants.hs \
+ src/Ganeti/Hs2Py/ListConstants.hs \
+ src/Ganeti/HsConstants.hs \
+ src/Ganeti/PyValueInstances.hs \
+ | stamp-srclinks
+ $(GHC) --make \
+ $(HFLAGS) \
+ -osuf $(notdir $@).o -hisuf $(notdir $@).hi \
+ $(HEXTRA) $(HEXTRA_INT) src/hs2py-constants.hs
+
$(HS_ALL_PROGS): %: %.hs $(HS_LIBTESTBUILT_SRCS) Makefile
@if [ "$(notdir $@)" = "test" ] && [ "$(HS_NODEV)" ]; then \
echo "Error: cannot run unittests without the development" \
$(PYTHON_BOOTSTRAP_SBIN) \
daemons/ganeti-cleaner
+# strip path prefixes off the sbin scripts
+all_sbin_scripts = \
+ $(patsubst tools/%,%,$(patsubst daemons/%,%,$(patsubst scripts/%,%,\
+ $(patsubst src/%,%,$(dist_sbin_SCRIPTS) $(nodist_sbin_SCRIPTS)))))
+
if ENABLE_CONFD
src/ganeti-confd: src/hconfd
cp -f $< $@
nodist_myexeclib_SCRIPTS = \
$(nodist_pkglib_python_scripts)
+# strip path prefixes off the lib python scripts
+all_myexeclib_scripts = \
+ $(patsubst tools/%,%,$(patsubst daemons/%,%,\
+ $(patsubst src/%,%,$(myexeclib_SCRIPTS) $(nodist_myexeclib_SCRIPTS))))
+
EXTRA_DIST = \
NEWS \
UPGRADE \
epydoc.conf.in \
pylintrc \
+ pylintrc-test \
autotools/build-bash-completion \
autotools/build-rpc \
autotools/check-header \
$(patsubst %.html,%.html.in,$(manhtml)) \
$(mangen)
+manfullpath = $(patsubst man/%.1,man1/%.1,\
+ $(patsubst man/%.7,man7/%.7,\
+ $(patsubst man/%.8,man8/%.8,$(man_MANS))))
+
TEST_FILES = \
test/autotools/autotools-check-news.test \
test/data/htools/clean-nonzero-score.data \
python_tests = \
doc/examples/rapi_testutils.py \
+ test/py/cmdlib/cluster_unittest.py \
+ test/py/cmdlib/cmdlib_unittest.py \
+ test/py/cmdlib/group_unittest.py \
+ test/py/cmdlib/instance_unittest.py \
+ test/py/cmdlib/instance_storage_unittest.py \
test/py/cmdlib/test_unittest.py \
test/py/cfgupgrade_unittest.py \
test/py/docs_unittest.py \
test/py/ganeti.client.gnt_cluster_unittest.py \
test/py/ganeti.client.gnt_instance_unittest.py \
test/py/ganeti.client.gnt_job_unittest.py \
- test/py/ganeti.cmdlib_unittest.py \
- test/py/ganeti.cmdlib.cluster_unittest.py \
- test/py/ganeti.cmdlib.instance_storage_unittest.py \
test/py/ganeti.compat_unittest.py \
test/py/ganeti.confd.client_unittest.py \
test/py/ganeti.config_unittest.py \
test/py/cmdlib/testsupport/config_mock.py \
test/py/cmdlib/testsupport/iallocator_mock.py \
test/py/cmdlib/testsupport/lock_manager_mock.py \
+ test/py/cmdlib/testsupport/netutils_mock.py \
test/py/cmdlib/testsupport/processor_mock.py \
- test/py/cmdlib/testsupport/rpc_runner_mock.py
+ test/py/cmdlib/testsupport/rpc_runner_mock.py \
+ test/py/cmdlib/testsupport/ssh_mock.py \
+ test/py/cmdlib/testsupport/util.py
haskell_tests = test/hs/htest
$(CHECK_HEADER) \
$(DOCPP) \
$(PYTHON_BOOTSTRAP) \
- qa
+ qa \
+ $(python_test_support)
test/py/daemon-util_unittest.bash: daemons/daemon-util
VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
sed -e "s/%ver%/$$VCSVER/" < $< > $@
-src/Ganeti/Constants.hs: src/Ganeti/Constants.hs.in \
+src/Ganeti/Hs2Py/ListConstants.hs: src/Ganeti/Hs2Py/ListConstants.hs.in \
+ src/Ganeti/HsConstants.hs \
+ | stamp-directories
+ @echo Generating $@
+ @set -e; \
+## Extract constant names from 'HsConstants.hs' by extracting the left
+## side of all lines containing an equal sign (i.e., '=') and
+## prepending the apostrophe sign (i.e., "'").
+##
+## For example, the constant
+## adminstDown = ...
+## becomes
+## 'adminstDown
+ NAMES=$$(sed -n -e "/=/ s/\(.*\) =.*/ '\1:/g p" \
+ $(abs_top_srcdir)/src/Ganeti/HsConstants.hs); \
+ m4 -DPY_CONSTANT_NAMES="$$NAMES" $(abs_top_srcdir)/$< > $@
+
+src/Ganeti/PyConstants.hs: src/Ganeti/PyConstants.hs.in \
lib/constants.py lib/_autoconf.py lib/luxi.py lib/errors.py \
lib/jstore.py $(RUN_IN_TEMPDIR) \
$(CONVERT_CONSTANTS) $(built_base_sources) \
echo "}"; \
} > $@
+lib/_constants.py: Makefile lib/_constants.py.in src/hs2py-constants \
+ | stamp-directories
+ cat $(abs_top_srcdir)/lib/_constants.py.in > $@
+ src/hs2py-constants >> $@
+
+lib/constants.py: lib/_constants.py
+
lib/_vcsversion.py: Makefile vcs-version | stamp-directories
set -e; \
VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
echo "VCS_VERSION = '$$VCSVER'"; \
} > $@
-lib/opcodes.py: Makefile src/hs2py src/Ganeti/Constants.hs \
+lib/opcodes.py: Makefile src/hs2py src/Ganeti/PyConstants.hs \
lib/opcodes.py.in_before lib/opcodes.py.in_after \
| stamp-directories
cat $(abs_top_srcdir)/lib/opcodes.py.in_before > $@
{ echo 's#@''PREFIX@#$(prefix)#g'; \
echo 's#@''SYSCONFDIR@#$(sysconfdir)#g'; \
echo 's#@''LOCALSTATEDIR@#$(localstatedir)#g'; \
- echo 's#@''BINDIR@#$(bindir)#g'; \
- echo 's#@''SBINDIR@#$(sbindir)#g'; \
+ echo 's#@''BINDIR@#$(execprefix)/bin#g'; \
+ echo 's#@''SBINDIR@#$(execprefix)/sbin#g'; \
echo 's#@''LIBDIR@#$(libdir)#g'; \
echo 's#@''GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
echo 's#@''CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
echo 's#@''CUSTOM_IALLOCATOR_SEARCH_PATH@#$(IALLOCATOR_SEARCH_PATH)#g'; \
echo 's#@''CUSTOM_EXPORT_DIR@#$(EXPORT_DIR)#g'; \
echo 's#@''RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \
- echo 's#@''PKGLIBDIR@#$(pkglibdir)#g'; \
+ echo 's#@''PKGLIBDIR@#$(libdir)/ganeti#g'; \
echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \
echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \
# For excluding pep8 expects filenames only, not whole paths
PEP8_EXCLUDE = $(subst $(space),$(comma),$(strip $(notdir $(BUILT_PYTHON_SOURCES))))
-LINT_TARGETS = pylint pylint-qa
+LINT_TARGETS = pylint pylint-qa pylint-test
if HAS_PEP8
LINT_TARGETS += pep8
endif
cd $(top_srcdir)/qa && \
PYTHONPATH=$(abs_top_srcdir) $(PYLINT) $(LINT_OPTS) \
--rcfile ../pylintrc $(patsubst qa/%.py,%,$(qa_scripts))
+# FIXME: lint all test code, not just the newly added test support
+pylint-test: $(GENERATED_FILES)
+ @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }
+ cd $(top_srcdir) && \
+ PYTHONPATH=.:./test/py $(PYLINT) $(LINT_OPTS) \
+ --rcfile=pylintrc-test $(python_test_support)
.PHONY: pep8
pep8: $(GENERATED_FILES)
@mkdir_p@ "$(DESTDIR)${localstatedir}/lib/ganeti" \
"$(DESTDIR)${localstatedir}/log/ganeti" \
"$(DESTDIR)${localstatedir}/run/ganeti"
+if INSTALL_SYMLINKS
+ for dir in $(SYMLINK_TARGET_DIRS); do \
+ @mkdir_p@ $(DESTDIR)$$dir; \
+ done
+ for prog in $(HS_HTOOLS_PROGS); do \
+ $(LN_S) $(bindir)/$$prog $(DESTDIR)$(exec_prefix)/bin/$$prog; \
+ done
+ $(LN_S) $(bindir)/htools $(DESTDIR)$(libdir)/ganeti/iallocators/hail
+ for prog in $(all_sbin_scripts); do \
+ $(LN_S) $(sbindir)/$$prog $(DESTDIR)$(exec_prefix)/sbin/$$prog; \
+ done
+ for link in $(SYMLINK_DIRS); do \
+ $(LN_S) $(versiondir)$$link $(DESTDIR)$$link; \
+ done
+ for prog in $(all_myexeclib_scripts); do \
+ $(LN_S) $(pkglibdir)/$$prog $(DESTDIR)$(libdir)/ganeti/$$prog; \
+ done
+ if ! test -n '$(ENABLE_MANPAGES)'; then \
+ for man in $(manfullpath); do \
+ $(LN_S) $(versiondir)$(datarootdir)/man/$$man $(DESTDIR)$(datarootdir)/man/$$man; \
+ done; \
+ fi
+endif
.PHONY: apidoc
if WANT_HSAPIDOC
hpc sum --union $(HPCEXCL) \
htest.tix hpc-htools.tix hpc-mon-collector.tix > coverage-hs.tix
hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-hs.tix
- hpc report coverage-hs.tix
+ hpc report coverage-hs.tix | tee $(COVERAGE_HS_DIR)/report.txt
$(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html
# Special "kind-of-QA" target for htools, needs special setup (all