aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris2015-05-06 21:35:28 -0400
committerGlenn Morris2015-05-06 21:35:28 -0400
commit22f9e2cee692ef1c24fb6c74cb37faf45bd7cb02 (patch)
treea6f45e73e237e8c828c2c29dd6621a96e9b04a55 /admin
parentd45fd912eb7b90ce552db722dbe5893915f0fa1b (diff)
downloademacs-22f9e2cee692ef1c24fb6c74cb37faf45bd7cb02.tar.gz
emacs-22f9e2cee692ef1c24fb6c74cb37faf45bd7cb02.zip
* 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.
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/update_autogen16
1 files changed, 15 insertions, 1 deletions
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:
69 commit them (caution). 69 commit them (caution).
70-q: be quiet; only give error messages, not status messages. 70-q: be quiet; only give error messages, not status messages.
71-A: only update autotools files, copying into specified dir. 71-A: only update autotools files, copying into specified dir.
72-H: also update ChangeLog.${changelog_n}
72-I: also update info/dir. 73-I: also update info/dir.
73-L: also update ldefs-boot.el. 74-L: also update ldefs-boot.el.
74-C: start from a clean state. Slower, but more correct. 75-C: start from a clean state. Slower, but more correct.
@@ -87,10 +88,13 @@ autogendir= # was "autogen"
87ldefs_flag=1 88ldefs_flag=1
88lboot_flag= 89lboot_flag=
89info_flag= 90info_flag=
91changelog_flag=
90 92
91## Parameters. 93## Parameters.
92ldefs_in=lisp/loaddefs.el 94ldefs_in=lisp/loaddefs.el
93ldefs_out=lisp/ldefs-boot.el 95ldefs_out=lisp/ldefs-boot.el
96changelog_n=$(sed -n 's/CHANGELOG_HISTORY_INDEX_MAX *= *//p' Makefile.in)
97changelog_files="ChangeLog.$changelog_n Makefile.in"
94sources="configure.ac lib/Makefile.am" 98sources="configure.ac lib/Makefile.am"
95## Files to copy into autogendir. 99## Files to copy into autogendir.
96## Everything: 100## Everything:
@@ -113,7 +117,7 @@ tempfile=/tmp/$PN.$$
113trap "rm -f $tempfile 2> /dev/null" EXIT 117trap "rm -f $tempfile 2> /dev/null" EXIT
114 118
115 119
116while getopts ":hcfqA:CIL" option ; do 120while getopts ":hcfqA:HCIL" option ; do
117 case $option in 121 case $option in
118 (h) usage ;; 122 (h) usage ;;
119 123
@@ -129,6 +133,8 @@ while getopts ":hcfqA:CIL" option ; do
129 133
130 (C) clean=1 ;; 134 (C) clean=1 ;;
131 135
136 (H) changelog_flag=1 ;;
137
132 (I) info_flag=1 ;; 138 (I) info_flag=1 ;;
133 139
134 (L) lboot_flag=1 ;; 140 (L) lboot_flag=1 ;;
@@ -382,6 +388,14 @@ modified=$(status $genfiles $ldefs_out) || die
382commit "loaddefs" $modified || die "commit error" 388commit "loaddefs" $modified || die "commit error"
383 389
384 390
391## Less important than the other stuff, so do it last.
392[ ! "$changelog_flag" ] || {
393 make change-history-nocommit || die "make change-history error"
394 modified=$(status $changelog_files) || die
395 commit "ChangeLog" $modified || die "commit error"
396}
397
398
385exit 0 399exit 0
386 400
387### update_autogen ends here 401### update_autogen ends here