aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-25 18:47:05 -0700
committerGlenn Morris2012-04-25 18:47:05 -0700
commit562e638f783aaaef788401db1ecf589b0c502ddb (patch)
tree80dbb0e6cf216a28f9ce15cd10a2098e62742ea2
parent674ea9c6e466ac3faaaac32dc2a912d05e30dfee (diff)
downloademacs-562e638f783aaaef788401db1ecf589b0c502ddb.tar.gz
emacs-562e638f783aaaef788401db1ecf589b0c502ddb.zip
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.
-rw-r--r--ChangeLog4
-rw-r--r--doc/lispref/ChangeLog2
-rwxr-xr-xdoc/lispref/tindex.pl124
-rwxr-xr-xmake-dist2
4 files changed, 7 insertions, 125 deletions
diff --git a/ChangeLog b/ChangeLog
index 505a447c980..73b8c8c0fba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12012-04-26 Glenn Morris <rgm@gnu.org>
2
3 * make-dist: No more doc/lispref/tindex.pl.
4
12012-04-22 Michael Albinus <michael.albinus@gmx.de> 52012-04-22 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * configure.in (dbus_validate_bus_name, dbus_validate_path) 7 * 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 @@
12012-04-26 Glenn Morris <rgm@gnu.org> 12012-04-26 Glenn Morris <rgm@gnu.org>
2 2
3 * tindex.pl: Remove file.
4
3 * makefile.w32-in (srcs): 5 * makefile.w32-in (srcs):
4 * Makefile.in (srcs): Remove back.texi (which is unused). 6 * Makefile.in (srcs): Remove back.texi (which is unused).
5 7
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 @@
1#! /usr/bin/perl
2
3# Copyright (C) 2000-2012 Free Software Foundation, Inc.
4
5# This file is part of GNU Emacs.
6
7# GNU Emacs is free software: you can redistribute it and/or modify
8# it under the terms of the GNU General Public License as published by
9# the Free Software Foundation, either version 3 of the License, or
10# (at your option) any later version.
11
12# GNU Emacs is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU General Public License for more details.
16
17# You should have received a copy of the GNU General Public License
18# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
19
20
21require 5;
22use Getopt::Long;
23
24my $USAGE = <<ENDUSAGE;
25Remove \@tindex lines from files that were already present in previous
26versions.
27
28Usage: $0 [--old=EXT] FILE...
29 $0 --help
30 $0 --version
31
32 --help display this help and exit
33 --version print version and exit
34 --old=DIR find old files in DIR
35
36The script performs two passes. In the first pass, Texinfo files from
37DIR are scanned for \@tindex lines, and identifiers in them are
38recorded. In a second pass, Texinfo files in the current directory
39are scanned, and \@tindex lines for identifiers that were recorded in
40the first pass are removed. Old file contents are saved in files
41with extension ".orig". A list of modified files and removed \@tindex
42identifiers is printed to stdout at the end.
43ENDUSAGE
44
45sub fatal {
46 print STDERR "$0: ", @_, ".\n";
47 exit 1;
48}
49
50my $help = 0;
51my $version = 0;
52my $old;
53
54my $rc = GetOptions ('help' => \$help, 'version' => \$version,
55 'old=s' => \$old);
56if ($version) {
57 print "0.1\n";
58 exit 0;
59} elsif (!$rc || !$old || @ARGV) {
60 print $USAGE;
61 exit 1;
62} elsif ($help) {
63 print $USAGE;
64 exit 0;
65}
66
67# Fill the hash %tindex with associations VAR -> COUNT where
68# the keys VAR are identifiers mentioned in @tindex lines in the older
69# files to process and COUNT is the number of times they are seen in
70# the files.
71
72my %tindex;
73my %removed;
74my @old_files = glob "$old/*.texi";
75my @new_files = glob "*.texi";
76fatal ("No Texinfo files found in `$old'") unless @old_files;
77fatal ("No Texinfo files found in current directory") unless @new_files;
78
79print "Scanning old files for \@tindex lines\n";
80foreach $file (@old_files) {
81 open (IN, "<$file") or fatal "Cannot open $file: $!";
82 while (<IN>) {
83 ++$tindex{$1} if /^\s*\@tindex\s+(\S+)/;
84 }
85 close IN;
86}
87
88# Process current files and remove those @tindex lines which we
89# know were already present in the files scanned above.
90
91print "Removing old \@tindex lines\n";
92foreach $file (@new_files) {
93 my $modified = 0;
94 my $contents = "";
95
96 open (IN, "< $file") or fatal "Cannot open $file.orig for reading: $!";
97 while (<IN>) {
98 if (/^\s*\@tindex\s+(\S+)/ && $tindex{$1}) {
99 ++$removed{$1};
100 $modified = 1;
101 } else {
102 $contents = $contents . $_;
103 }
104 }
105
106 close IN;
107
108 if ($modified) {
109 print " $file\n";
110 system ("cp $file $file.orig") == 0 or fatal "Cannot backup $file: $!";
111 open (OUT, ">$file") or fatal "Cannot open $file for writing: $!";
112 print OUT $contents;
113 close OUT;
114 }
115}
116
117# Print a list of identifiers removed.
118
119print "Removed \@tindex commands for:\n";
120my $key;
121foreach $key (keys %removed) {
122 print " $key\n";
123}
124
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'"
478echo "Making links to \`doc/lispref'" 478echo "Making links to \`doc/lispref'"
479(cd doc/lispref 479(cd doc/lispref
480 ln *.texi *.in makefile.w32-in README ChangeLog* ../../${tempdir}/doc/lispref 480 ln *.texi *.in makefile.w32-in README ChangeLog* ../../${tempdir}/doc/lispref
481 ln *.txt *.el spellfile tindex.pl ../../${tempdir}/doc/lispref 481 ln *.txt *.el spellfile ../../${tempdir}/doc/lispref
482 ln two-volume.make ../../${tempdir}/doc/lispref) 482 ln two-volume.make ../../${tempdir}/doc/lispref)
483 483
484echo "Making links to \`doc/lispintro'" 484echo "Making links to \`doc/lispintro'"