Fix several search path configure options
[ganeti-local] / Makefile.am
index 829b5b0..d00379d 100644 (file)
@@ -56,7 +56,7 @@ SHELL_ENV_INIT = autotools/shell-env-init
 # architecture-dependent one (and hence has to go under $(versiondir)), add a link
 # under $(versionedsharedir) but do not change the external links.
 if USE_VERSION_FULL
-DIRVERSION=VERSION_FULL
+DIRVERSION=$(VERSION_FULL)
 else
 DIRVERSION=$(VERSION_MAJOR).$(VERSION_MINOR)
 endif
@@ -296,7 +296,6 @@ built_base_sources = \
        stamp-srclinks
 
 built_python_base_sources = \
-       lib/_autoconf.py \
        lib/_constants.py \
        lib/_vcsversion.py \
        lib/opcodes.py
@@ -484,6 +483,7 @@ utils_PYTHON = \
        lib/utils/retry.py \
        lib/utils/storage.py \
        lib/utils/text.py \
+       lib/utils/version.py \
        lib/utils/wrapper.py \
        lib/utils/x509.py
 
@@ -509,6 +509,8 @@ docinput = \
        doc/design-device-uuid-name.rst \
        doc/design-draft.rst \
        doc/design-hotplug.rst \
+       doc/design-glusterfs-ganeti-support.rst \
+       doc/design-daemons.rst \
        doc/design-htools-2.3.rst \
        doc/design-http-server.rst \
        doc/design-impexp2.rst \
@@ -519,6 +521,7 @@ docinput = \
        doc/design-network.rst \
        doc/design-node-add.rst \
        doc/design-oob.rst \
+       doc/design-openvswitch.rst \
        doc/design-ovf-support.rst \
        doc/design-opportunistic-locking.rst \
        doc/design-optables.rst \
@@ -535,6 +538,7 @@ docinput = \
        doc/design-hroller.rst \
        doc/design-storagetypes.rst \
         doc/design-upgrade.rst \
+       doc/design-hsqueeze.rst \
        doc/devnotes.rst \
        doc/glossary.rst \
        doc/hooks.rst \
@@ -581,14 +585,20 @@ HS_PROGS = $(HS_BIN_PROGS) $(HS_MYEXECLIB_PROGS)
 HS_BIN_ROLES = harep hbal hscan hspace hinfo hcheck hroller
 HS_HTOOLS_PROGS = $(HS_BIN_ROLES) hail
 
-HS_ALL_PROGS = \
-       $(HS_PROGS) \
+# Haskell programs that cannot be disabled at configure (e.g., unlike
+# 'mon-collector')
+HS_DEFAULT_PROGS = \
+       $(HS_BIN_PROGS) \
        test/hs/hpc-htools \
        test/hs/hpc-mon-collector \
        test/hs/htest \
        $(HS_COMPILE_PROGS)
 
-HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS)) src/hs2py-constants.hs
+HS_ALL_PROGS = $(HS_DEFAULT_PROGS) $(HS_MYEXECLIB_PROGS)
+
+HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_DEFAULT_PROGS)) \
+              src/mon-collector.hs \
+              src/hs2py-constants.hs
 HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/hs/%) test/hs/hail
 
 HFLAGS = \
@@ -720,6 +730,7 @@ HS_TEST_SRCS = \
        test/hs/Test/Ganeti/Common.hs \
        test/hs/Test/Ganeti/Confd/Types.hs \
        test/hs/Test/Ganeti/Confd/Utils.hs \
+       test/hs/Test/Ganeti/Constants.hs \
        test/hs/Test/Ganeti/Daemon.hs \
        test/hs/Test/Ganeti/Errors.hs \
        test/hs/Test/Ganeti/HTools/Backend/Simu.hs \
@@ -727,6 +738,7 @@ HS_TEST_SRCS = \
        test/hs/Test/Ganeti/HTools/CLI.hs \
        test/hs/Test/Ganeti/HTools/Cluster.hs \
        test/hs/Test/Ganeti/HTools/Container.hs \
