| Message ID | alpine.LNX.2.00.1101310217180.14698@gerinyyl.fvgr |
|---|---|
| State | New |
| Headers | show |
On Mon, Jan 31, 2011 at 2:21 AM, Gerald Pfeifer <gerald@pfeifer.com> wrote: > Looking into this script a bit more, I found some further simplications > and restructured the code by introducing SVNROOT2 which will hopefully > make it easier to later avoid bumping the datestamp unless really needed. > > Committed and also installed on gcc.gnu.org where it just bumped > datestamps as usual. We could simply put svn info | grep 'Last Changed Date' | sed -e 's/[^0-9]*\([^ ]*\).*/\1/' | tr -d '-' into DATESTAMP and not commit it if it didn't change (supposedly the commit would be a noop and be ignored then). The above without touching gcc_update. Richard. > Gerald > > > 2011-01-31 Gerald Pfeifer <gerald@pfeifer.com> > > * update_version_svn (FILES): Merge with datestamp_FILES. > (SVNROOT2): Introduce and use. > > Index: update_version_svn > =================================================================== > --- update_version_svn (revision 169418) > +++ update_version_svn (working copy) > @@ -28,10 +28,8 @@ > # 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 @@ > 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 @@ > fi > > # Remove the files. > - for i in $FILES; do > + for i in $datestamp_FILES; do > rm -rf /tmp/$$/`basename $i` > done > done >
Index: update_version_svn =================================================================== --- update_version_svn (revision 169418) +++ update_version_svn (working copy) @@ -28,10 +28,8 @@ # 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 @@ 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 @@ fi # Remove the files. - for i in $FILES; do + for i in $datestamp_FILES; do rm -rf /tmp/$$/`basename $i` done done