Put archive.dir.tar under version control.

This helps reducing CI failures when alpha.gnu.org is not responding.
It also simplifies the branch handling when a bug-fix release is made
on the maintenance branch of an older release.

* gettext-tools/misc/archive.dir.tar: New file.
* autopull.sh: Don't fetch it from alpha.gnu.org any more.

diff --git a/.gitignore b/.gitignore
index 7aac1b569a2d5cf4b32edaacea837e66dabac1b9..02e7d5f0057885919fb38a677d4b51b79cc1421c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@
 /gettext-runtime/doc/Admin/jdom-1.0.jar
 /gettext-runtime/doc/Admin/Matrix*.class
 /gettext-runtime/doc/Admin/matrix.xml
-/gettext-tools/misc/archive.dir.tar
 
 # Files brought in by autopull.sh:
 /gettext-tools/tree-sitter-*

diff --git a/Admin/release-steps b/Admin/release-steps
index 43c442deb92e31278c2b45a2a16527db62c60828..39f4ed040dd0c9f0e94dc90df10df35f2e80309b 100644 (file)
--- a/Admin/release-steps
+++ b/Admin/release-steps
@@ -280,16 +280,6 @@ We assume that the following environment variables are set:
     gnulib/build-aux/gnupload --to ftp.gnu.org:gettext \
                               gettext-$CURRENT_VERSION.tar.{gz,xz,lz}
 
-** Upload autopoint archive to alpha.gnu.org:
-
-  This is needed to compile git master after the release (as
-  autopull.sh fetches the archive).
-
-    xz -c -e < gettext-tools/misc/archive.dir.tar > archive.dir-$CURRENT_VERSION.tar.xz
-    gnulib/build-aux/gnupload \
-      --to alpha.gnu.org:gettext \
-      --symlink-regex archive.dir-$CURRENT_VERSION.tar.xz
-
 ** Finally:
 
     rm -f .tarball-version

diff --git a/autopull.sh b/autopull.sh
index 31553df7f2500f7c259c153a007bd4c8e6c4e7e5..e32e4b415adc23ee0ed97262568087fd2233c1ac 100755 (executable)
--- a/autopull.sh
+++ b/autopull.sh
@@ -20,10 +20,6 @@
 # This script requires:
 #   - Wget
 #   - XZ Utils
-#
-# In addition, it fetches the archive.dir.tar.gz file, which contains
-# data files used by the autopoint program.  If you already have the
-# file, place it under gettext-tools/misc, before running this script.
 
 # Usage: ./autopull.sh
 
@@ -32,23 +28,6 @@
 
 ./gitsub.sh pull || exit 1
 
-# Fetch gettext-tools/misc/archive.dir.tar.
-if ! test -f gettext-tools/misc/archive.dir.tar; then
-  if ! test -f gettext-tools/misc/archive.dir.tar.xz; then
-    echo "$0: getting gettext-tools/misc/archive.dir.tar..."
-    wget -q --timeout=5 -O gettext-tools/misc/archive.dir.tar.xz-t "https://alpha.gnu.org/gnu/gettext/archive.dir-latest.tar.xz" \
-      && mv gettext-tools/misc/archive.dir.tar.xz-t gettext-tools/misc/archive.dir.tar.xz
-    retval=$?
-    rm -f gettext-tools/misc/archive.dir.tar.xz-t
-    test $retval -eq 0 || exit $retval
-  fi
-  xz -d -c < gettext-tools/misc/archive.dir.tar.xz > gettext-tools/misc/archive.dir.tar-t \
-    && mv gettext-tools/misc/archive.dir.tar-t gettext-tools/misc/archive.dir.tar
-  retval=$?
-  rm -f gettext-tools/misc/archive.dir.tar-t
-  test $retval -eq 0 || exit $retval
-fi
-
 # func_git_clone_shallow SUBDIR URL REVISION
 func_git_clone_shallow ()
 {

diff --git a/gettext-tools/misc/archive.dir.tar b/gettext-tools/misc/archive.dir.tar
new file mode 100644 (file)
index 0000000..4322a2e
Binary files /dev/null and b/gettext-tools/misc/archive.dir.tar differ