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

This commit is contained in:
hniksic 2005-06-23 05:30:56 -07:00
parent af91adf53f
commit 818e2ae7c0
2 changed files with 32 additions and 19 deletions

View File

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

View File

@ -32,8 +32,8 @@
# It uses `make dist' to do most of the work, but corrects some # It uses `make dist' to do most of the work, but corrects some
# things that `make dist' doesn't and can't do. Specifically: # things that `make dist' doesn't and can't do. Specifically:
# #
# * Checks out the clean CVS source from the repository to a temporary # * Checks out the clean source from the Subversion repository to a
# directory. # temporary directory.
# * Runs autoconf, configure and `make' in the doc and po subdirs to # * Runs autoconf, configure and `make' in the doc and po subdirs to
# make sure that all the generated files, such as `configure', # make sure that all the generated files, such as `configure',
# `wget.info', and translated PO files, end up in the distribution. # `wget.info', and translated PO files, end up in the distribution.
@ -42,20 +42,26 @@
# * Runs `make dist' to produce the archive. # * Runs `make dist' to produce the archive.
# * Removes the checkout. # * Removes the checkout.
# #
# For example, to produce a Wget beta based on the latest CVS sources, # For example, to produce a Wget beta based on the latest sources on
# with version "1.23-beta10", run `dist-wget --force-version 1.23-beta10'. # the trunk, with version changed to "1.23-beta10", run `dist-wget
# You can choose which sources will be used by specifying `-D DATE' # --force-version 1.23-beta10'. You can choose which sources will be
# or `-r TAG'. # 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 SVNURL=http://svn.dotsrc.org/repo/wget/
SUBDIR=wget.cvs.$$ SUBDIR=wget.checkout.$$
DEBUG=no DEBUG=no
EXPORT_TAG='-r HEAD' EXPORT_PATH=trunk
EXPORT_REVISION=HEAD
VERSION= VERSION=
MAKE=${MAKE-make} MAKE=${MAKE-make}
@ -71,20 +77,26 @@ do
-d) -d)
DEBUG=yes DEBUG=yes
;; ;;
-b)
shift
EXPORT_PATH=$1
;;
-D) -D)
shift shift
EXPORT_TAG="-D $1" # Subversion uses the -r {DATE} syntax for specifying revisions
# based on dates.
EXPORT_REVISION={$1}
;; ;;
-r) -r)
shift shift
EXPORT_TAG="-r $1" EXPORT_REVISION=$1
;; ;;
--force-version) --force-version)
shift shift
VERSION=$1 VERSION=$1
;; ;;
*) *)
echo "Usage: $0 [-d] [-r TAG | -D DATE]" >&2 echo "Usage: $0 [-d] [-b BRANCH] [-r TAG | -D DATE]" >&2
exit 1 exit 1
esac esac
shift shift
@ -109,15 +121,12 @@ echo "Output from commands is in $O."
echo "-----------" >$O echo "-----------" >$O
# Checkout clean sources from the repository. # Checkout clean sources from the repository.
echo $e_n "Exporting ($EXPORT_TAG) out the CVS tree to $TMPDIR/$SUBDIR... $e_c" echo $e_n "Exporting $SVNURL$EXPORT_PATH/ (-r $EXPORT_REVISION) to $TMPDIR/$SUBDIR... $e_c"
cvs -d $CVSROOT export $EXPORT_TAG -d $SUBDIR wget 1>>$O 2>&1 svn export -r "$EXPORT_REVISION" "$SVNURL/$EXPORT_PATH/" $SUBDIR 1>>$O 2>&1
echo "done." echo "done."
cd $SUBDIR cd $SUBDIR
# Remove the dummy `Branches' directory.
rm -rf Branches 1>>$O 2>&1
# Force the version if required. # Force the version if required.
if test x"$VERSION" != x if test x"$VERSION" != x
then then
@ -128,8 +137,8 @@ fi
# Create configure and friends. # Create configure and friends.
if test ! -f configure; then if test ! -f configure; then
echo $e_n "Creating \`configure' from \`configure.in'... $e_c" echo $e_n "Creating \`configure' and \`src/config.h'... $e_c"
$MAKE -f Makefile.cvs 1>>$O 2>&1 ./autogen.sh 1>>$O 2>&1
echo "done." echo "done."
fi fi