From 562e638f783aaaef788401db1ecf589b0c502ddb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 25 Apr 2012 18:47:05 -0700 Subject: [PATCH] Remove doc/lispref/tindex.pl I think it is not needed any more. * doc/lispref/tindex.pl: Remove file. * make-dist: No more doc/lispref/tindex.pl. --- ChangeLog | 4 ++ doc/lispref/ChangeLog | 2 + doc/lispref/tindex.pl | 124 ------------------------------------------ make-dist | 2 +- 4 files changed, 7 insertions(+), 125 deletions(-) delete mode 100755 doc/lispref/tindex.pl diff --git a/ChangeLog b/ChangeLog index 505a447c980..73b8c8c0fba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-04-26 Glenn Morris + + * make-dist: No more doc/lispref/tindex.pl. + 2012-04-22 Michael Albinus * configure.in (dbus_validate_bus_name, dbus_validate_path) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 00cba353b02..52af52a151d 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,7 @@ 2012-04-26 Glenn Morris + * tindex.pl: Remove file. + * makefile.w32-in (srcs): * Makefile.in (srcs): Remove back.texi (which is unused). diff --git a/doc/lispref/tindex.pl b/doc/lispref/tindex.pl deleted file mode 100755 index a8765716e71..00000000000 --- a/doc/lispref/tindex.pl +++ /dev/null @@ -1,124 +0,0 @@ -#! /usr/bin/perl - -# Copyright (C) 2000-2012 Free Software Foundation, Inc. - -# This file is part of GNU Emacs. - -# GNU Emacs is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# GNU Emacs is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with GNU Emacs. If not, see . - - -require 5; -use Getopt::Long; - -my $USAGE = < \$help, 'version' => \$version, - 'old=s' => \$old); -if ($version) { - print "0.1\n"; - exit 0; -} elsif (!$rc || !$old || @ARGV) { - print $USAGE; - exit 1; -} elsif ($help) { - print $USAGE; - exit 0; -} - -# Fill the hash %tindex with associations VAR -> COUNT where -# the keys VAR are identifiers mentioned in @tindex lines in the older -# files to process and COUNT is the number of times they are seen in -# the files. - -my %tindex; -my %removed; -my @old_files = glob "$old/*.texi"; -my @new_files = glob "*.texi"; -fatal ("No Texinfo files found in `$old'") unless @old_files; -fatal ("No Texinfo files found in current directory") unless @new_files; - -print "Scanning old files for \@tindex lines\n"; -foreach $file (@old_files) { - open (IN, "<$file") or fatal "Cannot open $file: $!"; - while () { - ++$tindex{$1} if /^\s*\@tindex\s+(\S+)/; - } - close IN; -} - -# Process current files and remove those @tindex lines which we -# know were already present in the files scanned above. - -print "Removing old \@tindex lines\n"; -foreach $file (@new_files) { - my $modified = 0; - my $contents = ""; - - open (IN, "< $file") or fatal "Cannot open $file.orig for reading: $!"; - while () { - if (/^\s*\@tindex\s+(\S+)/ && $tindex{$1}) { - ++$removed{$1}; - $modified = 1; - } else { - $contents = $contents . $_; - } - } - - close IN; - - if ($modified) { - print " $file\n"; - system ("cp $file $file.orig") == 0 or fatal "Cannot backup $file: $!"; - open (OUT, ">$file") or fatal "Cannot open $file for writing: $!"; - print OUT $contents; - close OUT; - } -} - -# Print a list of identifiers removed. - -print "Removed \@tindex commands for:\n"; -my $key; -foreach $key (keys %removed) { - print " $key\n"; -} - diff --git a/make-dist b/make-dist index 55dac98d713..44a123c658a 100755 --- a/make-dist +++ b/make-dist @@ -478,7 +478,7 @@ echo "Making links to \`doc/misc'" echo "Making links to \`doc/lispref'" (cd doc/lispref ln *.texi *.in makefile.w32-in README ChangeLog* ../../${tempdir}/doc/lispref - ln *.txt *.el spellfile tindex.pl ../../${tempdir}/doc/lispref + ln *.txt *.el spellfile ../../${tempdir}/doc/lispref ln two-volume.make ../../${tempdir}/doc/lispref) echo "Making links to \`doc/lispintro'" -- 2.39.2