From: Glenn Morris Date: Thu, 7 May 2015 01:35:28 +0000 (-0400) Subject: * admin/update_autogen: Add option to update ChangeLog. X-Git-Tag: emacs-25.0.90~2168 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=22f9e2cee692ef1c24fb6c74cb37faf45bd7cb02;p=emacs.git * admin/update_autogen: Add option to update ChangeLog. (usage): Mention -H. (changelog_flag, changelog_n, changelog_files): New variables. (main): Check for -H, and maybe run change-history-nocommit. --- diff --git a/admin/update_autogen b/admin/update_autogen index 1bd82967c27..e9d4aa5287c 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -69,6 +69,7 @@ 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} -I: also update info/dir. -L: also update ldefs-boot.el. -C: start from a clean state. Slower, but more correct. @@ -87,10 +88,13 @@ autogendir= # was "autogen" ldefs_flag=1 lboot_flag= info_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 Makefile.in" sources="configure.ac lib/Makefile.am" ## Files to copy into autogendir. ## Everything: @@ -113,7 +117,7 @@ tempfile=/tmp/$PN.$$ trap "rm -f $tempfile 2> /dev/null" EXIT -while getopts ":hcfqA:CIL" option ; do +while getopts ":hcfqA:HCIL" option ; do case $option in (h) usage ;; @@ -129,6 +133,8 @@ while getopts ":hcfqA:CIL" option ; do (C) clean=1 ;; + (H) changelog_flag=1 ;; + (I) info_flag=1 ;; (L) lboot_flag=1 ;; @@ -382,6 +388,14 @@ modified=$(status $genfiles $ldefs_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