From 0da7664194dc1f05d00be13613aa6df6fa7f4714 Mon Sep 17 00:00:00 2001 From: dockes Date: Thu, 8 Jan 2009 09:50:40 +0000 Subject: [PATCH] adapt distrib script to svn --- src/makesrcdist.sh | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/makesrcdist.sh b/src/makesrcdist.sh index abaec355..348a9b5a 100644 --- a/src/makesrcdist.sh +++ b/src/makesrcdist.sh @@ -2,10 +2,29 @@ # @(#$Id: makesrcdist.sh,v 1.16 2008-11-21 16:43:42 dockes Exp $ (C) 2005 J.F.Dockes # A shell-script to make a recoll source distribution +fatal() +{ + echo $* + exit 1 +} #set -x TAR=/usr/bin/tar - +SVNREPOS=svn+ssh://y/home/subversion/recoll/ + +version=`cat VERSION` +versionforcvs=`echo $version | sed -e 's/\./_/g'` + +editedfiles=`svn status | egrep -v '^\?'` +if test ! -z "$editedfiles"; then + fatal "Edited files exist: " $editedfiles +fi + +tagtop() { + (cd ..; svn copy -m "Release $version tagged" . $SVNREPOS/tags/$1) \ + || fatal tag failed +} + targetdir=${targetdir-/tmp} dotag=${dotag-yes} @@ -14,9 +33,6 @@ if test ! -d qtgui;then exit 1 fi -version=`cat VERSION` -versionforcvs=`echo $version | sed -e 's/\./_/g'` - topdir=$targetdir/recoll-$version if test ! -d $topdir ; then mkdir $topdir || exit 1 @@ -56,7 +72,7 @@ links -dump ${RECOLLDOC}/rcl.install.external.html >> INSTALL links -dump ${RECOLLDOC}/rcl.install.building.html >> INSTALL links -dump ${RECOLLDOC}/rcl.install.config.html >> INSTALL -cvs commit -m '' README INSTALL +svn commit -m '' README INSTALL # Clean up this dir and copy the dist-specific files make distclean @@ -76,8 +92,9 @@ diff $topdir/doc/user/u1.html $topdir/doc/user/usermanual.html mv -f $topdir/doc/user/u1.html $topdir/doc/user/usermanual.html # We tag .. as there is the 'packaging/' directory in there -CVSTAG="RECOLL_$versionforcvs" -[ $dotag = "yes" ] && (cd ..;cvs tag -F $CVSTAG .) +TAG="RECOLL_$versionforcvs" +#[ $dotag = "yes" ] && (cd ..;cvs tag -F $CVSTAG .) +[ $dotag = "yes" ] && tagtop $TAG # Can't now put ./Makefile in excludefile, gets ignored everywhere. So delete # the top Makefile here (its' output by configure on the target system):