From db56f2c264fe7cd7ec2bd3ed7bc96a7473b4983b Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 2 Dec 2021 18:17:14 +0100 Subject: [PATCH] update_autogen: Remove unused -H flag We now update ChangeLog files only when preparing a new release, so this flag is never used. Keeping it risks confusing more than it helps. * admin/update_autogen: Remove the -H flag as it is no longer used. --- admin/update_autogen | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/admin/update_autogen b/admin/update_autogen index d83760a5713..2b6a46051cb 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -63,7 +63,6 @@ Options: commit them (caution). -q: be quiet; only give error messages, not status messages. -A: only update autotools files, copying into specified dir. --H: also update ChangeLog.${changelog_n} -L: also update ldefs-boot.el. -C: start from a clean state. Slower, but more correct. EOF @@ -80,13 +79,10 @@ clean= autogendir= # was "autogen" ldefs_flag=1 lboot_flag= -changelog_flag= ## Parameters. ldefs_in=lisp/loaddefs.el ldefs_out=lisp/ldefs-boot.el -changelog_n=$(sed -n 's/CHANGELOG_HISTORY_INDEX_MAX *= *//p' Makefile.in) -changelog_files="ChangeLog.$changelog_n" sources="configure.ac lib/Makefile.am" ## Files to copy into autogendir. ## Everything: @@ -109,7 +105,7 @@ tempfile=/tmp/$PN.$$ trap "rm -f $tempfile 2> /dev/null" EXIT -while getopts ":hcfqA:HCL" option ; do +while getopts ":hcfqA:CL" option ; do case $option in (h) usage ;; @@ -125,8 +121,6 @@ while getopts ":hcfqA:HCL" option ; do (C) clean=1 ;; - (H) changelog_flag=1 ;; - (L) lboot_flag=1 ;; (\?) die "Bad option -$OPTARG" ;; @@ -321,14 +315,6 @@ modified=$(status $genfiles $ldefs_out $grammar_out) || die commit "loaddefs" $modified || die "commit error" -## Less important than the other stuff, so do it last. -[ ! "$changelog_flag" ] || { - make change-history-nocommit || die "make change-history error" - modified=$(status $changelog_files) || die - commit "ChangeLog" $modified || die "commit error" -} - - exit 0 ### update_autogen ends here -- 2.39.2