Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6513779

Browse files
committed
Fix remaining stray references to CVS.
These are just cosmetic and don't seem worth back-patching far. I put them into 9.0 just because it was trivial to do so.
1 parent cb71efe commit 6513779

File tree

10 files changed

+25
-26
lines changed

10 files changed

+25
-26
lines changed

config/ac_func_accept_argtypes.m4

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# config/ac_func_accept_argtypes.m4
22
# This comes from the official Autoconf macro archive at
33
# <http://research.cys.de/autoconf-archive/>
4-
# (I removed the $ before the Id CVS keyword below.)
54

65

76
dnl @synopsis AC_FUNC_ACCEPT_ARGTYPES
@@ -21,7 +20,7 @@ dnl
2120
dnl NOTE: This is just a modified version of the AC_FUNC_SELECT_ARGTYPES
2221
dnl macro. Credit for that one goes to David MacKenzie et. al.
2322
dnl
24-
dnl @version Id: ac_func_accept_argtypes.m4,v 1.1 1999/12/03 11:29:29 simons Exp $
23+
dnl @version $Id: ac_func_accept_argtypes.m4,v 1.1 1999/12/03 11:29:29 simons Exp $
2524
dnl @author Daniel Richard G. <skunk@mit.edu>
2625
dnl
2726

config/perl.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fi
2424
2525
if test -z "$PERL"; then
2626
AC_MSG_WARN([
27-
*** Without Perl you will not be able to build PostgreSQL from CVS.
27+
*** Without Perl you will not be able to build PostgreSQL from Git.
2828
*** You can obtain Perl from any CPAN mirror site.
2929
*** (If you are using the official distribution of PostgreSQL then you do not
3030
*** need to worry about this, because the Perl output is pre-generated.)])

config/prep_buildtree

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ sourcetree=`cd $1 && pwd`
2222

2323
buildtree=`cd ${2:-'.'} && pwd`
2424

25-
for item in `find "$sourcetree" -type d \( -name CVS -prune -o -print \)`; do
25+
for item in `find "$sourcetree" -type d \( \( -name CVS -prune \) -o \( -name .git -prune \) -o -print \)`; do
2626
subdir=`expr "$item" : "$sourcetree\(.*\)"`
2727
if test ! -d "$buildtree/$subdir"; then
2828
mkdir -p "$buildtree/$subdir" || exit 1

