diff options
| author | Stefan Kangas | 2021-12-02 18:17:14 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2021-12-02 18:21:21 +0100 |
| commit | db56f2c264fe7cd7ec2bd3ed7bc96a7473b4983b (patch) | |
| tree | 5112ee5c5017bbec48460e9666e1c40fb25015ed /admin | |
| parent | cf49f6ef656dcb681b904149b2dd95de71ff2668 (diff) | |
| download | emacs-db56f2c264fe7cd7ec2bd3ed7bc96a7473b4983b.tar.gz emacs-db56f2c264fe7cd7ec2bd3ed7bc96a7473b4983b.zip | |
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.
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/update_autogen | 16 |
1 files changed, 1 insertions, 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: | |||
| 63 | commit them (caution). | 63 | commit them (caution). |
| 64 | -q: be quiet; only give error messages, not status messages. | 64 | -q: be quiet; only give error messages, not status messages. |
| 65 | -A: only update autotools files, copying into specified dir. | 65 | -A: only update autotools files, copying into specified dir. |
| 66 | -H: also update ChangeLog.${changelog_n} | ||
| 67 | -L: also update ldefs-boot.el. | 66 | -L: also update ldefs-boot.el. |
| 68 | -C: start from a clean state. Slower, but more correct. | 67 | -C: start from a clean state. Slower, but more correct. |
| 69 | EOF | 68 | EOF |
| @@ -80,13 +79,10 @@ clean= | |||
| 80 | autogendir= # was "autogen" | 79 | autogendir= # was "autogen" |
| 81 | ldefs_flag=1 | 80 | ldefs_flag=1 |
| 82 | lboot_flag= | 81 | lboot_flag= |
| 83 | changelog_flag= | ||
| 84 | 82 | ||
| 85 | ## Parameters. | 83 | ## Parameters. |
| 86 | ldefs_in=lisp/loaddefs.el | 84 | ldefs_in=lisp/loaddefs.el |
| 87 | ldefs_out=lisp/ldefs-boot.el | 85 | ldefs_out=lisp/ldefs-boot.el |
| 88 | changelog_n=$(sed -n 's/CHANGELOG_HISTORY_INDEX_MAX *= *//p' Makefile.in) | ||
| 89 | changelog_files="ChangeLog.$changelog_n" | ||
| 90 | sources="configure.ac lib/Makefile.am" | 86 | sources="configure.ac lib/Makefile.am" |
| 91 | ## Files to copy into autogendir. | 87 | ## Files to copy into autogendir. |
| 92 | ## Everything: | 88 | ## Everything: |
| @@ -109,7 +105,7 @@ tempfile=/tmp/$PN.$$ | |||
| 109 | trap "rm -f $tempfile 2> /dev/null" EXIT | 105 | trap "rm -f $tempfile 2> /dev/null" EXIT |
| 110 | 106 | ||
| 111 | 107 | ||
| 112 | while getopts ":hcfqA:HCL" option ; do | 108 | while getopts ":hcfqA:CL" option ; do |
| 113 | case $option in | 109 | case $option in |
| 114 | (h) usage ;; | 110 | (h) usage ;; |
| 115 | 111 | ||
| @@ -125,8 +121,6 @@ while getopts ":hcfqA:HCL" option ; do | |||
| 125 | 121 | ||
| 126 | (C) clean=1 ;; | 122 | (C) clean=1 ;; |
| 127 | 123 | ||
| 128 | (H) changelog_flag=1 ;; | ||
| 129 | |||
| 130 | (L) lboot_flag=1 ;; | 124 | (L) lboot_flag=1 ;; |
| 131 | 125 | ||
| 132 | (\?) die "Bad option -$OPTARG" ;; | 126 | (\?) die "Bad option -$OPTARG" ;; |
| @@ -321,14 +315,6 @@ modified=$(status $genfiles $ldefs_out $grammar_out) || die | |||
| 321 | commit "loaddefs" $modified || die "commit error" | 315 | commit "loaddefs" $modified || die "commit error" |
| 322 | 316 | ||
| 323 | 317 | ||
| 324 | ## Less important than the other stuff, so do it last. | ||
| 325 | [ ! "$changelog_flag" ] || { | ||
| 326 | make change-history-nocommit || die "make change-history error" | ||
| 327 | modified=$(status $changelog_files) || die | ||
| 328 | commit "ChangeLog" $modified || die "commit error" | ||
| 329 | } | ||
| 330 | |||
| 331 | |||
| 332 | exit 0 | 318 | exit 0 |
| 333 | 319 | ||
| 334 | ### update_autogen ends here | 320 | ### update_autogen ends here |