+       test/hs/Test/Ganeti/HTools/ExtLoader.hs \
        test/hs/Test/Ganeti/HTools/Graph.hs \
        test/hs/Test/Ganeti/HTools/Instance.hs \
        test/hs/Test/Ganeti/HTools/Loader.hs \
@@ -784,7 +796,7 @@ doc/man-html/index.html: ENABLE_MANPAGES = 1
 doc/man-html/index.html: doc/manpages-enabled.rst $(mandocrst)
 
 # Note: we use here an order-only prerequisite, as the contents of
-# _autoconf.py are not actually influencing the html build output: it
+# _constants.py are not actually influencing the html build output: it
 # has to exist in order for the sphinx module to be loaded
 # successfully, but we certainly don't want the docs to be rebuilt if
 # it changes
@@ -1058,16 +1070,19 @@ python_scripts = \
        tools/sanitize-config
 
 dist_tools_SCRIPTS = \
-       $(python_scripts) \
-       tools/burnin \
        tools/kvm-console-wrapper \
        tools/master-ip-setup \
        tools/xen-console-wrapper
 
+dist_tools_python_SCRIPTS = \
+       $(python_scripts) \
+       tools/burnin
+
 nodist_tools_python_SCRIPTS = \
        tools/node-cleanup
 
-tools_python_basenames = $(patsubst tools/%,%,$(nodist_tools_python_SCRIPTS))
+tools_python_basenames = $(patsubst tools/%,%,\
+       $(dist_tools_python_SCRIPTS) $(nodist_tools_python_SCRIPTS))
 
 nodist_tools_SCRIPTS = \
        tools/users-setup \
@@ -1442,6 +1457,7 @@ python_tests = \
        test/py/ganeti.utils.retry_unittest.py \
        test/py/ganeti.utils.storage_unittest.py \
        test/py/ganeti.utils.text_unittest.py \
+       test/py/ganeti.utils.version_unittest.py \
        test/py/ganeti.utils.wrapper_unittest.py \
        test/py/ganeti.utils.x509_unittest.py \
        test/py/ganeti.utils_unittest.py \
@@ -1729,12 +1745,12 @@ src/Ganeti/Hs2Py/ListConstants.hs: src/Ganeti/Hs2Py/ListConstants.hs.in \
 ##   adminstDown = ...
 ## becomes
 ##   'adminstDown
-       NAMES=$$(sed -n -e "/=/ s/\(.*\) =.*/    '\1:/g p" \
-                $(abs_top_srcdir)/src/Ganeti/HsConstants.hs); \
+       NAMES=$$(sed -e "/^--/ d" $(abs_top_srcdir)/src/Ganeti/HsConstants.hs |\
+                sed -n -e "/=/ s/\(.*\) =.*/    '\1:/g p"); \
        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/constants.py lib/luxi.py lib/errors.py \
        lib/jstore.py $(RUN_IN_TEMPDIR) \
        $(CONVERT_CONSTANTS) $(built_base_sources) \
        | lib/_vcsversion.py
@@ -1756,86 +1772,6 @@ test/hs/Test/Ganeti/TestImports.hs: test/hs/Test/Ganeti/TestImports.hs.in \
          done ; \
        } > $@
 
