aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-06-03 16:49:12 -0700
committerGlenn Morris2012-06-03 16:49:12 -0700
commit418cd7265a941032b467215839b3726b3ba37b0b (patch)
tree432c2d5507f6cedb2f3ecafa299c318f7b19cca8
parent1e266c88b2ae2d7615d9aefe9a93ad520d02e680 (diff)
downloademacs-418cd7265a941032b467215839b3726b3ba37b0b.tar.gz
emacs-418cd7265a941032b467215839b3726b3ba37b0b.zip
Remove lib-src/rcs-checkin
This script isn't used by Emacs, and I can't imagine anyone else is using it any more either... From the commentary: "This script is intended to be used to convert files with an old-Emacs-style version history for use with VC (the Emacs 19 version-control interface), which likes to use RCS as its back end." * lib-src/rcs-checkin: Remove file. * lib-src/Makefile.in (INSTALLABLE_SCRIPTS, STAMP_INST_SCRIPTS): Remove rcs-checkin. (stamp-rcs-checkin): Remove. * INSTALL, make-dist: Remove rcs-checkin. * admin/quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove rcs-checkin. * doc/man/rcs-checkin.1: Remove.
-rw-r--r--ChangeLog4
-rw-r--r--INSTALL13
-rw-r--r--admin/ChangeLog4
-rwxr-xr-xadmin/quick-install-emacs4
-rw-r--r--doc/man/ChangeLog8
-rw-r--r--doc/man/rcs-checkin.187
-rw-r--r--lib-src/ChangeLog7
-rw-r--r--lib-src/Makefile.in8
-rwxr-xr-xlib-src/rcs-checkin116
-rwxr-xr-xmake-dist2
10 files changed, 31 insertions, 222 deletions
diff --git a/ChangeLog b/ChangeLog
index 4aeffbcc4e9..3a4c7fee5f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12012-06-03 Glenn Morris <rgm@gnu.org>
2
3 * INSTALL, make-dist: Remove rcs-checkin.
4
12012-06-03 Ulrich Müller <ulm@gentoo.org> 52012-06-03 Ulrich Müller <ulm@gentoo.org>
2 6
3 * configure.in (PAXCTL): Check for paxctl. (Bug#11398) 7 * configure.in (PAXCTL): Check for paxctl. (Bug#11398)
diff --git a/INSTALL b/INSTALL
index 1df686ae636..f0b22260a50 100644
--- a/INSTALL
+++ b/INSTALL
@@ -474,8 +474,8 @@ installed locations, with `make install'. By default, Emacs's files
474are installed in the following directories: 474are installed in the following directories:
475 475
476`/usr/local/bin' holds the executable programs users normally run - 476`/usr/local/bin' holds the executable programs users normally run -
477 `emacs', `etags', `ctags', `emacsclient', 477 `emacs', `etags', `ctags', `emacsclient', and
478 `grep-changelog', and `rcs-checkin'. 478 `grep-changelog'.
479 479
480`/usr/local/share/emacs/VERSION/lisp' holds the Emacs Lisp library; 480`/usr/local/share/emacs/VERSION/lisp' holds the Emacs Lisp library;
481 `VERSION' stands for the number of the Emacs version 481 `VERSION' stands for the number of the Emacs version
@@ -721,8 +721,8 @@ in `./lib-src' to their final destinations, as selected in `./src/epaths.h'.
721Strictly speaking, not all of the executables in `./lib-src' need be copied. 721Strictly speaking, not all of the executables in `./lib-src' need be copied.
722- The programs `hexl', `movemail', `profile', `rcs2log', and `vcdiff' 722- The programs `hexl', `movemail', `profile', `rcs2log', and `vcdiff'
723 are used by Emacs; they do need to be copied. 723 are used by Emacs; they do need to be copied.
724- The programs `etags', `ctags', `emacsclient', and `rcs-checkin' 724- The programs `etags', `ctags', and `emacsclient' are intended to be
725 are intended to be run by users; they are handled below. 725 run by users; they are handled below.
726- The programs `make-docfile' and `test-distrib' were 726- The programs `make-docfile' and `test-distrib' were
727 used in building Emacs, and are not needed any more. 727 used in building Emacs, and are not needed any more.
728 728
@@ -741,9 +741,8 @@ of installing different versions.
741 741
742You can delete `./src/temacs'. 742You can delete `./src/temacs'.
743 743
7444) Copy the programs `emacsclient', `ctags', `etags', and `rcs-checkin' 7444) Copy the programs `emacsclient', `ctags', and `etags' from `./lib-src'
745from `./lib-src' to `/usr/local/bin'. These programs are intended for 745to `/usr/local/bin'. These programs are intended for users to run.
746users to run.
747 746
7485) Copy the man pages in `./doc/man' into the appropriate man directory. 7475) Copy the man pages in `./doc/man' into the appropriate man directory.
749 748
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 3ed52c68154..e425c99b8d0 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12012-06-03 Glenn Morris <rgm@gnu.org>
2
3 * quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove rcs-checkin.
4
12012-06-01 Paul Eggert <eggert@cs.ucla.edu> 52012-06-01 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Remove --disable-maintainer-mode option from 'configure'. (Bug#11555) 7 Remove --disable-maintainer-mode option from 'configure'. (Bug#11555)
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 06cd2d40901..7004e8f1b27 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2### quick-install-emacs --- do a halfway-decent job of installing emacs quickly 2### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
3 3
4## Copyright (C) 2001-2012 Free Software Foundation, Inc. 4## Copyright (C) 2001-2012 Free Software Foundation, Inc.
5 5
6## Author: Miles Bader <miles@gnu.org> 6## Author: Miles Bader <miles@gnu.org>
7 7
@@ -28,7 +28,7 @@
28 28
29 29
30PUBLIC_LIBSRC_BINARIES='emacsclient etags ctags ebrowse' 30PUBLIC_LIBSRC_BINARIES='emacsclient etags ctags ebrowse'
31PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin' 31PUBLIC_LIBSRC_SCRIPTS='grep-changelog'
32 32
33AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib" 33AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib"
34 34
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index cf7e1a50c9f..cc54cd254b5 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
12012-06-03 Glenn Morris <rgm@gnu.org>
2
3 * rcs-checkin.1: Remove.
4
12012-04-07 Glenn Morris <rgm@gnu.org> 52012-04-07 Glenn Morris <rgm@gnu.org>
2 6
3 * emacs.1: Bump version to 24.1.50. 7 * emacs.1: Bump version to 24.1.50.
@@ -134,11 +138,9 @@
134 138
135;; Local Variables: 139;; Local Variables:
136;; coding: utf-8 140;; coding: utf-8
137;; fill-column: 79
138;; add-log-time-zone-rule: t
139;; End: 141;; End:
140 142
141 Copyright (C) 2007-2012 Free Software Foundation, Inc. 143 Copyright (C) 2007-2012 Free Software Foundation, Inc.
142 144
143 This file is part of GNU Emacs. 145 This file is part of GNU Emacs.
144 146
diff --git a/doc/man/rcs-checkin.1 b/doc/man/rcs-checkin.1
deleted file mode 100644
index a17c28a4d58..00000000000
--- a/doc/man/rcs-checkin.1
+++ /dev/null
@@ -1,87 +0,0 @@
1.\" See section COPYING for copyright and redistribution information.
2.TH rcs-checkin 1
3.SH NAME
4rcs-checkin \- check files into RCS
5.SH SYNOPSIS
6.B rcs-checkin
7.RI [ FILE .\|.\|.]
8.SH DESCRIPTION
9.B rcs-checkin
10is a helper script for checking files into RCS. This program is
11distributed with
12.BR "GNU Emacs" .
13
14This program converts files with an old
15.BR Emacs -style
16version history for use with the
17.B "Emacs 19"
18version control interface
19.BR VC ,
20which likes to use RCS as its back end.
21
22For each file to be processed, the script looks for
23.B Emacs
24version files related to it. These files are checked in as deltas,
25oldest first, so that the contents of the file itself becomes the
26latest revision in the master.
27
28The first line of each file is used as its description. The file
29itself is not deleted, as under
30.B VC
31with
32.B vc-keep-workfiles
33at its default of
34.BR t ,
35but all the version files are.
36
37If an argument file is already version-controlled under RCS, any
38version files are added to the list of deltas and deleted, and then
39the workfile is checked in again as the latest version. This is
40probably not quite what was wanted, and is the main reason VC doesn't
41simply call this to do checkins.
42
43In order to make it easier to use
44.BR "rcs-checkin *" ,
45files which are detectably either RCS masters (with names ending in
46.BR ,v )
47or Emacs version files (with names containing
48.BR ~ )
49are ignored.
50.
51.PP
52.SH OPTIONS
53The program accepts no options.
54.
55.SH SEE ALSO
56The Emacs version control interface is documented in the GNU Emacs manual,
57which you can read using
58.BR Info ,
59either from Emacs or as a standalone program.
60.
61.SH AUTHORS
62.I rcs-checkin
63was originally written by Paul Eggert. It was revised for use with
64.B "GNU Emacs"
65.B VC
66by Eric S. Raymond.
67.
68.SH COPYING
69Copyright
70.if t \(co
71.if n (C)
722008-2012 Free Software Foundation, Inc.
73.PP
74Permission is granted to make and distribute verbatim copies of this
75document provided the copyright notice and this permission notice are
76preserved on all copies.
77.PP
78Permission is granted to copy and distribute modified versions of
79this document under the conditions for verbatim copying, provided that
80the entire resulting derived work is distributed under the terms of
81a permission notice identical to this one.
82.PP
83Permission is granted to copy and distribute translations of this
84document into another language, under the above conditions for
85modified versions, except that this permission notice may be stated
86in a translation approved by the Free Software Foundation.
87.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index ff631d09fcd..5a5a04a770e 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
12012-06-03 Glenn Morris <rgm@gnu.org>
2
3 * rcs-checkin: Remove file.
4 * Makefile.in (INSTALLABLE_SCRIPTS, STAMP_INST_SCRIPTS):
5 Remove rcs-checkin.
6 (stamp-rcs-checkin): Remove.
7
12012-05-31 Eli Zaretskii <eliz@gnu.org> 82012-05-31 Eli Zaretskii <eliz@gnu.org>
2 9
3 * makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS) 10 * makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS)
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index f1ad84f4d44..f3fd640576b 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -117,8 +117,8 @@ MKDIR_P = @MKDIR_P@
117INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \ 117INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
118 ebrowse${EXEEXT} 118 ebrowse${EXEEXT}
119 119
120INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog 120INSTALLABLE_SCRIPTS = grep-changelog
121STAMP_INST_SCRIPTS = stamp-rcs-checkin stamp-grep-changelog 121STAMP_INST_SCRIPTS = stamp-grep-changelog
122 122
123# Things that Emacs runs internally, or during the build process, 123# Things that Emacs runs internally, or during the build process,
124# which should not be installed in bindir. 124# which should not be installed in bindir.
@@ -195,10 +195,6 @@ stamp-rcs2log: $(srcdir)/rcs2log
195 $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log 195 $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log
196 touch $@ 196 touch $@
197 197
198stamp-rcs-checkin: $(srcdir)/rcs-checkin
199 $(insrcdir) || cp -p $(srcdir)/rcs-checkin rcs-checkin
200 touch $@
201
202stamp-grep-changelog: $(srcdir)/grep-changelog 198stamp-grep-changelog: $(srcdir)/grep-changelog
203 $(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog 199 $(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog
204 touch $@ 200 touch $@
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
deleted file mode 100755
index 57e91becf9d..00000000000
--- a/lib-src/rcs-checkin
+++ /dev/null
@@ -1,116 +0,0 @@
1#! /bin/sh
2
3# This script accepts any number of file arguments and checks them into RCS.
4
5# Copyright (C) 1993-1995, 2001-2012 Free Software Foundation, Inc.
6
7# This file is part of GNU Emacs.
8
9# GNU Emacs is free software: you can redistribute it and/or modify
10# it under the terms of the GNU General Public License as published by
11# the Free Software Foundation, either version 3 of the License, or
12# (at your option) any later version.
13
14# GNU Emacs is distributed in the hope that it will be useful,
15# but WITHOUT ANY WARRANTY; without even the implied warranty of
16# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17# GNU General Public License for more details.
18
19# You should have received a copy of the GNU General Public License
20# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
21
22
23# Arguments which are detectably either RCS masters (with names ending in ,v)
24# or Emacs version files (with names of the form foo.~<number>~) are ignored.
25# For each file foo, the script looks for Emacs version files related to it.
26# These files are checked in as deltas, oldest first, so that the contents of
27# the file itself becomes the latest revision in the master.
28#
29# The first line of each file is used as its description text. The file itself
30# is not deleted, as under VC with vc-keep-workfiles at its default of t, but
31# all the version files are.
32#
33# If an argument file is already version-controlled under RCS, any version
34# files are added to the list of deltas and deleted, and then the workfile
35# is checked in again as the latest version. This is probably not quite
36# what was wanted, and is the main reason VC doesn't simply call this to
37# do checkins.
38#
39# This script is intended to be used to convert files with an old-Emacs-style
40# version history for use with VC (the Emacs 19 version-control interface),
41# which likes to use RCS as its back end. It was written by Paul Eggert
42# and revised/documented for use with VC by Eric S. Raymond, Mar 19 1993.
43
44case $# in
450)
46 echo "rcs-checkin: usage: rcs-checkin file ..."
47 echo "rcs-checkin: function: checks file.~*~ and file into a new RCS file"
48 echo "rcs-checkin: function: uses the file's first line for the description"
49esac
50
51# expr pattern to extract owner from ls -l output
52ls_owner_pattern='[^ ][^ ]* *[^ ][^ ]* *\([^ ][^ ]*\)'
53
54for file
55do
56 # Make it easier to say `rcs-checkin *'
57 # by ignoring file names that already contain `~', or end in `,v'.
58 case $file in
59 *~* | *,v) continue
60 esac
61 # Ignore non-files too.
62 test -f "$file" || continue
63
64 # Check that file is readable.
65 test -r "$file" || exit
66
67 # If the RCS file does not already exist,
68 # initialize it with a description from $file's first line.
69 rlog -R "$file" >/dev/null 2>&1 ||
70 rcs -i -q -t-"`sed 1q $file`" "$file" || exit
71
72 # Get list of old files.
73 oldfiles=`
74 ls $file.~[0-9]*~ 2>/dev/null |
75 sort -t~ -n -k 2
76 `
77
78 # Check that they are properly sorted by date.
79 case $oldfiles in
80 ?*)
81 oldfiles_by_date=`ls -rt $file $oldfiles`
82 test " $oldfiles
83$file" = " $oldfiles_by_date" || {
84 echo >&2 "rcs-checkin: skipping $file, because its mod times are out of order.
85
86Sorted by mod time:
87$oldfiles_by_date
88
89Sorted by name:
90$oldfiles
91$file"
92 continue
93 }
94 esac
95
96 echo >&2 rcs-checkin: checking in: $oldfiles $file
97
98 # Save $file as $file.~-~ temporarily.
99 mv "$file" "$file.~-~" || exit
100
101 # Rename each old file to $file, and check it in.
102 for oldfile in $oldfiles
103 do
104 mv "$oldfile" "$file" || exit
105 ls_l=`ls -l "$file"` || exit
106 owner=-w`expr " $ls_l" : " $ls_owner_pattern"` || owner=
107 echo "Formerly ${oldfile}" | ci -d -l -q $owner "$file" || exit
108 done
109
110 # Bring $file back from $file.~-~, and check it in.
111 mv "$file.~-~" "$file" || exit
112 ls_l=`ls -l "$file"` || exit
113 owner=-w`expr " $ls_l" : " $ls_owner_pattern"` || owner=
114 ci -d -q -u $owner -m"entered into RCS" "$file" || exit
115done
116
diff --git a/make-dist b/make-dist
index ead1fa544ec..fd2c0743cdf 100755
--- a/make-dist
+++ b/make-dist
@@ -387,7 +387,7 @@ echo "Making links to \`lib-src'"
387(cd lib-src 387(cd lib-src
388 ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src 388 ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src
389 ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src 389 ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src
390 ln grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src 390 ln grep-changelog rcs2log ../${tempdir}/lib-src
391 ln makefile.w32-in ../${tempdir}/lib-src) 391 ln makefile.w32-in ../${tempdir}/lib-src)
392 392
393echo "Making links to \`m4'" 393echo "Making links to \`m4'"