Hi Bruno,
With all of the updates to gnulib-tool.py it is very easy to see why
GNU Bison fails to build. This is the only diff shown between
gnulib-tool.py and gnulib-tool.sh after running ./bootstrap:
--- a/bison-python/gnulib-po/LINGUAS
+++ b/bison-shell/gnulib-po/LINGUAS
@@ -1,18 +1,4 @@
# Set of available languages.
-.gitignore
-Makevars.template
-Rules-quot
-boldquot.sed
[email protected]
[email protected]
-insert-header.sin
-quot.sed
-Makefile.in.in~
-Makefile.in.in
-remove-potcdate.sin~
-remove-potcdate.sin
-Makevars
-POTFILES.in
af
be
bg
Here is the very simple fix:
diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
index c3a7597d02..1fc43bfdff 100644
--- a/pygnulib/GLImport.py
+++ b/pygnulib/GLImport.py
@@ -1241,7 +1241,8 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix
tmpfile = self.assistant.tmpfilename(basename)
data = '# Set of available languages.\n'
files = [ constants.subend('.po', '', file)
- for file in os.listdir(joinpath(destdir, pobase)) ]
+ for file in os.listdir(joinpath(destdir, pobase))
+ if file.endswith('.po') ]
data += lines_to_multiline(files)
with codecs.open(tmpfile, 'wb', 'UTF-8') as file:
file.write(data)
And the corresponding section in gnulib-tool.sh, line 5847:
func_dest_tmpfilename $pobase/LINGUAS
(cd "$destdir"/$pobase \
&& { echo '# Set of available languages.'
LC_ALL=C ls -1 *.po | sed -e 's,\.po$,,'
}
) > "$tmpfile"
CollinFrom de12261e22c51fe1e2f5ee77d87a46462dd51046 Mon Sep 17 00:00:00 2001
From: Collin Funk <[email protected]>
Date: Sat, 30 Mar 2024 22:38:48 -0700
Subject: [PATCH] gnulib-tool.py: Fix output of 'po/LINGUAS'.
* pygnulib/GLImport.py (GLImport.execute): Only use PO files when
determining the output for po/LINGUAS.
---
ChangeLog | 6 ++++++
pygnulib/GLImport.py | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 28d1c2e855..50d1559251 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-30 Collin Funk <[email protected]>
+
+ gnulib-tool.py: Fix output of 'po/LINGUAS'.
+ * pygnulib/GLImport.py (GLImport.execute): Only use PO files when
+ determining the output for po/LINGUAS.
+
2024-03-30 Collin Funk <[email protected]>
gnulib-tool.py: Fix sorting of modules when --local-dir is used.
diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
index c3a7597d02..1fc43bfdff 100644
--- a/pygnulib/GLImport.py
+++ b/pygnulib/GLImport.py
@@ -1241,7 +1241,8 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix
tmpfile = self.assistant.tmpfilename(basename)
data = '# Set of available languages.\n'
files = [ constants.subend('.po', '', file)
- for file in os.listdir(joinpath(destdir, pobase)) ]
+ for file in os.listdir(joinpath(destdir, pobase))
+ if file.endswith('.po') ]
data += lines_to_multiline(files)
with codecs.open(tmpfile, 'wb', 'UTF-8') as file:
file.write(data)
--
2.44.0