branch master updated: * tp/maintain/regenerate_non_ascii_tar_file.sh: add maintenance script to regenerate tp/tests/input/non_ascii.tar. * autogen.sh, * tp/tests/Makefile.am (input/non_ascii.tar): Run it.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new c0f4754a39 * tp/maintain/regenerate_non_ascii_tar_file.sh: add 
maintenance script to regenerate tp/tests/input/non_ascii.tar. * autogen.sh, * 
tp/tests/Makefile.am (input/non_ascii.tar): Run it.
c0f4754a39 is described below

commit c0f4754a39f32d8a3fea583e80a57e6590d2dbc1
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Nov 18 18:22:28 2024 +0000

    * tp/maintain/regenerate_non_ascii_tar_file.sh: add maintenance
    script to regenerate tp/tests/input/non_ascii.tar.
    * autogen.sh,
    * tp/tests/Makefile.am (input/non_ascii.tar): Run it.
---
 .gitignore                                   |  2 +-
 ChangeLog                                    |  7 +++++++
 autogen.sh                                   |  2 +-
 tp/maintain/regenerate_non_ascii_tar_file.sh | 30 ++++++++++++++++++++++++++++
 tp/tests/Makefile.am                         |  3 +--
 5 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 588360d455..1bfb625bc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -274,7 +274,7 @@ tp/tests/*.trs
 tp/tests/test_scripts/*.log
 tp/tests/test_scripts/*.trs
 tp/tests/input_file_names_recoded_stamp.txt
-tp/tests/non_ascii.tar
+tp/tests/input/non_ascii.tar
 tp/tests/non_ascii_extracted_stamp.txt
 tp/tests/built_input
 
diff --git a/ChangeLog b/ChangeLog
index 08f07281c8..a35491a090 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-11-18  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/maintain/regenerate_non_ascii_tar_file.sh: add maintenance
+       script to regenerate tp/tests/input/non_ascii.tar.
+       * autogen.sh,
+       * tp/tests/Makefile.am (input/non_ascii.tar): Run it.
+
 2024-11-17  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XSLoader.pm (init): add debug call for
diff --git a/autogen.sh b/autogen.sh
index f492f47bf9..49766b0301 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -26,7 +26,7 @@ echo "  $cmd"
 $chicken eval $cmd || exit 1
 
 # Same rule in tp/tests/Makefile.am
-cmd="(cd tp/tests/input && tar cf non_ascii.tar non_ascii)"
+cmd="tp/maintain/regenerate_non_ascii_tar_file.sh tp/tests/input"
 echo "  $cmd"
 $chicken eval $cmd || exit 1
 
diff --git a/tp/maintain/regenerate_non_ascii_tar_file.sh 
b/tp/maintain/regenerate_non_ascii_tar_file.sh
new file mode 100755
index 0000000000..3332d735a1
--- /dev/null
+++ b/tp/maintain/regenerate_non_ascii_tar_file.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+# Regenerate tp/tests/input/non_ascii.tar
+#
+# Copyright 2024 Free Software Foundation, Inc.
+#
+
+#set -x
+
+tests_input=$1
+
+if test z"$tests_input" = z"" ; then
+    echo "$0: Bad args" 1>&2
+    exit 1
+fi
+
+cd $tests_input
+
+input=non_ascii
+if ! test -d $input ; then
+    echo "$0: Input directory $input not found in $tests_input" 1>&2
+    exit 1
+fi
+
+# Used with GNU tar to try to get a reproducible file.
+# See https://reproducible-builds.org/docs/archives/.
+TAR_BUNDLE_DATE=2024-11-18T00:00
+TAR_BUNDLE_FLAGS="--sort=name --mtime=$TAR_BUNDLE_DATE --owner=0 --group=0 
--numeric-owner --format=ustar"
+
+tar cf non_ascii.tar $input $TAR_BUNDLE_FLAGS
+
diff --git a/tp/tests/Makefile.am b/tp/tests/Makefile.am
index 034c622546..ae5cca2713 100644
--- a/tp/tests/Makefile.am
+++ b/tp/tests/Makefile.am
@@ -92,8 +92,7 @@ non_ascii_input = \
 # non_ascii.tar needs to be regenerated manually in case of any updates.
 # It is also regenerated by autogen.sh at top level.
 $(srcdir)/input/non_ascii.tar:
-       cd $(srcdir)/input && \
-       tar cf non_ascii.tar non_ascii
+       $(SHELL) $(srcdir)/../maintain/regenerate_non_ascii_tar_file.sh 
$(srcdir)/input
 
 check_DATA += non_ascii_extracted_stamp.txt