Re: GNUMakefile: don't fail if there is no .tarball-version

[Simon Josefsson]

Eric Blake <address@hidden> writes:

> According to Simon Josefsson on 6/3/2008 10:29 AM:
> |
> | The failure can be reproduced with:
> |
> | $ gnulib-tool --create-testdir --with-tests --dir=foo
>
> |
> | As a work around, my daily builder just does 'echo 0 > .tarball-version'
> | and that makes everything work.
>
> That's the correct workaround - you are indeed creating the equivalent of
> a tarball outside the VCS, so you should have a .tarball-version present.

If that is the case, the gnumakefile module should have some
documentation telling users to create that file.  How about this?

>From 03f40e596e7a3ba7a56d90df79e1493ff514831b Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Wed, 4 Jun 2008 05:28:49 +0200
Subject: [PATCH] doc: document that gnumakefile requires a .tarball-version 
file.

---
 doc/gnulib.texi      |    3 +++
 doc/gnumakefile.texi |    9 +++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 doc/gnumakefile.texi

diff --git a/doc/gnulib.texi b/doc/gnulib.texi
index c5f8fd7..2a44ffd 100644
--- a/doc/gnulib.texi
+++ b/doc/gnulib.texi
@@ -5749,6 +5749,7 @@ This list of functions is sorted according to the header 
that declares them.
 * Regular expressions::
 * Supporting Relocation::
 * func::
+* gnumakefile::
 @end menu
 
 @node alloca
@@ -5830,6 +5831,8 @@ generated automatically.
 
 @include func.texi
 
address@hidden gnumakefile.texi
+
 
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
diff --git a/doc/gnumakefile.texi b/doc/gnumakefile.texi
new file mode 100644
index 0000000..896d1db
--- /dev/null
+++ b/doc/gnumakefile.texi
@@ -0,0 +1,9 @@
address@hidden gnumakefile
address@hidden gnumakefile
+
+The @code{gnumakefile} creates a top-level GNUMakefile with rules that
+are useful for maintainers.
+
+The module requires that you create a file @code{.tarball-version}.
+If this isn't done, invoking a Automake 'dist' target will loop
+infinitely.
-- 
1.5.5.1

> ~ In fact, it might be worth a patch to gnulib-tool, rather than to
> GNUmakefile, to guarantee that --create-testdir creates .tarball-version
> to simulate the 'make dist' process of any package which uses the
> GNUmakefile module.

How about this?  Tested slightly.

>From f16abeb84b424add32fa3f5d6dfb6828a5152f0e Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Wed, 4 Jun 2008 05:36:48 +0200
Subject: [PATCH] Create .tarball-version if needed.
 Suggested by Eric Blake <address@hidden>.

---
 ChangeLog   |    5 +++++
 gnulib-tool |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4aff8f4..21e5b2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-04  Simon Josefsson  <address@hidden>
+
+       * gnulib-tool: Create .tarball-version if needed.  Suggested by
+       Eric Blake <address@hidden>.
+
 2008-06-02  Bruno Haible  <address@hidden>
 
        * lib/acl-entries.h: Enclose most definitions in #ifs for POSIX-draft
diff --git a/gnulib-tool b/gnulib-tool
index a3b9df5..0f4636f 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3805,6 +3805,11 @@ func_create_testdir ()
    echo "AC_OUTPUT([$makefiles])"
   ) > "$testdir/configure.ac"
 
+  # Create .tarball-version if needed.
+  if echo $modules | grep -q gnumakefile; then
+    echo 0 > $testdir/.tarball-version
+  fi
+
   # Create autogenerated files.
   (cd "$testdir"
    # Do not use "${AUTORECONF} --force --install", because it may invoke
-- 
1.5.5.1



/Simon