-lib/_autoconf.py: Makefile | stamp-directories
-       set -e; \
-       { echo '# This file is automatically generated, do not edit!'; \
-         echo '#'; \
-         echo ''; \
-         echo '"""Build-time configuration for Ganeti.'; \
-         echo '';\
-         echo 'This file is autogenerated by the build process.'; \
-         echo 'For any changes you need to re-run ./configure (and'; \
-         echo 'not edit by hand).'; \
-         echo ''; \
-         echo '"""'; \
-         echo ''; \
-         echo '# pylint: disable=C0301,C0324'; \
-         echo '# because this is autogenerated, we do not want'; \
-         echo '# style warnings' ; \
-         echo ''; \
-         echo "PACKAGE_VERSION = '$(PACKAGE_VERSION)'"; \
-         echo "VERSION_MAJOR = '$(VERSION_MAJOR)'"; \
-         echo "VERSION_MINOR = '$(VERSION_MINOR)'"; \
-         echo "VERSION_REVISION = '$(VERSION_REVISION)'"; \
-         echo "VERSION_SUFFIX = '$(VERSION_SUFFIX)'"; \
-         echo "VERSION_FULL = '$(VERSION_FULL)'"; \
-         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 "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
-         echo "XEN_CONFIG_DIR = '$(XEN_CONFIG_DIR)'"; \
-         echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
-         echo "XEN_INITRD = '$(XEN_INITRD)'"; \
-         echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \
-         echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \
-         echo "KVM_PATH = '$(KVM_PATH)'"; \
-         echo "IP_PATH = '$(IP_PATH)'"; \
-         echo "SOCAT_PATH = '$(SOCAT)'"; \
-         echo "SOCAT_USE_ESCAPE = $(SOCAT_USE_ESCAPE)"; \
-         echo "SOCAT_USE_COMPRESS = $(SOCAT_USE_COMPRESS)"; \
-         echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
-         echo "TOOLSDIR = '$(libdir)/ganeti/tools'"; \
-         echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
-         echo "HTOOLS_PROGS = [$(foreach i,$(HS_HTOOLS_PROGS),'$(i)',)]"; \
-         echo "PKGLIBDIR = '$(libdir)/ganeti'"; \
-         echo "VERSIONEDSHAREDIR = '$(versionedsharedir)'"; \
-         echo "DRBD_BARRIERS = '$(DRBD_BARRIERS)'"; \
-         echo "DRBD_NO_META_FLUSH = $(DRBD_NO_META_FLUSH)"; \
-         echo "SYSLOG_USAGE = '$(SYSLOG_USAGE)'"; \
-         echo "DAEMONS_GROUP = '$(DAEMONS_GROUP)'"; \
-         echo "ADMIN_GROUP = '$(ADMIN_GROUP)'"; \
-         echo "MASTERD_USER = '$(MASTERD_USER)'"; \
-         echo "MASTERD_GROUP = '$(MASTERD_GROUP)'"; \
-         echo "RAPI_USER = '$(RAPI_USER)'"; \
-         echo "RAPI_GROUP = '$(RAPI_GROUP)'"; \
-         echo "CONFD_USER = '$(CONFD_USER)'"; \
-         echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
-         echo "LUXID_USER = '$(LUXID_USER)'"; \
-         echo "LUXID_GROUP = '$(LUXID_GROUP)'"; \
-         echo "NODED_USER = '$(NODED_USER)'"; \
-         echo "NODED_GROUP = '$(NODED_GROUP)'"; \
-         echo "MOND_USER = '$(MOND_USER)'"; \
-         echo "MOND_GROUP = '$(MOND_GROUP)'"; \
-         echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \
-         echo "QEMUIMG_PATH = '$(QEMUIMG_PATH)'"; \
-         echo "HTOOLS = True"; \
-         echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
-         echo "XEN_CMD = '$(XEN_CMD)'"; \
-         echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
-         echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \
-         echo "ENABLE_MOND = $(ENABLE_MOND)"; \
-## Write dictionary with man page name as the key and the section number as the
-## value
-         echo "MAN_PAGES = {"; \
-         for i in $(notdir $(man_MANS)); do \
-           echo "$$i" | sed -re 's/^(.*)\.([0-9]+)$$/  "\1": \2,/g'; \
-         done; \
-         echo "}"; \
-       } > $@
-
 lib/_constants.py: Makefile lib/_constants.py.in src/hs2py-constants \
                 | stamp-directories
        cat $(abs_top_srcdir)/lib/_constants.py.in > $@
@@ -1851,21 +1787,22 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in | stamp-directories
            -DVERSION_REVISION="$(VERSION_REVISION)" \
            -DVERSION_SUFFIX="$(VERSION_SUFFIX)" \
            -DVERSION_FULL="$(VERSION_FULL)" \
