[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master c13b49a: update_autogen: Remove deprecated -I flag
From: |
Stefan Kangas |
Subject: |
master c13b49a: update_autogen: Remove deprecated -I flag |
Date: |
Wed, 1 Dec 2021 05:30:43 -0500 (EST) |
branch: master
commit c13b49a110ffd23975e98c053746054492a3908a
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
update_autogen: Remove deprecated -I flag
* admin/update_autogen (info_dir): Remove deprecated -I flag; it is no
longer used since info/dir is now generated at install time if needed,
and is not in the repository any more.
---
admin/update_autogen | 64 +---------------------------------------------------
1 file changed, 1 insertion(+), 63 deletions(-)
diff --git a/admin/update_autogen b/admin/update_autogen
index a54c5ac..ff5a338 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -64,7 +64,6 @@ Options:
-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.
EOF
@@ -81,7 +80,6 @@ clean=
autogendir= # was "autogen"
ldefs_flag=1
lboot_flag=
-info_flag=
changelog_flag=
## Parameters.
@@ -129,8 +127,6 @@ while getopts ":hcfqA:HCIL" option ; do
(H) changelog_flag=1 ;;
- (I) info_flag=1 ;;
-
(L) lboot_flag=1 ;;
(\?) die "Bad option -$OPTARG" ;;
@@ -172,7 +168,7 @@ status ()
echo "Checking input file status..."
## The lisp portion could be more permissive, eg only care about .el files.
-modified=$(status ${autogendir:+$sources} ${ldefs_flag:+lisp}
${info_flag:+doc}) || die
+modified=$(status ${autogendir:+$sources} ${ldefs_flag:+lisp}) || die
[ "$modified" ] && {
echo "Locally modified: $modified"
@@ -235,61 +231,6 @@ commit ()
} # function commit
-## No longer used since info/dir is now generated at install time if needed,
-## and is not in the repository any more.
-info_dir ()
-{
- local basefile=build-aux/dir_top outfile=info/dir
-
- echo "Regenerating info/dir..."
-
- ## Header contains non-printing characters, so this is more
- ## reliable than using echo.
- rm -f $outfile
- cp $basefile $outfile
-
- local topic file dircat
-
- ## FIXME inefficient looping.
- for topic in "Texinfo documentation system" "Emacs" "GNU Emacs Lisp" \
- "Emacs editing modes" "Emacs network features" "Emacs misc features" \
- "Emacs lisp libraries"; do
-
- cat - <<EOF >> $outfile
-
-$topic
-EOF
- ## Bit faster than doc/*/*.texi.
- for file in doc/emacs/emacs.texi doc/lispintro/*.texi \
- doc/lispref/elisp.texi doc/misc/*.texi; do
-
- ## FIXME do not ignore w32 if OS is w32.
- case $file in
- *-xtra.texi|*efaq-w32.texi) continue ;;
- esac
-
- dircat=$(sed -n -e 's/@value{emacsname}/Emacs/' -e
's/^@dircategory //p' $file)
-
- ## TODO warn about unknown topics (check-info in top-level
- ## Makefile does this).
- [ "$dircat" = "$topic" ] || continue
-
- sed -n -e 's/@value{emacsname}/Emacs/' \
- -e 's/@acronym{\([A-Z]*\)}/\1/' \
- -e '/^@direntry/,/^@end direntry/ s/^\([^@]\)/\1/p' \
- $file >> $outfile
-
- done
- done
-
- local modified
-
- modified=$(status $outfile) || die
-
- commit "info/dir" $modified || die "commit error"
-} # function info_dir
-
-
[ "$autogendir" ] && {
cp $genfiles $autogendir/
@@ -306,9 +247,6 @@ EOF
} # $autogendir
-[ "$info_flag" ] && info_dir
-
-
[ "$ldefs_flag" ] || exit 0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master c13b49a: update_autogen: Remove deprecated -I flag,
Stefan Kangas <=