Re: master 7b1026c: * make-dist: Don't fail if building --without-makeinfo.

[Noam Postavsky <npostavs@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 772 bytes --]

On 4 May 2018 at 13:36, Eli Zaretskii <eliz@gnu.org> wrote:

>> >     * make-dist: Don't fail if building --without-makeinfo.
>>
>> I'm not sure that make-dist should allow the creation of tarfiles
>> without the info files. Almost certainly not by default, anyway.
>
> I tend to agree.
>
> Noam, what was the rationale for this change?

I have the automated tests setup to on my gitlab fork relying on
make-dist. Up until its recent changes [1: 83a6224d60], it succeeded
even though the info files weren't built.

So would adding a --no-info argument (as in the attached) be okay?

[1: 83a6224d60]: 2018-04-09 13:35:15 -0700
  make-dist: check exit statuses more carefully
  https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=83a6224d607c645cadbe371c921928166da0aef0

[-- Attachment #2: 0001-make-dist-Add-no-info-option.patch --]
[-- Type: text/x-diff, Size: 1712 bytes --]

From 3eb72af62efdfe478572e0bbd5f99cc86837d123 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
Date: Fri, 4 May 2018 22:13:18 -0400
Subject: [PATCH] * make-dist: Add '--no-info' option.

---
 make-dist | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/make-dist b/make-dist
index aba5c43c52..1466060a27 100755
--- a/make-dist
+++ b/make-dist
@@ -51,6 +51,7 @@ clean_up=
 make_tar=no
 default_gzip=gzip
 newer=""
+with_info=yes
 with_tests=no
 changelog=yes
 verbose=no
@@ -77,6 +78,11 @@ verbose=
     "--no-changelog" )
       changelog=no
     ;;
+    ## This options tells make-dist to skip the info files.  This can
+    ## be useful for creating a tarball purely for test purposes.
+    "--no-info" )
+      with_info=no
+      ;;
     ## This option tells make-dist to make the distribution normally, then
     ## remove all files older than the given timestamp file.  This is useful
     ## for creating incremental or patch distributions.
@@ -124,6 +130,7 @@ verbose=
       echo "  --no-check	don't check for bad file names etc."
       echo "  --no-update	don't recompile or do analogous things"
       echo "  --no-changelog	don't generate the top-level ChangeLog"
+      echo "  --no-info		don't include info files"
       echo "  --snapshot	same as --clean-up --no-update --tar --no-check"
       echo "  --tar		make a tar file"
       echo "  --tests	include the test/ directory"
@@ -596,7 +603,7 @@ files=
   ln $f $tempdir/$f || exit
 done
 
-if [ -d info ]; then # Skip in case we've built --without-makeinfo.
+if [ "$with_info" = "yes" ]; then
   echo "Making links to 'info'"
   ln `find info -type f -print` ${tempdir}/info || exit
 fi
-- 
2.11.0