From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Wed, 24 May 2023 03:57:07 +0000 (+0000)
Subject: Maintenance: update release process script (#1340)
X-Git-Tag: SQUID_7_0_1~436
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7fe9e6f5991f29b10ac74bf944d6d6db66bfa3d;p=thirdparty%2Fsquid.git

Maintenance: update release process script (#1340)

* release notes no longer mention specific version since
  c0789db1f479206e43f96add370363127834757a. No more need to
  validate it is correct before release.

* web server has not been the direct release destination for
  many years. Remove mentions of $dst/changesets/

* web server references github repository for basic
  information. Do not push CONTRIBUTORS, COPYING, README,
  CREDITS and SPONSORS files to staging area.

* release notes no longer link to local ChangeLog file.
  No need to adjust the hyperlink.
---

diff --git a/mkrelease.sh b/mkrelease.sh
index 2298990c66..c7c5128fc2 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -53,11 +53,6 @@ if [ ${name} != ${PACKAGE}-${VERSION} ]; then
 	exit 1
 fi
 RELEASE=`echo $VERSION | cut -d. -f1,1 | cut -d- -f1`
-NOTES_VERSION=`grep "$VERSION" doc/release-notes/release-${RELEASE}.sgml`
-if test "x$NOTES_VERSION" = "x"; then
-	echo "ERROR! Release Notes HTML version numbers do not match!"
-	exit 1
-fi
 ed -s configure.ac <<EOS
 g/${VERSION}-VCS/ s//${VERSION}/
 w
@@ -82,21 +77,8 @@ chmod 444 $2
 }
 inst $tmpdir/${name}.tar.gz	$dst/${name}.tar.gz
 inst $tmpdir/${name}.tar.bz2	$dst/${name}.tar.bz2
-inst $tmpdir/CONTRIBUTORS	$dst/CONTRIBUTORS.txt
-inst $tmpdir/COPYING		$dst/COPYING.txt
-inst $tmpdir/README		$dst/README.txt
-inst $tmpdir/CREDITS		$dst/CREDITS.txt
-inst $tmpdir/SPONSORS		$dst/SPONSORS.txt
 inst $tmpdir/ChangeLog		$dst/ChangeLog.txt
 if [ -f $tmpdir/doc/release-notes/release-$RELEASE.html ]; then
-    cat $tmpdir/doc/release-notes/release-$RELEASE.html | sed -e '
-	s/"ChangeLog"/"ChangeLog.txt"/g;
-    ' > $tmpdir/RELEASENOTES.html
-    touch -r $tmpdir/doc/release-notes/release-$RELEASE.html $tmpdir/RELEASENOTES.html
     inst $tmpdir/RELEASENOTES.html $dst/${name}-RELEASENOTES.html
     ln -sf ${name}-RELEASENOTES.html $dst/RELEASENOTES.html
 fi
-if [ -f $dst/changesets/.update ]; then
-    rm -f $dst/changesets/$tag.html
-    $dst/changesets/.update
-fi