[svn] Modify dist-wget to work with the subversion repository.

diff --git a/ChangeLog b/ChangeLog
index ab7bb049334e1dc873fe8fef0ddacdf409e7a6fa..392c7d2634fcb347277de5550883db073d5113ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-23  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * util/dist-wget: Port to subversion.
+

 2005-06-22  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * README.svn: Renamed to README.checkout.  Edited to mention the
 2005-06-22  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * README.svn: Renamed to README.checkout.  Edited to mention the

diff --git a/util/dist-wget b/util/dist-wget
index ed6e9ded41e86e566ddd60c18e407a6e4d9d5244..64d7baf6875f83c6d59fd94773de1104f237630a 100755 (executable)
--- a/util/dist-wget
+++ b/util/dist-wget
@@ -32,8 +32,8 @@
 # It uses `make dist' to do most of the work, but corrects some
 # things that `make dist' doesn't and can't do.  Specifically:
 #
 # It uses `make dist' to do most of the work, but corrects some
 # things that `make dist' doesn't and can't do.  Specifically:
 #

-# * Checks out the clean CVS source from the repository to a temporary
-#   directory.
+# * Checks out the clean source from the Subversion repository to a
+#   temporary directory.

 # * Runs autoconf, configure and `make' in the doc and po subdirs to
 #   make sure that all the generated files, such as `configure',
 #   `wget.info', and translated PO files, end up in the distribution.
 # * Runs autoconf, configure and `make' in the doc and po subdirs to
 #   make sure that all the generated files, such as `configure',
 #   `wget.info', and translated PO files, end up in the distribution.


@@ -42,20 +42,26 @@
 # * Runs `make dist' to produce the archive.
 # * Removes the checkout.
 #
 # * Runs `make dist' to produce the archive.
 # * Removes the checkout.
 #

-# For example, to produce a Wget beta based on the latest CVS sources,
-# with version "1.23-beta10", run `dist-wget --force-version 1.23-beta10'.
-# You can choose which sources will be used by specifying `-D DATE'
-# or `-r TAG'.
+# For example, to produce a Wget beta based on the latest sources on
+# the trunk, with version changed to "1.23-beta10", run `dist-wget
+# --force-version 1.23-beta10'.  You can choose which sources will be
+# used by specifying `-b PATH' ("trunk" by default) in combination
+# with one of `-D DATE' or `-r REVISION' (the latest revision by
+# default).
+#
+# Use the MAKE environment variable to specify a different version of
+# make, for example MAKE=gmake dist-wget ...

 #
 ##
 
 set -e
 
 #
 ##
 
 set -e
 

-CVSROOT=:pserver:cvs@sunsite.dk:/pack/anoncvs
-SUBDIR=wget.cvs.$$
+SVNURL=http://svn.dotsrc.org/repo/wget/
+SUBDIR=wget.checkout.$$

 DEBUG=no
 
 DEBUG=no
 

-EXPORT_TAG='-r HEAD'
+EXPORT_PATH=trunk
+EXPORT_REVISION=HEAD

 VERSION=
 MAKE=${MAKE-make}
 
 VERSION=
 MAKE=${MAKE-make}
 


@@ -71,20 +77,26 @@ do
     -d)
       DEBUG=yes
       ;;
     -d)
       DEBUG=yes
       ;;

+    -b)
+      shift
+      EXPORT_PATH=$1
+      ;;

     -D)
       shift
     -D)
       shift

-      EXPORT_TAG="-D $1"
+      # Subversion uses the -r {DATE} syntax for specifying revisions
+      # based on dates.
+      EXPORT_REVISION={$1}

       ;;
     -r)
       shift
       ;;
     -r)
       shift

-      EXPORT_TAG="-r $1"
+      EXPORT_REVISION=$1

       ;;
     --force-version)
       shift
       VERSION=$1
       ;;
     *)
       ;;
     --force-version)
       shift
       VERSION=$1
       ;;
     *)

-      echo "Usage: $0 [-d] [-r TAG | -D DATE]" >&2
+      echo "Usage: $0 [-d] [-b BRANCH] [-r TAG | -D DATE]" >&2

       exit 1
   esac
   shift
       exit 1
   esac
   shift


@@ -109,15 +121,12 @@ echo "Output from commands is in $O."
 echo "-----------" >$O
 
 # Checkout clean sources from the repository.
 echo "-----------" >$O
 
 # Checkout clean sources from the repository.

-echo $e_n "Exporting ($EXPORT_TAG) out the CVS tree to $TMPDIR/$SUBDIR... $e_c"
-cvs -d $CVSROOT export $EXPORT_TAG -d $SUBDIR wget 1>>$O 2>&1
+echo $e_n "Exporting $SVNURL$EXPORT_PATH/ (-r $EXPORT_REVISION) to $TMPDIR/$SUBDIR... $e_c"
+svn export -r "$EXPORT_REVISION" "$SVNURL/$EXPORT_PATH/" $SUBDIR 1>>$O 2>&1

 echo "done."
 
 cd $SUBDIR
 
 echo "done."
 
 cd $SUBDIR
 

-# Remove the dummy `Branches' directory.
-rm -rf Branches 1>>$O 2>&1
-

 # Force the version if required.
 if test x"$VERSION" != x
 then
 # Force the version if required.
 if test x"$VERSION" != x
 then


@@ -128,8 +137,8 @@ fi
 
 # Create configure and friends.
 if test ! -f configure; then
 
 # Create configure and friends.
 if test ! -f configure; then

-  echo $e_n "Creating \`configure' from \`configure.in'... $e_c"
-  $MAKE -f Makefile.cvs 1>>$O 2>&1
+  echo $e_n "Creating \`configure' and \`src/config.h'... $e_c"
+  ./autogen.sh 1>>$O 2>&1

   echo "done."
 fi
 
   echo "done."
 fi