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

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

[Glenn Morris]

Noam Postavsky wrote:

> branch: master
> commit 7b1026cbf48fa8a3f31497910f696a5ba28476cb
[...]
>     * 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.

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

[Eli Zaretskii]

> From: Glenn Morris <rgm@gnu.org>
> Date: Fri, 04 May 2018 11:48:18 -0400
> Cc: Noam Postavsky <npostavs@gmail.com>
> 
> Noam Postavsky wrote:
> 
> > branch: master
> > commit 7b1026cbf48fa8a3f31497910f696a5ba28476cb
> [...]
> >     * 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?

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

[Noam Postavsky]

[-- 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

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

[Eli Zaretskii]

> From: Noam Postavsky <npostavs@gmail.com>
> Date: Fri, 4 May 2018 22:15:17 -0400
> Cc: Glenn Morris <rgm@gnu.org>, Emacs developers <emacs-devel@gnu.org>
> 
> 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?

I think it would.  But maybe it will make even more sense to try
building the Info files, and only make the failure to do it non-fatal
with that switch specified, WDYT?  Because tests might at some future
time include the Info files, for example.

Glenn?

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

[Paul Eggert]

Eli Zaretskii wrote:
>> So would adding a --no-info argument (as in the attached) be okay?
> I think it would.  But maybe it will make even more sense to try
> building the Info files, and only make the failure to do it non-fatal
> with that switch specified, WDYT?

Unless you specify --no-update, make-dist already tries to build the info files. 
If that fails make-dist goes ahead anyway; perhaps it shouldn't.

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

[Paul Eggert]

Noam Postavsky wrote:
> So would adding a --no-info argument (as in the attached) be okay?

If --no-info is given, please also change make-dist so that it does not invoke 
'make --question info' or 'make info'. Other than that it looks good; thanks. 
(Good catch in getting rid of that '[ -d info ]'.)

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

[Noam Postavsky]

On 5 May 2018 at 02:53, Paul Eggert <eggert@cs.ucla.edu> wrote:
> Eli Zaretskii wrote:
>>>
>>> So would adding a --no-info argument (as in the attached) be okay?
>>
>> I think it would.  But maybe it will make even more sense to try
>> building the Info files, and only make the failure to do it non-fatal
>> with that switch specified, WDYT?
>
> Unless you specify --no-update, make-dist already tries to build the info
> files. If that fails make-dist goes ahead anyway; perhaps it shouldn't.

For the automated testing builds, I pass '--tests --no-update
--no-changelog' to make-dist.
So the failure I want to avoid is just the part where the info files
get hard-linked into the dist directory (because the test env comes
without makeinfo).

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

[Noam Postavsky]

On 5 May 2018 at 02:56, Paul Eggert <eggert@cs.ucla.edu> wrote:
> Noam Postavsky wrote:
>>
>> So would adding a --no-info argument (as in the attached) be okay?
>
>
> If --no-info is given, please also change make-dist so that it does not
> invoke 'make --question info' or 'make info'.

I think Eli is suggesting the opposite, so I'll hold off on making any
changes until we decide where we're going.

> (Good catch in getting rid of that '[ -d info ]'.)

I can't really claim credit for that, since I was the one who added it ;)
(in the commit mentioned at the top of this thread)

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

[Eli Zaretskii]

> From: Noam Postavsky <npostavs@gmail.com>
> Date: Sat, 5 May 2018 10:47:41 -0400
> Cc: Eli Zaretskii <eliz@gnu.org>, Glenn Morris <rgm@gnu.org>, Emacs developers <emacs-devel@gnu.org>
> 
> > If --no-info is given, please also change make-dist so that it does not
> > invoke 'make --question info' or 'make info'.
> 
> I think Eli is suggesting the opposite

Yes.  I think it makes more sense to try and then go ahead if
production of Info files fails.  It's not a strong opinion, though.

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

[Paul Eggert]

Eli Zaretskii wrote:
> Yes.  I think it makes more sense to try and then go ahead if
> production of Info files fails.  It's not a strong opinion, though.

Although that would be OK ordinarily, a user who runs './make-dist --no-info' 
does not want info files in the tarball and my point was that make-dist should 
not try to build them in that case.

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

[Noam Postavsky]

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

On 5 May 2018 at 13:33, Paul Eggert <eggert@cs.ucla.edu> wrote:
> Eli Zaretskii wrote:
>>
>> Yes.  I think it makes more sense to try and then go ahead if
>> production of Info files fails.  It's not a strong opinion, though.
>
>
> Although that would be OK ordinarily, a user who runs './make-dist
> --no-info' does not want info files in the tarball and my point was that
> make-dist should not try to build them in that case.

Yes, I think I'd rather not see noise from error messages about it either.

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

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

---
 make-dist | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/make-dist b/make-dist
index aba5c43c52..bafcae35f0 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"
@@ -292,7 +299,7 @@ tempparent=
 
   ## This exits with non-zero status if any .info files need
   ## rebuilding.
-  if [ -r Makefile ]; then
+  if [ -r Makefile ] && [ "$with_info" = "yes" ]; then
       echo "Checking to see if info files are up-to-date..."
       make --question info || error=yes
   fi
@@ -331,8 +338,10 @@ tempparent=
   rm -f src/stamp-h.in
   echo timestamp > src/stamp-h.in
 
-  echo "Updating Info files"
-  make info
+  if [ "$make_info" = yes ] ; then
+    echo "Updating Info files"
+    make info
+  fi
 
   echo "Updating finder, custom and autoload data"
   (cd lisp && make updates EMACS="$EMACS")
@@ -596,7 +605,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

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

[Noam Postavsky]

On 13 May 2018 at 11:05, Noam Postavsky <npostavs@gmail.com> wrote:

> Yes, I think I'd rather not see noise from error messages about it either.

Since there have been no further comments, I've pushed to master.

[1: a32412b8aa]: 2018-05-20 09:47:36 -0400
  * make-dist: Add '--no-info' option.
  https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=a32412b8aa3dc14d810054601d9502ccfd1dae57