Deprecate the --with-cvs option.

4 files changed, 50 insertions, 42 deletions

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index b76c287..24c2616 100644
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,15 @@
+2010-06-03  Bruno Haible  <bruno@clisp.org>
+
+	Deprecate the --with-cvs option.
+	* autopoint.in: Update comments.
+	* add-to-archive: Update archive.dir.tar.gz, not archive.cvs.tar.gz.
+	* Makefile.am (CLEANFILES): Add archive.cvs.tar.gz instead of
+	archive.dir.tar.gz.
+	(EXTRA_DIST): Add archive.dir.tar.gz instead of archive.cvs.tar.gz.
+	(archive.dir.tar.gz): Adapted from archive.cvs.tar.gz rule.
+	(archive.git.tar.gz, archive.cvs.tar.gz): Generate from
+	archive.dir.tar.gz.
+
 2010-05-26  Bruno Haible  <bruno@clisp.org>
 
 	Interoperability with newer versions of 'cvs'.
diff --git a/gettext-tools/misc/Makefile.am b/gettext-tools/misc/Makefile.am
index 1668782..4147e18 100644
--- a/gettext-tools/misc/Makefile.am
+++ b/gettext-tools/misc/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/misc subdirectory of GNU gettext
-## Copyright (C) 1995-1997, 2000-2003, 2005-2007, 2009 Free Software Foundation, Inc.
+## Copyright (C) 1995-1997, 2000-2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -28,40 +28,40 @@ bin_SCRIPTS = gettextize autopoint
 
 DISTCLEANFILES += gettextize autopoint convert-archive
 
-CLEANFILES += archive.dir.tar.gz archive.git.tar.gz
+CLEANFILES += archive.cvs.tar.gz archive.git.tar.gz
 
-EXTRA_DIST += add-to-archive cvsuser.c archive.cvs.tar.gz
+EXTRA_DIST += add-to-archive cvsuser.c archive.dir.tar.gz
 
 gettextsrcdir = $(datadir)/gettext
 gettextsrc_DATA = archive.@ARCHIVE_FORMAT@.tar.gz
 
-# The archive.cvs.tar.gz is not in the CVS. Alpha-testers must use the one from
+# The archive.dir.tar.gz is not in the CVS. Alpha-testers must use the one from
 # an already installed release.
-archive.cvs.tar.gz:
-	if test -f $(gettextsrcdir)/archive.cvs.tar.gz; then \
-	  cp -p $(gettextsrcdir)/archive.cvs.tar.gz $@; \
+archive.dir.tar.gz:
+	if test -f $(gettextsrcdir)/archive.dir.tar.gz; then \
+	  cp -p $(gettextsrcdir)/archive.dir.tar.gz $@; \
 	else \
-	  echo "archive.cvs.tar.gz is not under version control. Please copy the archive.cvs.tar.gz from an already installed release to gettext-tools/misc/." 1>&2; \
+	  echo "archive.dir.tar.gz is not under version control. Please copy the archive.dir.tar.gz from an already installed release to gettext-tools/misc/." 1>&2; \
 	  exit 1; \
 	fi
 
-# The archive.dir.tar.gz is generated from archive.cvs.tar.gz.
-archive.dir.tar.gz: archive.cvs.tar.gz
-	if test -f archive.cvs.tar.gz; then \
-	  inputfile=archive.cvs.tar.gz; \
+# The archive.git.tar.gz is generated from archive.dir.tar.gz.
+archive.git.tar.gz: archive.dir.tar.gz
+	if test -f archive.dir.tar.gz; then \
+	  inputfile=archive.dir.tar.gz; \
 	else \
-	  inputfile='$(srcdir)'/archive.cvs.tar.gz; \
+	  inputfile='$(srcdir)'/archive.dir.tar.gz; \
 	fi; \
-	./convert-archive cvs dir "$$inputfile" $@
+	./convert-archive dir git "$$inputfile" $@
 
-# The archive.git.tar.gz is generated from archive.cvs.tar.gz.
-archive.git.tar.gz: archive.cvs.tar.gz
-	if test -f archive.cvs.tar.gz; then \
-	  inputfile=archive.cvs.tar.gz; \
+# The archive.cvs.tar.gz is generated from archive.dir.tar.gz.
+archive.cvs.tar.gz: archive.dir.tar.gz
+	if test -f archive.dir.tar.gz; then \
+	  inputfile=archive.dir.tar.gz; \
 	else \
