From 81a862d77c28b20efb24aaa52ccda2cf47f2d4eb Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Mon, 7 Mar 2011 00:10:47 +0100 Subject: [PATCH] Use git, update-doc, autoreconf in release process. --- Makefile.svn | 7 +------ mkrelease | 18 +++++++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Makefile.svn b/Makefile.svn index 36e6a18..6f57133 100644 --- a/Makefile.svn +++ b/Makefile.svn @@ -1,10 +1,5 @@ default: all all: - aclocal -I m4 - autoheader - libtoolize --force --copy --automake - automake -afc - autoconf - rm -rf autom4te.cache/ + autoreconf -fi diff --git a/mkrelease b/mkrelease index 0a7f626..2668819 100755 --- a/mkrelease +++ b/mkrelease @@ -1,8 +1,7 @@ #!/bin/bash proj="util-vserver" -rwroot="svn+ssh://svn.linux-vserver.org/var/svn/${proj}" -roroot="http://svn.linux-vserver.org/svn/${proj}" +roroot="http://git.linux-vserver.org/git/${proj}.git" usage() { echo "Usage: mkrelease" @@ -13,19 +12,19 @@ die() { exit ${2:-1} } +curdir="$PWD" + TMP=`mktemp -d` cd "$TMP" -svn co ${roroot}/trunk || die "svn co failed" -cd trunk +git clone ${roroot} || die "git clone failed" +cd ${proj} ver=`grep AC_INIT configure.ac | awk '{ print $2 }'` ver=${ver/,} echo ">>> create release tag" -svn copy ${rwroot}/trunk ${rwroot}/tags/release-${ver} \ - -m "Tagging the ${ver} release of the ${proj} project" || die "svn copy failed" - +(cd "$curdir" && git tag -s "$ver") || die "git tag failed" echo ">>> bootstrap sources" @@ -44,5 +43,10 @@ echo ">>> uploading tarball and signature" scp -p *.tar.bz2* ftp.linux-vserver.org:/var/ftp/pub/utils/util-vserver || die "scp failed" +echo ">>> updating documentation" + +read -p "Documentation directory (e.g. $HOME/cvs/uv-www/doc):" DOCDIR +./update-doc "$DOCDIR" + cd / rm -fr "$TMP" -- 1.8.1.5