git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gcc_release: Always determine revision number from date or tag... 

2005-11-05  Daniel Berlin  <dberlin@dberlin.org>

	* gcc_release:  Always determine revision number from date or tag,
	and use that, instead of fragile date based export.
	Put back setting of non-local CVSROOT.

From-SVN: r106554
This commit is contained in:
Daniel Berlin 2005-11-06 02:37:29 +00:00 committed by Daniel Berlin
parent 43be1fe457
commit d4a43a05fa
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainer-scripts/ChangeLog
View File

@ -1,3 +1,9 @@
2005-11-05 Daniel Berlin <dberlin@dberlin.org>
* gcc_release: Always determine revision number from date or tag,
and use that, instead of fragile date based export.
Put back setting of non-local CVSROOT.
2005-11-05 Daniel Berlin <dberlin@dberlin.org> 2005-11-05 Daniel Berlin <dberlin@dberlin.org>
* gcc_release: Make tags go in /tags. * gcc_release: Make tags go in /tags.

26
maintainer-scripts/gcc_release
View File

@ -181,40 +181,31 @@ EOF
error "Tag ${TAG} already exists" error "Tag ${TAG} already exists"
fi fi
${SVN} -m "Tagging source as ${TAG}" cp "${SVNROOT}/${SVNBRANCH}" "${SVNROOT}/${TAG}" || \ ${SVN} -m "Tagging source as ${TAG}" cp "${SVNROOT}/${SVNBRANCH}" "${SVNROOT}/${TAG}" || \
# error "Could not tag sources" error "Could not tag sources"
#EXPORTTAG="${SVNBRANCH}"
else else
if [ ${SVNBRANCH} != "/trunk" ]; then if [ ${SVNBRANCH} != "/trunk" ]; then
EXPORTTAG="/branches/${SVNBRANCH}" EXPORTTAG="/branches/${SVNBRANCH}"
# It does not work to use both "-r" and "-D" with # It does not work to use both "-r" and "-D" with
# "cvs export" so EXPORTDATE is not set here. # "cvs export" so EXPORTDATE is not set here.
SVNREV=`${SVN} info "${SVNROOT}/${EXPORTTAG}"|grep "Revision:"|awk '{print $2}'`
else else
# HEAD is the default branch, no need to specify it.
EXPORTTAG="" EXPORTTAG=""
EXPORTDATE="-D{`date --iso-8601=minutes`}" EXPORTDATE="-D{`date --iso-8601=minutes`}"
SVNREV=`${SVN} info ${EXPORTDATE} "${SVNROOT}/trunk"|grep "Revision:"|awk '{print $2}'`
fi fi
fi fi
# Export the current sources. # Export the current sources.
inform "Retrieving sources (svn export ${EXPORTTAG} ${EXPORTDATE} gcc)" inform "Retrieving sources (svn export -r ${SVNREV} ${SVNROOT}/${SVNBRANCH}/gcc)"
if [ -z "${EXPORTTAG}" ]; then ${SVN} -q export -r${SVNREV} "${SVNROOT}/${SVNBRANCH}" "`basename ${SOURCE_DIRECTORY}`" ||\
${SVN} -q export ${EXPORTDATE} "${SVNROOT}/trunk" "`basename ${SOURCE_DIRECTORY}`" ||\ error "Could not retrieve sources"
error "Could not retrieve sources"
SVNREV = `${SVN} info ${EXPORTDATE} "${SVNROOT}/trunk"|grep "Revision:"|awk '{print $2}'`
elif [ -z "${EXPORTDATE}" ]; then
${SVN} -q export "${SVNROOT}/${EXPORTTAG}" "`basename ${SOURCE_DIRECTORY}`/" ||\
error "Could not retrieve sources"
SVNREV = `${SVN} info "${SVNROOT}/${EXPORTTAG}"|grep "Revision:"|awk '{print $2}'`
else
error "Cannot specify -r and -D at the same time"
fi
# Run gcc_update on them to set up the timestamps nicely, and (re)write # Run gcc_update on them to set up the timestamps nicely, and (re)write
# the LAST_UPDATED file containing the CVS tag/date used. # the LAST_UPDATED file containing the CVS tag/date used.
changedir "gcc-${RELEASE}" changedir "gcc-${RELEASE}"
contrib/gcc_update --touch contrib/gcc_update --touch
echo "Obtained from SVN: ${EXPORTTAG} ${EXPORTDATE}" > LAST_UPDATED echo "Obtained from SVN: Revision ${SVNREV}" > LAST_UPDATED
# Obtain some documentation files from the wwwdocs module. # Obtain some documentation files from the wwwdocs module.
inform "Retrieving HTML documentation" inform "Retrieving HTML documentation"
@ -758,7 +749,8 @@ TESTSUITE_DIRS=`adjust_dirs ${TESTSUITE_DIRS}`
# Set up SVNROOT. # Set up SVNROOT.
if [ $LOCAL -eq 0 ]; then if [ $LOCAL -eq 0 ]; then
SVNROOT="svn://${SVN_USERNAME}@${SVN_SERVER}${SVN_REPOSITORY}" SVNROOT="svn+ssh://${SVN_USERNAME}@${SVN_SERVER}${SVN_REPOSITORY}"
CVSROOT=":ext:${SVN_USERNAME}@gcc.gnu.org/cvs/gcc"
else else
SVNROOT="file:///svn/gcc" SVNROOT="file:///svn/gcc"
CVSROOT="/cvs/gcc" CVSROOT="/cvs/gcc"