make-dist failure on master

make-dist failure on master

[Phillip Lord]

I am trying to build a dist tar ball of master following an
out-of-source build, but am getting this failure.


./make-dist --no-check --snapshot --no-update --no-changelog
Version number is 27.0.50
Creating staging directory: 'make-dist.tmp.25393'
Updating make-dist.tmp.25393/MANIFEST
Creating top directory: 'make-dist.tmp.25393/emacs-27.0.50'
Creating subdirectories
Making links to files
ln: failed to access 'admin/charsets/jisx2131-filter': No such file or directory
Cleaning up the staging directory

Not sure how recent this is, but I think this used to work. Anyone got
any idea?

Phil

Re: make-dist failure on master

[Paul Eggert]

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

Thanks for reporting that. It's due to my recent make-dist cleanup. I installed 
the attached, which should fix it.

[-- Attachment #2: 0001-Fix-out-of-source-make-dist-problems.patch --]
[-- Type: text/x-patch, Size: 3007 bytes --]

From b721a5f10ee8edfc518f572be5ac675a93da8e91 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 8 Jun 2019 14:08:05 -0700
Subject: [PATCH] Fix out-of-source make-dist problems

Problem with jisx2131-filter reported by Phillip Lord in:
https://lists.gnu.org/r/emacs-devel/2019-06/msg00147.html
* admin/charsets/Makefile.in (SED_SCRIPT):
Put it in $(srcdir), which is not necessarily the working directory.
($(SED_SCRIPT)): Rename from jisx2131-filter.  All uses changed.
(clean): Do not remove SED_SCRIPT.
(extraclean): Remove it here instead.
* make-dist (possibly_non_vc_files): Remove src/emacs-module.h.
Although it is portable and could be distributed in the tarball,
it's too much hassle to do that, so let each builder make it.
---
 admin/charsets/Makefile.in | 12 ++++++------
 make-dist                  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in
index 0327a5df7e..9f6b3e9e94 100644
--- a/admin/charsets/Makefile.in
+++ b/admin/charsets/Makefile.in
@@ -96,7 +96,7 @@ MULE =
 	MULE-sisheng.map MULE-tibetan.map \
 	MULE-lviscii.map MULE-uviscii.map
 
-SED_SCRIPT = jisx2131-filter
+SED_SCRIPT = $(srcdir)/jisx2131-filter
 
 TRANS_TABLE = cp51932.el eucjp-ms.el
 TRANS_TABLE := $(addprefix ${lispintdir}/,${TRANS_TABLE})
@@ -200,12 +200,13 @@ ${charsetdir}/JISX0208.map:
 ${charsetdir}/JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz ${mapconv} ${compact}
 	${AM_V_GEN}${run_mapconv} $< '/^<.*[ 	]\/x8f/ s,/x8f,,' GLIBC-2-7 ${compact} > $@
 
-jisx2131-filter: ${mapfiledir}/JISX213A.map
+$(SED_SCRIPT): ${mapfiledir}/JISX213A.map
 	${AM_V_at}sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < $< > $@
 
-${charsetdir}/JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} jisx2131-filter
+${charsetdir}/JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} \
+  $(SED_SCRIPT)
 	${AM_V_GEN}${run_mapconv} $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 \
-	  | sed -f jisx2131-filter \
+	  | sed -f $(SED_SCRIPT) \
 	  | sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@
 
 ${charsetdir}/JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv}
@@ -307,7 +308,6 @@ ${charsetdir}/%.map:
 .PHONY: clean bootstrap-clean distclean maintainer-clean extraclean
 
 clean:
-	rm -f ${SED_SCRIPT}
 
 bootstrap-clean: clean
 
@@ -318,4 +318,4 @@ maintainer-clean:
 
 ## Do not remove these files, even in a bootstrap.  They rarely change.
 extraclean:
-	rm -f ${CHARSETS} ${TRANS_TABLE} ${srcdir}/charsets.stamp
+	rm -f ${CHARSETS} ${SED_SCRIPT} ${TRANS_TABLE} ${srcdir}/charsets.stamp
diff --git a/make-dist b/make-dist
index e4e6d40d98..228ab75a77 100755
--- a/make-dist
+++ b/make-dist
@@ -371,7 +371,7 @@ possibly_non_vc_files=
   $top_level_ChangeLog
   MANIFEST aclocal.m4 configure
   admin/charsets/jisx2131-filter
-  src/config.in src/emacs-module.h
+  src/config.in
 "$(
   find admin doc etc lisp \
     \( -name '*.el' -o -name '*.elc' -o -name '*.map' -o -name '*.stamp' \
-- 
2.17.1

Re: make-dist failure on master

[Phillip Lord]

Paul Eggert <eggert@cs.ucla.edu> writes:

> Thanks for reporting that. It's due to my recent make-dist cleanup. I
> installed the attached, which should fix it.

Thanks! That seems to be working well.

While we are on the topic of make-dist, I notice that the documentation
for --snapshot is different from reality; --snapshot doesn't enforce
--no-check.

Also, should --snapshot cause --no-changelog? You have to use the latter
for out-of-source builds since, without it, it forces a rebuild
in-source?

What do you think? Or am I the only person to use --snapshot?

Phil

Re: make-dist failure on master

[Paul Eggert]

Phillip Lord wrote:
> What do you think? Or am I the only person to use --snapshot?

I don't have an opinion, as I don't use the option.

Re: make-dist failure on master

[Glenn Morris]

Phillip Lord wrote:

> While we are on the topic of make-dist, I notice that the documentation
> for --snapshot is different from reality; --snapshot doesn't enforce
> --no-check.

Doc bug since 129645a I guess.

> Also, should --snapshot cause --no-changelog? 

IMO no.

> You have to use the latter for out-of-source builds since, without it,
> it forces a rebuild in-source?

Sounds like a bug. (Though my, presumably outdated or wrong,
recollection was that make-dist required an in-tree build.)

> Or am I the only person to use --snapshot?

No, eg it is used in admin/make-tarball.txt.

Re: make-dist failure on master

[Phillip Lord]

Glenn Morris <rgm@gnu.org> writes:

> Phillip Lord wrote:
>
>> While we are on the topic of make-dist, I notice that the documentation
>> for --snapshot is different from reality; --snapshot doesn't enforce
>> --no-check.
>
> Doc bug since 129645a I guess.
>
>> Also, should --snapshot cause --no-changelog? 
>
> IMO no.
>
>> You have to use the latter for out-of-source builds since, without it,
>> it forces a rebuild in-source?
>
> Sounds like a bug. (Though my, presumably outdated or wrong,
> recollection was that make-dist required an in-tree build.)


Effectively it does, unless you use the right options. Whether that was
a design decision or not, I don't know.

I use it to build a source tarball for the snapshot windows builds; I do
an out-of-source build here, because I need to build it twice (i686,
x86_64) and I don't always do a clean build with the snapshot.

Phil

Re: make-dist failure on master

[Glenn Morris]

Phillip Lord wrote:

>> Sounds like a bug. (Though my, presumably outdated or wrong,
>> recollection was that make-dist required an in-tree build.)
>
> Effectively it does, unless you use the right options. Whether that was
> a design decision or not, I don't know.

Actually, maybe it was the ChangeLog needing an in-tree build that I was
thinking of.

IMO --snapshot should do whatever is appropriate to make an Emacs
tarfile for use on ftp.gnu.org. I think that includes sanity-checking
and adding a ChangeLog.

I don't have an opinion on whether make-dist needs to support
out-of-tree builds.