update_version_svn (FILES): Merge with datestamp_FILES.

* update_version_svn (FILES): Merge with datestamp_FILES.
	(SVNROOT2): Introduce and use.

From-SVN: r169428
This commit is contained in:
Gerald Pfeifer 2011-01-31 01:14:49 +00:00 committed by Gerald Pfeifer
parent 6105224471
commit 1b31835f2f
2 changed files with 13 additions and 10 deletions

View File

@ -1,3 +1,8 @@
2011-01-31 Gerald Pfeifer <gerald@pfeifer.com>
* update_version_svn (FILES): Merge with datestamp_FILES.
(SVNROOT2): Introduce and use.
2011-01-30 Gerald Pfeifer <gerald@pfeifer.com>
* update_version_svn (SVN): Remove obsolete comment.

View File

@ -28,10 +28,8 @@ BRANCHES="${BRANCHES} ${ADD_BRANCHES}"
# This is put into the datestamp files.
CURR_DATE=`/bin/date +"%Y%m%d"`
# version is all there is
datestamp_FILES="gcc/DATESTAMP"
FILES="$datestamp_FILES"
# Assume all will go well.
RESULT=0
@ -39,15 +37,15 @@ for BRANCH in $BRANCHES; do
echo "Working on \"$BRANCH\"."
# Check out the files on the branch. HEAD is in a different namespace.
if test "$BRANCH" = HEAD; then
for i in $FILES; do
${SVN} -q co -N ${SVNROOT}/trunk/`dirname $i` `basename $i`
done
else
for i in $FILES; do
${SVN} -q co -N ${SVNROOT}/branches/${BRANCH}/`dirname $i` `basename $i`
done
SVNROOT2=${SVNROOT}/trunk
else
SVNROOT2=${SVNROOT}/branches/${BRANCH}
fi
for i in $datestamp_FILES; do
${SVN} -q co -N ${SVNROOT2}/`dirname $i` `basename $i`
done
# There are no files to commit yet.
COMMIT_FILES=""
@ -78,7 +76,7 @@ for BRANCH in $BRANCHES; do
fi
# Remove the files.
for i in $FILES; do
for i in $datestamp_FILES; do
rm -rf /tmp/$$/`basename $i`
done
done