On Tue, Sep 24, 2013 at 2:23 PM, Jose A. Lopes <[email protected]> wrote:
> The previous patch has made '_autoconf' obsolete. This patch > completely removes '_autoconf' and the 'Makefile' targets for it. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > .gitignore | 1 - > Makefile.am | 85 > ++----------------------------------------------------------- > 2 files changed, 2 insertions(+), 84 deletions(-) > > diff --git a/.gitignore b/.gitignore > index 9a6268b..05905f4 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -79,7 +79,6 @@ > /doc/examples/hooks/ipsec > > # lib > -/lib/_autoconf.py > /lib/_constants.py > /lib/_vcsversion.py > /lib/_generated_rpc.py > diff --git a/Makefile.am b/Makefile.am > index 609d956..af7c184 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -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 > @@ -784,7 +783,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 > @@ -1737,7 +1736,7 @@ src/Ganeti/Hs2Py/ListConstants.hs: src/Ganeti/Hs2Py/ > ListConstants.hs.in \ > 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 > @@ -1759,86 +1758,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 > $@ > -- > 1.8.4 > > LGTM, thanks. -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