config/programs.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fi
2727
2828
if test -z "$BISON"; then
2929
AC_MSG_WARN([
30-
*** Without Bison you will not be able to build PostgreSQL from CVS nor
30+
*** Without Bison you will not be able to build PostgreSQL from Git nor
3131
*** change any of the parser definition files. You can obtain Bison from
3232
*** a GNU mirror site. (If you are using the official distribution of
3333
*** PostgreSQL then you do not need to worry about this, because the Bison
@@ -89,7 +89,7 @@ fi
8989
9090
if test x"$pgac_cv_path_flex" = x"no"; then
9191
AC_MSG_WARN([
92-
*** Without Flex you will not be able to build PostgreSQL from CVS nor
92+
*** Without Flex you will not be able to build PostgreSQL from Git nor
9393
*** change any of the scanner definition files. You can obtain Flex from
9494
*** a GNU mirror site. (If you are using the official distribution of
9595
*** PostgreSQL then you do not need to worry about this because the Flex

configure

+6-6
Original file line numberDiff line numberDiff line change
@@ -6738,13 +6738,13 @@ fi
67386738

67396739
if test -z "$BISON"; then
67406740
{ $as_echo "$as_me:$LINENO: WARNING:
6741-
*** Without Bison you will not be able to build PostgreSQL from CVS nor
6741+
*** Without Bison you will not be able to build PostgreSQL from Git nor
67426742
*** change any of the parser definition files. You can obtain Bison from
67436743
*** a GNU mirror site. (If you are using the official distribution of
67446744
*** PostgreSQL then you do not need to worry about this, because the Bison
67456745
*** output is pre-generated.)" >&5
67466746
$as_echo "$as_me: WARNING:
6747-
*** Without Bison you will not be able to build PostgreSQL from CVS nor
6747+
*** Without Bison you will not be able to build PostgreSQL from Git nor
67486748
*** change any of the parser definition files. You can obtain Bison from
67496749
*** a GNU mirror site. (If you are using the official distribution of
67506750
*** PostgreSQL then you do not need to worry about this, because the Bison
@@ -6802,13 +6802,13 @@ fi
68026802
$as_echo "$pgac_cv_path_flex" >&6; }
68036803
if test x"$pgac_cv_path_flex" = x"no"; then
68046804
{ $as_echo "$as_me:$LINENO: WARNING:
6805-
*** Without Flex you will not be able to build PostgreSQL from CVS nor
6805+
*** Without Flex you will not be able to build PostgreSQL from Git nor
68066806
*** change any of the scanner definition files. You can obtain Flex from
68076807
*** a GNU mirror site. (If you are using the official distribution of
68086808
*** PostgreSQL then you do not need to worry about this because the Flex
68096809
*** output is pre-generated.)" >&5
68106810
$as_echo "$as_me: WARNING:
6811-
*** Without Flex you will not be able to build PostgreSQL from CVS nor
6811+
*** Without Flex you will not be able to build PostgreSQL from Git nor
68126812
*** change any of the scanner definition files. You can obtain Flex from
68136813
*** a GNU mirror site. (If you are using the official distribution of
68146814
*** PostgreSQL then you do not need to worry about this because the Flex
@@ -6889,12 +6889,12 @@ fi
68896889

68906890
if test -z "$PERL"; then
68916891
{ $as_echo "$as_me:$LINENO: WARNING:
6892-
*** Without Perl you will not be able to build PostgreSQL from CVS.
6892+
*** Without Perl you will not be able to build PostgreSQL from Git.
68936893
*** You can obtain Perl from any CPAN mirror site.
68946894
*** (If you are using the official distribution of PostgreSQL then you do not
68956895
*** need to worry about this, because the Perl output is pre-generated.)" >&5
68966896
$as_echo "$as_me: WARNING:
6897-
*** Without Perl you will not be able to build PostgreSQL from CVS.
6897+
*** Without Perl you will not be able to build PostgreSQL from Git.
68986898
*** You can obtain Perl from any CPAN mirror site.
68996899
*** (If you are using the official distribution of PostgreSQL then you do not
69006900
*** need to worry about this, because the Perl output is pre-generated.)" >&2;}

doc/src/sgml/acronyms.sgml

+10-11
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,6 @@
107107
</listitem>
108108
</varlistentry>
109109

110-
<varlistentry>
111-
<term><acronym>CVS</acronym></term>
112-
<listitem>
113-
<para>
114-
<ulink
115-
url="http://en.wikipedia.org/wiki/Concurrent_Versions_System">Concurrent
116-
Versions System</ulink>
117-
</para>
118-
</listitem>
119-
</varlistentry>
120-
121110
<varlistentry>
122111
<term><acronym>DBA</acronym></term>
123112
<listitem>
@@ -248,6 +237,16 @@
248237
</listitem>
249238
</varlistentry>
250239

240+
<varlistentry>
241+
<term><acronym>Git</acronym></term>
242+
<listitem>
243+
<para>
244+
<ulink
245+
url="http://en.wikipedia.org/wiki/Git_(software)">Git</ulink>
246+
</para>
247+
</listitem>
248+
</varlistentry>
249+
251250
<varlistentry>
252251
<term><acronym>GMT</acronym></term>
253252
<listitem>

doc/src/sgml/external-projects.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
projects that are maintained outside the core <productname>PostgreSQL</>
1818
distribution. PgFoundry is built using the GForge software project and is
1919
similar to <ulink url="http://sourceforge.net">SourceForge.net</> in its
20-
feature set, providing mailing lists, forums, bug tracking, CVS, and web
20+
feature set, providing mailing lists, forums, bug tracking, SCM, and web
2121
hosting. If you have a <productname>PostgreSQL</>-related open source
2222
project that you would like to have hosted at PgFoundy, please feel free
2323
to create a new project.

doc/src/sgml/nls.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<filename>msgmerge</filename>, respectively, in a GNU-compatible
4747
implementation. Later, we will try to arrange it so that if you
4848
use a packaged source distribution, you won't need
49-
<filename>xgettext</filename>. (If working from CVS, you will still need
49+
<filename>xgettext</filename>. (If working from Git, you will still need
5050
it.) <application>GNU Gettext 0.10.36</application> or later is currently recommended.
5151
</para>
5252

src/tools/codelines

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# src/tools/codelines
44

55
# This script is used to compute the total number of "C" lines in the release
6-
# This should be run from the top of the CVS tree after a 'make distclean'
6+
# This should be run from the top of the Git tree after a 'make distclean'
77
find . -name '*.[chyl]' | xargs cat| wc -l

src/tools/msvc/Install.pm

+1
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,7 @@ sub CopyIncludeFiles
438438
while (my $d = readdir($D))
439439
{
440440
next if ($d =~ /^\./);
441+
next if ($d eq '.git');
441442
next if ($d eq 'CVS');
442443
next unless (-d 'src/include/' . $d);
443444

0 commit comments

Comments
 (0)