Deprecate the --with-cvs option.

diff --git a/Admin/release-steps b/Admin/release-steps
index 683c36332d8e273b8f41d25532df26a3477e7735..8903ef39262b0211d9836e19b883f7410f240bad 100644 (file)
--- a/Admin/release-steps
+++ b/Admin/release-steps
@@ -72,9 +72,9 @@ Tasks not to forget before release:
 
 - "make"; "make dist"; "make distcheck"
 - cd gettext-tools/misc
-  cp archive.cvs.tar.gz-<last-release-number> archive.cvs.tar.gz
+  cp archive.dir.tar.gz-<last-release-number> archive.dir.tar.gz
   ./add-to-archive /somewhere/gettext-0.xx.yy.tar.gz
-  Then update the case statement and the table in autopoint.in.
+  Then update the case statement in autopoint.in.
 - again: "make dist"
 
 * Upload to ftp-upload.gnu.org according to the procedure given by

diff --git a/ChangeLog b/ChangeLog
index fd28a6d3434c8820e14cb76a0df3fa3258a997e4..fe42f311cc65af248aa5277f65e5534a781de727 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-03  Bruno Haible  <bruno@clisp.org>
+
+       Deprecate the --with-cvs option.
+       * DEPENDENCIES: Update entries for git, CVS. Remove entry for RCS.
+       * PACKAGING: Update comments about archive.*.tar.gz.
+
 2010-05-19  Bruno Haible  <bruno@clisp.org>
 
        Link with libunistring, if it exists.

diff --git a/DEPENDENCIES b/DEPENDENCIES
index 8360d0d404ba8a481077b7bc75884654e5dbcec4..4890ebe988c3e45ddb114df9780ab06c1577064b 100644 (file)
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -63,7 +63,8 @@ The following packages should be installed before GNU gettext is installed
 
 * git 1.6 or newer
   + Recommended.
-    Needed by the 'autopoint' program, if configured with --with-git.
+    Needed by the 'autopoint' program, if not configured with --without-git
+    or --with-cvs.
   + Homepage:
     http://git-scm.com/
   + Download:
@@ -118,14 +119,9 @@ The following packages should be installed before GNU gettext is installed
   + If it is installed in a nonstandard directory, pass the option
     --with-libunistring-prefix=DIR to 'configure'.
 
-
-The following packages should be installed when GNU gettext is installed
-(runtime dependencies, but not build dependencies):
-
 * CVS 1.11 or newer
-  + Recommended.
-    Needed by the 'autopoint' program, if not configured with --without-cvs
-    or --with-git.
+  + Optional but deprecated.
+    Needed by the 'autopoint' program, if configured with --with-cvs.
   + Homepage:
     http://ximbiot.com/cvs/wiki/index.php?title=Main_Page
     http://www.nongnu.org/cvs/
@@ -133,6 +129,12 @@ The following packages should be installed when GNU gettext is installed
     http://ftp.gnu.org/non-gnu/cvs/
 
 
+The following packages should be installed when GNU gettext is installed
+(runtime dependencies, but not build dependencies):
+
+None.
+
+
 The following should be installed when GNU gettext is built, but are not
 needed later, once it is installed (build dependencies, but not runtime
 dependencies):
@@ -189,20 +191,3 @@ dependencies):
   + Download:
     http://ftp.gnu.org/gnu/grep/
     ftp://ftp.gnu.org/gnu/grep/
-
-* CVS 1.11 or newer
-  + Recommended.
-    Needed if configuring with --without-cvs or --with-git.
-  + Homepage:
-    http://ximbiot.com/cvs/wiki/index.php?title=Main_Page
-    http://www.nongnu.org/cvs/
-  + Download:
-    http://ftp.gnu.org/non-gnu/cvs/
-
-* RCS 5.7 or newer
-  + Recommended.
-    Needed if configuring with --without-cvs or --with-git.
-  + Homepage:
-    http://www.cs.purdue.edu/homes/trinkle/RCS/
-  + Download:
-    http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-5.7.tar

diff --git a/NEWS b/NEWS
index 2e2648d11120576f4aa03d0c80ad24a9d6086add..e8651a324a4795545d7dc41d1f19ab637d3eeabb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,12 @@ Version 0.18.1 - June 2010
 * Dependencies:
   The libraries and programs are now linked with libunistring if this library
   is already installed.
+
+* Installation options:
+  The configure option --with-cvs is deprecated. The 'autopoint' program will
+  now use the 'git' program by default to compress its archive. If the
+  configure option --without-git is specified, 'autopoint' will not rely on
+  'git', but will instead rely on a locally installed a 3 MB large archive.
 \f
 Version 0.18 - May 2010
 

