[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 49daed6: Remove lib-src/grep-changelog
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] master 49daed6: Remove lib-src/grep-changelog |
|
Date: |
Sun, 14 Dec 2014 02:38:59 +0000 |
branch: master
commit 49daed60510a073062b41fa39fd7c010cb0a315e
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Remove lib-src/grep-changelog
Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00145.html
* lib-src/grep-changelog: Remove file.
* lib-src/Makefile.in (INSTALLABLE_SCRIPTS): Remove.
(all, install, uninstall): Remove INSTALLABLE_SCRIPTS.
* doc/man/grep-changelog.1: Remove file.
* make-dist: No more lib-src/grep-changelog.
* INSTALL: No longer mention grep-changelog.
* admin/quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove, and all uses.
* admin/authors.el (authors-valid-file-names): Add grep-changelog.
* etc/NEWS: Mention this.
---
ChangeLog | 2 +
INSTALL | 3 +-
admin/ChangeLog | 5 +
admin/authors.el | 2 +-
admin/quick-install-emacs | 6 +-
doc/man/ChangeLog | 4 +
doc/man/grep-changelog.1 | 80 --------------
etc/NEWS | 5 +
lib-src/ChangeLog | 6 +
lib-src/Makefile.in | 10 +--
lib-src/grep-changelog | 265 ---------------------------------------------
make-dist | 2 +-
12 files changed, 27 insertions(+), 363 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 15117e4..130e587 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2014-12-14 Glenn Morris <address@hidden>
+ * make-dist: No more lib-src/grep-changelog.
+
* INSTALL.REPO: Revert 2014-12-06 change.
2014-12-13 Paul Eggert <address@hidden>
diff --git a/INSTALL b/INSTALL
index 8ecee65..81140a2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -464,8 +464,7 @@ installed locations, with `make install'. By default,
Emacs's files
are installed in the following directories:
`/usr/local/bin' holds the executable programs users normally run -
- `emacs', `etags', `ctags', `emacsclient', and
- `grep-changelog'.
+ `emacs', `etags', `ctags', `emacsclient'.
`/usr/local/share/emacs/VERSION/lisp' holds the Emacs Lisp library;
`VERSION' stands for the number of the Emacs version
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 2e02f04..ed956f9 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-14 Glenn Morris <address@hidden>
+
+ * quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove, and all uses.
+ * authors.el (authors-valid-file-names): Add grep-changelog.
+
2014-12-13 Paul Eggert <address@hidden>
* notes/unicode: Don't mention Czech and Slovakian refcards.
diff --git a/admin/authors.el b/admin/authors.el
index b05f37b..42f3bcd 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -691,7 +691,7 @@ Changes to files in this list are not listed.")
"etags-vmslib.c" "fakemail.c" "getdate.c" "getopt.h" "getopt1.c"
"getopt_.h" "getopt_int.h" "gettext.h" "leditcfns.c" "loadst.c"
"make-path.c" "qsort.c" "sorted-doc.c" "tcp.c" "timer.c" "wakeup.c"
- "yow.c"
+ "yow.c" "grep-changelog"
;; etc/
"emacsclient.c" "etags.c" "hexl.c" "make-docfile.c" "movemail.c"
"test-distrib.c" "testfile"
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 5edc8d4..58fc5f0 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -28,7 +28,6 @@
PUBLIC_LIBSRC_BINARIES='emacsclient etags ctags ebrowse'
-PUBLIC_LIBSRC_SCRIPTS='grep-changelog'
AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$
Makefile.in$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids
[{]arch[}] [.][cho]$ make-docfile"
@@ -230,9 +229,6 @@ maybe_emit_copy $BUILD/src/emacs $DST_BIN/emacs-$VERSION
for F in $PUBLIC_LIBSRC_BINARIES; do
maybe_emit_copy $BUILD/lib-src/$F $DST_BIN/$F
done
-for F in $PUBLIC_LIBSRC_SCRIPTS; do
- maybe_emit_copy $SRC/lib-src/$F $DST_BIN/$F
-done
if test x"$SRC" = x"$BUILD"; then
PFXS="$BUILD"
@@ -259,7 +255,7 @@ for SUBDIR in lisp leim etc lib-src info; do
;;
lib-src)
DST="$DST_LIBEXEC"
- AVOID_PAT="`echo "($AVOID ($PUBLIC_LIBSRC_BINARIES
$PUBLIC_LIBSRC_SCRIPTS)\$)" | tr ' ' '|'`"
+ AVOID_PAT="`echo "($AVOID ($PUBLIC_LIBSRC_BINARIES)\$)" | tr ' ' '|'`"
;;
info)
DST="$DST_INFO"
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index ad220a3..813a416 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-14 Glenn Morris <address@hidden>
+
+ * grep-changelog.1: Remove file.
+
2014-11-10 Glenn Morris <address@hidden>
* emacs.1.in: Rename from emacs.1.
diff --git a/doc/man/grep-changelog.1 b/doc/man/grep-changelog.1
deleted file mode 100644
index a3635a6..0000000
--- a/doc/man/grep-changelog.1
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" -*- nroff -*-
-.\" See section COPYING for copyright and redistribution information.
-.TH grep-changelog 1
-.SH NAME
-grep-changelog \- print ChangeLog entries matching criteria
-.SH SYNOPSIS
-.B grep-changelog
-.RI [ options ]
-.RI [ CHANGELOG .\|.\|.]
-.SH DESCRIPTION
-.B grep-changelog
-searches the named
-.IR CHANGELOG s
-(by default files matching the regular expressions
-.B ChangeLog
-and
-.BR "ChangeLog\e.[0-9]+" )
-for entries matching the specified criteria. At least one option or
-file must be specified. This program is distributed with
-.BR "GNU Emacs" .
-.PP
-.SH OPTIONS
-The program accepts unambiguous abbreviations for option names.
-.TP
-.B \-\-author=AUTHOR
-Print entries whose author matches regular expression
-.IR AUTHOR .
-.TP
-.B \-\-text=TEXT
-Print entries whose text matches regular expression
-.IR TEXT .
-.TP
-.B \-\-exclude=TEXT
-Exclude entries matching regular expression
-.IR TEXT .
-.TP
-.B \-\-from\-date=YYYY\-MM\-DD
-Only consider entries made on or after the given date.
-ChangeLog date entries not in the
-\*(lqYYYY\-MM\-DD\*(rq format are never matched.
-.TP
-.B \-\-to\-date=YYYY\-MM\-DD
-Only consider entries made on or before the given date.
-.TP
-.B \-\-rcs\-log
-Print output in a format suitable for RCS log entries.
-This format removes author lines, leading spaces, and file names.
-.TP
-.B \-\-with\-date
-In RCS log format, print short dates.
-.TP
-.B \-\-reverse
-Show matches in reverse order.
-.TP
-.B \-\-version
-Display version information.
-.TP
-.B \-\-help
-Display basic usage information.
-.
-.SH COPYING
-Copyright
-.if t \(co
-.if n (C)
-2008-2014 Free Software Foundation, Inc.
-.PP
-Permission is granted to make and distribute verbatim copies of this
-document provided the copyright notice and this permission notice are
-preserved on all copies.
-.PP
-Permission is granted to copy and distribute modified versions of
-this document under the conditions for verbatim copying, provided that
-the entire resulting derived work is distributed under the terms of
-a permission notice identical to this one.
-.PP
-Permission is granted to copy and distribute translations of this
-document into another language, under the above conditions for
-modified versions, except that this permission notice may be stated
-in a translation approved by the Free Software Foundation.
-.
diff --git a/etc/NEWS b/etc/NEWS
index 58e4b0e..01c8431 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -43,6 +43,11 @@ Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you
need to.
** The configure option '--enable-silent-rules' and the command
'make V=0' now do a better job of suppressing chatter.
+---
+** The `grep-changelog' script (and its manual page) are no longer included.
+It has no particular connection to Emacs and has not changed in years,
+so if you want to use it, you can always take a copy from an older Emacs.
+
* Startup Changes in Emacs 25.1
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index ab67538..9b6c0da 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-14 Glenn Morris <address@hidden>
+
+ * grep-changelog: Remove file.
+ * Makefile.in (INSTALLABLE_SCRIPTS): Remove.
+ (all, install, uninstall): Remove INSTALLABLE_SCRIPTS.
+
2014-11-23 Glenn Morris <address@hidden>
* Makefile.in (emacsclient.res): Fix yesterday's thinko.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 77d3b78..cae0898 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -137,8 +137,6 @@ CLIENTW = @CLIENTW@
INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) \
ebrowse${EXEEXT}
-INSTALLABLE_SCRIPTS = grep-changelog
-
# Things that Emacs runs internally, or during the build process,
# which should not be installed in bindir.
UTILITIES = profile${EXEEXT} movemail${EXEEXT} hexl${EXEEXT} \
@@ -215,7 +213,7 @@ CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS}
${CFLAGS}
# Configuration files for .o files to depend on.
config_h = ../src/config.h $(srcdir)/../src/conf_post.h
-all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
+all: ${EXE_FILES} ${SCRIPTS}
.PHONY: all need-blessmail maybe-blessmail
@@ -281,17 +279,11 @@ install: $(DESTDIR)${archlibdir}
for file in ${INSTALLABLES} ; do \
$(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file}
"$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e
'$(TRANSFORM)'`${EXEEXT} ; \
done
- for file in ${INSTALLABLE_SCRIPTS} ; do \
- $(INSTALL_SCRIPT) ${srcdir}/$${file} "$(DESTDIR)${bindir}"/`echo
$${file} | sed '$(TRANSFORM)'` ; \
- done
uninstall:
for file in ${INSTALLABLES}; do \
rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//'
-e '$(TRANSFORM)'`${EXEEXT} ; \
done
- for file in ${INSTALLABLE_SCRIPTS}; do \
- rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed '$(TRANSFORM)'` ; \
- done
if [ -d "$(DESTDIR)${archlibdir}" ]; then \
(cd "$(DESTDIR)${archlibdir}" && rm -f ${UTILITIES} ${SCRIPTS}) \
fi
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
deleted file mode 100755
index ab8c5e3..0000000
--- a/lib-src/grep-changelog
+++ /dev/null
@@ -1,265 +0,0 @@
-#! /usr/bin/perl
-
-# Copyright (C) 1999-2014 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 <http://www.gnu.org/licenses/>.
-
-
-# Extract entries from ChangeLogs matching specified criteria.
-# Optionally format the resulting output to a form suitable for RCS
-# logs, like they are used in Emacs, for example. In this format,
-# author lines, leading spaces, and file names are removed.
-
-require 5;
-use strict;
-
-# Parse command line options.
-
-use vars qw($author $regexp $exclude $from_date $to_date
- $rcs_log $with_date $version $help $reverse
- @entries);
-
-use Getopt::Long;
-
-my $result;
-
-if (@ARGV == 0) {
-
- # No arguments cannot possibly mean "show everything"!!
- $result = 0;
-
-} else {
-
- $result = GetOptions ("author=s" => \$author,
- "text=s" => \$regexp,
- "exclude=s" => \$exclude,
- "from-date=s" => \$from_date,
- "to-date=s" => \$to_date,
- "rcs-log" => \$rcs_log,
- "with-date" => \$with_date,
- "reverse!" => \$reverse,
- "version" => \$version,
- "help" => \$help);
-
- # If date options are specified, check that they have the format
- # YYYY-MM-DD.
-
- $result = 0 if $from_date && $from_date !~ /^\d\d\d\d-\d\d-\d\d$/;
- $result = 0 if $to_date && $to_date !~ /^\d\d\d\d-\d\d-\d\d$/;
-}
-
-# Print usage information and exit when necessary.
-
-if ($result == 0 || $help) {
- print <<USAGE;
-
-Usage: $0 [options] [CHANGELOG...]
-
-Print entries in ChangeLogs matching various criteria.
-Valid options are:
-
- --author=AUTHOR Match entries whose author line matches
- regular expression AUTHOR
- --text=TEXT Match entries whose text matches regular
- expression TEXT
- --exclude=TEXT Exclude entries matching TEXT
- --from-date=YYYY-MM-DD Match entries not older than given date
- --to-date=YYYY-MM-DD Match entries not younger than given date
- --rcs-log Format output suitable for RCS log entries
- --with-date Print short date line in RCS log
- --reverse Show entries in reverse (chronological) order
- --version Print version info
- --help Print this help
-
-If no CHANGELOG is specified scan the files "ChangeLog" and
-"ChangeLog.N+" in the current directory. Old-style dates in ChangeLogs
-are not recognized.
-USAGE
- exit !$help;
-}
-
-# Print version info and exit if `--version' was specified.
-
-if ($version) {
- print "0.3\n";
- exit 0;
-}
-
-
-# Value is non-zero if HEADER matches according to command line
-# options specified, i.e. it matches $author, and its date is in
-# the range $from_date <= date <= $to_date.
-
-sub header_match_p {
- my $header = shift;
-
- return 0 unless $header;
-
- # No match if AUTHOR-regexp specified and doesn't match.
- return 0 if $author && $header !~ /$author/;
-
- # Check that the date of the entry matches if date options
- # `--from-date' and/or `--to-date' were specified . Old-style
- # dates in ChangeLogs are not recognized, and never match.
- if ($from_date || $to_date) {
- if ($header =~ /^(\d\d\d\d-\d\d-\d\d)/) {
- my $date = $1;
- return 0 if $from_date && $date lt $from_date;
- return 0 if $to_date && $date gt $to_date;
- } else {
- # Don't bother recognizing old-style dates.
- return 0;
- }
- }
-
- return 1;
-}
-
-
-# Value is non-zero if ENTRY matches the criteria specified on the
-# command line, i.e. it matches $regexp, and it doesn't match
-# $exclude.
-
-sub entry_match_p {
- my $entry = shift;
-
- return 0 unless $entry;
-
- if ($regexp) {
- return 1 if ($entry =~ /$regexp/
- && (!$exclude || $entry !~ $exclude));
- } else {
- return 1 if !$exclude || $entry !~ $exclude;
- }
-
- return 0;
-}
-
-
-# Print HEADER and/or ENTRY in a format suitable for what was
-# specified on the command line. If $rcs_log is specified, author
-# lines are not printed, and leading spaces and file names are removed
-# from ChangeLog entries.
-
-sub print_log {
- my ($header, $entry) = @_;
- my $output = '';
-
- if ($rcs_log) {
- # Remove leading whitespace from entry.
- $entry =~ s/^\s+//mg;
- # Remove file name parts.
- $entry =~ s/^\*.*\(/(/mg;
- # Remove file name parts, 2.
- $entry =~ s/^\*.*://mg;
- if ($with_date) {
- $header =~ /(\d\d\d\d-\d\d-\d\d)/;
- $output = "!changelog-date $1\n";
- }
- $output .= $entry;
- } else {
- $output .= $header . $entry;
- }
-
- if ($reverse) {
- push @entries, $output;
- } else {
- print $output;
- }
-}
-
-# Scan LOG for matching entries, and print them to standard output.
-
-sub parse_changelog {
- my $log = shift;
- my $entry = undef;
- my $header = undef;
-
- @entries = () if $reverse;
-
- # Open the ChangeLog.
- open (IN, "< $log") || die "Cannot open $log: $!";
-
- while (defined(my $line = <IN>)) {
- if ($line =~ /^\S/) {
- # Line is an author-line. Print previous entry if
- # it matches.
- print_log ($header, $entry)
- if header_match_p ($header) && entry_match_p ($entry);
-
- $entry = "";
- $header = $line;
-
- # Add empty lines below the header.
- while (defined($line = <IN>) && $line =~ /^\s*$/) {
- $header = "$header$line";
- }
- }
-
- last unless defined $line;
-
- if ($line =~ /^\s*\*/) {
- # LINE is the first line of a ChangeLog entry. Print
- # previous entry if it matches.
- print_log ($header, $entry)
- if header_match_p ($header) && entry_match_p ($entry);
- $entry = $line;
- } else {
- # Add LINE to the current entry.
- $entry = "$entry$line";
- }
- }
-
- # Print last entry if it matches.
- print_log ($header, $entry)
- if header_match_p ($header) && entry_match_p ($entry);
-
- close IN;
-
- if ($reverse) {
- for (my $entry = @entries; $entry; $entry--) {
- print $entries[$entry-1];
- }
- }
-}
-
-
-# Main program. Process ChangeLogs.
-
-# If files were specified on the command line, parse those files in the
-# order supplied by the user; otherwise parse default files ChangeLog and
-# ChangeLog.NNN according to $reverse.
-unless (@ARGV > 0) {
- @ARGV = ("ChangeLog");
-
- push @ARGV,
- map {"ChangeLog.$_"}
- sort {$b <=> $a}
- map {/\.(\d+)$/; $1}
- do {
- opendir D, '.';
- grep /^ChangeLog\.\d+$/, readdir D;
- };
-
- @ARGV = reverse @ARGV if $reverse;
-}
-
-while (defined (my $log = shift @ARGV)) {
- parse_changelog ($log) if -f $log;
-}
-
-
-# grep-changelog ends here.
diff --git a/make-dist b/make-dist
index 6e85f1d..f287606 100755
--- a/make-dist
+++ b/make-dist
@@ -382,7 +382,7 @@ echo "Making links to \`lib-src'"
(cd lib-src
ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src
ln ChangeLog Makefile.in README ../${tempdir}/lib-src
- ln grep-changelog rcs2log ../${tempdir}/lib-src
+ ln rcs2log ../${tempdir}/lib-src
ln makefile.w32-in ../${tempdir}/lib-src
ln update-game-score.exe.manifest ../${tempdir}/lib-src)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 49daed6: Remove lib-src/grep-changelog,
Glenn Morris <=