Deprecate the --with-cvs option.

1 files changed, 9 insertions, 20 deletions

diff --git a/gettext-tools/misc/add-to-archive b/gettext-tools/misc/add-to-archive
index c52dc49d4..61b8da502 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"