diff --git a/PACKAGING b/PACKAGING
index 15105c7ab8becdd6952151c195ac64d15f3b588e..033699f1a5dc69004fd7b60dee60f5fa15f8d131 100644 (file)
--- a/PACKAGING
+++ b/PACKAGING
@@ -113,9 +113,9 @@ following file list.
       $prefix/share/gettext/gettext.h
       $prefix/share/gettext/gettext.jar   (only installed if gcj is not present)
       $prefix/share/gettext/msgunfmt.tcl
-      $prefix/share/gettext/archive.cvs.tar.gz
-      $prefix/share/gettext/archive.git.tar.gz   (only installed if --with-git specified)
-      $prefix/share/gettext/archive.dir.tar.gz   (only installed if --without-cvs specified)
+      $prefix/share/gettext/archive.git.tar.gz
+      $prefix/share/gettext/archive.dir.tar.gz   (only installed if --without-git specified)
+      $prefix/share/gettext/archive.cvs.tar.gz   (only installed if --with-cvs specified)
       $prefix/share/aclocal/codeset.m4
       $prefix/share/aclocal/fcntl-o.m4
       $prefix/share/aclocal/gettext.m4

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 670aba70c979b2daca6038d5ff10bc4da56b6a55..b7e87cd4add613f0a16a65a26b234a4240dbac34 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-03  Bruno Haible  <bruno@clisp.org>
+
+       Deprecate the --with-cvs option.
+       * configure.ac: Document options --without-git, --with-cvs.
+       (ARCHIVE_FORMAT): Use cvs only when explicitly asked for.
+
 2010-05-24  Bruno Haible  <bruno@clisp.org>
 
        Use the newest regex module from gnulib.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 1a027127e66917258bfb183a89384e4059b3ee5d..6136df77f9b5f146bd3513d01ca9b72e1867634c 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -314,29 +314,35 @@ aclocaldir='${datadir}/aclocal'
 AC_SUBST([aclocaldir])
 
 dnl Check how to install the set of previous versions, for autopoint.
-AC_ARG_WITH([cvs],
-  [  --without-cvs           don't use cvs to compress the infrastructure archive],
-  [gt_use_cvs=$withval],
-  [gt_use_cvs=maybe])
 AC_ARG_WITH([git],
-  [  --with-git              use git to compress the infrastructure archive],
+  [  --without-git           don't use git to compress the infrastructure archive],
   [gt_use_git=$withval],
-  [gt_use_git=no])
-if test "$gt_use_cvs" != no && test "$gt_use_cvs" != maybe; then
-  # --with-cvs is specified. Even if --with-git is also specified, we use the
-  # cvs format, because it yields smaller archives than the git format.
-  ARCHIVE_FORMAT=cvs
+  [gt_use_git=maybe])
+AC_ARG_WITH([cvs],
+  [  --with-cvs              use cvs to compress the infrastructure archive
+                          (deprecated)],
+  [gt_use_cvs=$withval],
+  [gt_use_cvs=no])
+# The CVS format is 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>).
+if test "$gt_use_git" != no && test "$gt_use_git" != maybe; then
+  # --with-git is specified. Even if --with-cvs is also specified, we use the
+  # git format.
+  ARCHIVE_FORMAT=git
 else
-  if test "$gt_use_git" != no; then
-    # --with-git is specified.
-    ARCHIVE_FORMAT=git
+  if test "$gt_use_cvs" != no; then
+    # --with-cvs is specified.
+    ARCHIVE_FORMAT=cvs
   else
-    # Neither --with-cvs not --with-git is specified.
-    if test "$gt_use_cvs" != no; then
-      # --without-cvs is not specified. Use cvs format.
-      ARCHIVE_FORMAT=cvs
+    # Neither --with-git nor --with-cvs is specified.
+    if test "$gt_use_git" != no; then
+      # --without-git is not specified. Use git format.
+      ARCHIVE_FORMAT=git
     else
-      # --without-cvs is specified.
+      # --without-git is specified.
       ARCHIVE_FORMAT=dir
     fi
   fi

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index b76c2875a65aa41d0ebd261034109a94085f1538..24c2616ae4a0341e725bd06dcddeee8639924807 100644 (file)
--- 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 1668782fb363294b0211ab5b5a9a13aa8da3d9ba..4147e18c14c06c6c62d339deba30adf68110ba41 100644 (file)
--- 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 c52dc49d48c95dedf7126ee5df2fb488333a49c0..61b8da502e711212e3611680b677e7141d409fa4 100755 (executable)
--- 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 e048d20e401683afce03476bd5293009c91f151e..26e3ba6ec2718e95b8b47559ee510a286d6cde32 100644 (file)
--- 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"