auth: remove gen-version from tarballs

This means that tarballs can *ONLY* be created via ./builder/build.sh

diff --git a/Makefile.am b/Makefile.am
index 7b5304c066b90a2ccb8c4c935a062610ed2b21c1..49e1cea72f3119c0fe6bb7ae3e9efd63505dad6c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,6 @@ EXTRA_DIST = \
        INSTALL \
        NOTICE \
        README \
-       .version \
-       build-aux/gen-version \
        codedocs/doxygen.conf \
        contrib/powerdns.solaris.init.d \
        pdns/named.conf.parsertest \

diff --git a/builder b/builder
index c250a900f638c36be4c82e771a32dd385159a283..5cc8e6f3286bf3937813e155e0811808cc3fb994 160000 (submodule)
--- a/builder
+++ b/builder
@@ -1 +1 @@
-Subproject commit c250a900f638c36be4c82e771a32dd385159a283
+Subproject commit 5cc8e6f3286bf3937813e155e0811808cc3fb994

diff --git a/builder-support/dockerfiles/Dockerfile.authoritative b/builder-support/dockerfiles/Dockerfile.authoritative
index a3920f2989aa9b516ad45b904fca6539fae123de..aaade0b616aee583bd393b54dc4a2f13e25fffaf 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.authoritative
+++ b/builder-support/dockerfiles/Dockerfile.authoritative
@@ -8,12 +8,14 @@ RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
 ADD configure.ac Makefile.am INSTALL NOTICE README /pdns-authoritative/
 @EXEC sdist_dirs=(build-aux m4 pdns ext docs modules codedocs contrib regression-tests)
 @EXEC for d in ${sdist_dirs[@]} ; do echo "COPY $d/ /pdns-authoritative/$d/" ; done
+ADD builder/helpers/set-configure-ac-version.sh /pdns-authoritative/builder/helpers/
 WORKDIR /pdns-authoritative/
 
 RUN mkdir /sdist
 
 ARG BUILDER_VERSION
-RUN BUILDER_VERSION=${BUILDER_VERSION} autoreconf -v -i --force && \
+RUN /pdns-authoritative/builder/helpers/set-configure-ac-version.sh && \
+     autoreconf -v -i --force && \
     ./configure --without-modules --without-dynmodules --disable-dependency-tracking && \
     make dist
 RUN cp pdns-${BUILDER_VERSION}.tar.bz2 /sdist/

diff --git a/configure.ac b/configure.ac
index 3317d0d4fe2b8a9d5a69ba3d32d328affa215477..a5d88d1809fd458f577e77cc638b04fb1a7c1d86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.61])
 
-AC_INIT([pdns], m4_esyscmd([build-aux/gen-version]))
+AC_INIT([pdns], m4_esyscmd([builder-support/gen-version]))
 
 AC_CONFIG_SRCDIR([pdns/receiver.cc])
 AC_CONFIG_MACRO_DIR([m4])