-	  inputfile='$(srcdir)'/archive.cvs.tar.gz; \
+	  inputfile='$(srcdir)'/archive.dir.tar.gz; \
 	fi; \
-	./convert-archive cvs git "$$inputfile" $@
+	./convert-archive dir cvs "$$inputfile" $@
 
 # Emacs Lisp code.
 
diff --git a/gettext-tools/misc/add-to-archive b/gettext-tools/misc/add-to-archive
index c52dc49..61b8da5 100755
--- a/gettext-tools/misc/add-to-archive
+++ b/gettext-tools/misc/add-to-archive
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2006, 2009-2010 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
 #
 
 # Usage: add-to-archive /somewhere/gettext-0.xx.yy.tar.gz
-# Adds the infrastructure files for gettext version 0.xx.yy to the compressed
-# CVS repository in the archive.cvs.tar.gz file.
+# Adds the infrastructure files for gettext version 0.xx.yy to the reposutory
+# in the archive.dir.tar.gz file.
 
 if test $# != 1; then
   echo "Usage: add-to-archive /somewhere/gettext-0.xx.yy.tar.gz"
@@ -38,11 +38,6 @@ fi
 pack=`echo "$pack_ver" | sed -e 's/^\([^-]*\)-.*/\1/'`
 ver=`echo "$pack_ver" | sed -e 's/^[^-]*-\(.*\)/\1/'`
 
-# Set a nonstandard variable, for a good-looking cvs history.
-cvsuser=bruno
-gcc -shared -fPIC -O cvsuser.c -o cvsuser.so
-cvsuser_hack=`pwd`/cvsuser.so
-
 # Unpack, build and install the source distribution.
 myprefix=`pwd`/${pack_ver}-inst
 gunzip -c < "$sourcetgz" | tar xvf -
@@ -91,20 +86,14 @@ work_archive=`pwd`/"$work_dir/archive"
 )
 
 # Add the contents of this directory to the repository.
-cvsroot=`pwd`/autopoint-files
-mkdir "$cvsroot"
-cvs -d "$cvsroot" init
-(cd autopoint-files && tar xvfz ../archive.cvs.tar.gz)
-cvsver=$pack-`echo "$ver" | sed -e 's/\./_/g'`
-(cd "$work_archive"
- CVSUSER=$cvsuser LD_PRELOAD=$cvsuser_hack \
- cvs -d "$cvsroot" import -m "Import $pack_ver" archive release "$cvsver"
-)
-(cd autopoint-files && tar cvfz ../archive.cvs.tar.gz --owner=root --group=root archive)
-(cd autopoint-files && du archive)
+mkdir autopoint-files
+(cd autopoint-files && tar xfz ../archive.dir.tar.gz)
+mkdir autopoint-files/$pack_ver
+(cd "$work_archive" && tar cf - .) | (cd autopoint-files/$pack_ver && tar xf -)
+(cd autopoint-files && tar cfz ../archive.dir.tar.gz --owner=root --group=root *)
 
 # Clean up.
-rm -rf "$cvsroot"
+rm -rf autopoint-files
 rm -rf "$work_dir"
 rm -f cvsuser.so
 rm -rf "$myprefix"
diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index e048d20..26e3ba6 100644
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -399,8 +399,8 @@ case "@ARCHIVE_FORMAT@" in
     ;;
 
   cvs)
-    # We distribute the many different versions of the files in a CVS
-    # repository. This guarantees a good compression rate:
+    # We distributed the many different versions of the files in a CVS
+    # repository. This guaranteed a good compression rate:
     #
     #   Including version    size in KB of
     #                       "du autopoint-files/archive"
@@ -437,6 +437,13 @@ case "@ARCHIVE_FORMAT@" in
     # a severe restrictions, because most of the people who use autopoint are
     # users of CVS.
     #
+    # But the CVS format is now deprecated, because "cvs init" does not work in
+    # all circumstances
+    # (see <http://lists.gnu.org/archive/html/bug-cvs/2010-05/msg00003.html>)
+    # and we are not allowed to distribute the cvs infrastructure files
+    # ourselves
+    # (see <http://lists.gnu.org/archive/html/bug-cvs/2010-06/msg00011.html>).
+    #
     # Check availability of the CVS program.
     (cvs -v) >/dev/null 2>/dev/null || func_fatal_error "cvs program not found"