+           -DDIRVERSION="$(DIRVERSION)" \
            -DLOCALSTATEDIR="$(localstatedir)" \
            -DSYSCONFDIR="$(sysconfdir)" \
            -DSSH_CONFIG_DIR="$(SSH_CONFIG_DIR)" \
            -DSSH_LOGIN_USER="$(SSH_LOGIN_USER)" \
            -DSSH_CONSOLE_USER="$(SSH_CONSOLE_USER)" \
            -DEXPORT_DIR="$(EXPORT_DIR)" \
-           -DOS_SEARCH_PATH="$(foreach i,$(OS_SEARCH_PATH),\"$(i)\":)" \
-           -DES_SEARCH_PATH="$(foreach i,$(ES_SEARCH_PATH),\"$(i)\":)" \
+           -DOS_SEARCH_PATH="\"$(OS_SEARCH_PATH)\"" \
+           -DES_SEARCH_PATH="\"$(ES_SEARCH_PATH)\"" \
            -DXEN_BOOTLOADER="$(XEN_BOOTLOADER)" \
            -DXEN_CONFIG_DIR="$(XEN_CONFIG_DIR)" \
            -DXEN_KERNEL="$(XEN_KERNEL)" \
            -DXEN_INITRD="$(XEN_INITRD)" \
            -DKVM_KERNEL="$(KVM_KERNEL)" \
            -DSHARED_FILE_STORAGE_DIR="$(SHARED_FILE_STORAGE_DIR)" \
-           -DIALLOCATOR_SEARCH_PATH="$(foreach i,$(IALLOCATOR_SEARCH_PATH),\"$(i)\":)" \
+           -DIALLOCATOR_SEARCH_PATH="\"$(IALLOCATOR_SEARCH_PATH)\"" \
            -DKVM_PATH="$(KVM_PATH)" \
            -DIP_PATH="$(IP_PATH)" \
            -DSOCAT_PATH="$(SOCAT)" \
@@ -1876,6 +1813,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in | stamp-directories
            -DGNT_SCRIPTS="$(foreach i,$(notdir $(gnt_scripts)),\"$(i)\":)" \
            -DHS_HTOOLS_PROGS="$(foreach i,$(HS_HTOOLS_PROGS),\"$(i)\":)" \
            -DPKGLIBDIR="$(libdir)/ganeti" \
+           -DSHAREDIR="$(prefix)/share/ganeti" \
            -DVERSIONEDSHAREDIR="$(versionedsharedir)" \
            -DDRBD_BARRIERS="$(DRBD_BARRIERS)" \
            -DDRBD_NO_META_FLUSH="$(DRBD_NO_META_FLUSH)" \
@@ -1902,6 +1840,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in | stamp-directories
            -DENABLE_SPLIT_QUERY="$(ENABLE_SPLIT_QUERY)" \
            -DENABLE_RESTRICTED_COMMANDS="$(ENABLE_RESTRICTED_COMMANDS)" \
            -DENABLE_MOND="$(ENABLE_MOND)" \
+           -DHAS_GNU_LN="$(HAS_GNU_LN)" \
            -DMAN_PAGES="$$(for i in $(notdir $(man_MANS)); do \
                            echo -n "$$i" | sed -re 's/^(.*)\.([0-9]+)$$/("\1",\2):/g'; \
                            done)" \
@@ -2156,6 +2095,7 @@ hs-check: hs-tests hs-shell
 #       (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)
+# E123: closing bracket does not match indentation of opening bracket's line
 # 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!
@@ -2164,7 +2104,7 @@ hs-check: hs-tests hs-shell
 # instead of silencing it
 # E261: at least two spaces before inline comment
 # E501: line too long (80 characters)
-PEP8_IGNORE = E111,E121,E125,E127,E261,E501
+PEP8_IGNORE = E111,E121,E123,E125,E127,E261,E501
 
 # For excluding pep8 expects filenames only, not whole paths
 PEP8_EXCLUDE = $(subst $(space),$(comma),$(strip $(notdir $(BUILT_PYTHON_SOURCES))))