diff options
Diffstat (limited to 'maintainer-scripts')
| -rw-r--r-- | maintainer-scripts/ChangeLog | 6 | ||||
| -rwxr-xr-x | maintainer-scripts/gcc_release | 29 |
2 files changed, 29 insertions, 6 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index b90c0023405..aadc6feffd3 100644 --- a/maintainer-scripts/ChangeLog +++ b/maintainer-scripts/ChangeLog @@ -1,3 +1,9 @@ +2003-08-16 Gerald Pfeifer <gerald@pfeifer.com> + + * gcc_release (build_sources): Use two new variables EXPORTTAG and + EXPORTDATE to make the extraction of sources more transparent and + also allow snapshots (off mainline) without a tag. + 2003-08-08 Mark Mitchell <mark@codesourcery.com> * gcc_release: Correct logic for updating version.c. Put diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release index 87d3d9c604f..2db5010e6da 100755 --- a/maintainer-scripts/gcc_release +++ b/maintainer-scripts/gcc_release @@ -161,15 +161,32 @@ EOF inform "Tagging sources as ${TAG}" ${CVS} rtag -r ${CVSBRANCH} -F ${TAG} gcc || \ error "Could not tag sources" - CVSBRANCH=$TAG + EXPORTTAG="-r${TAG}" + EXPORTDATE="" + else + if [ ${CVSBRANCH} != "HEAD" ]; then + EXPORTTAG="-r${CVSBRANCH}" + else + # HEAD is the default branch, no need to specify it. + EXPORTTAG="" + fi + EXPORTDATE="-D`date -u +"%Y-%m-%d %H:%M"` UTC" fi # Export the current sources. - inform "Retrieving release sources" - ${CVS} \ - export -d "`basename ${SOURCE_DIRECTORY}`" \ - -r ${CVSBRANCH} gcc || \ - error "Could not retrieve release sources" + inform "Retrieving sources (cvs export ${EXPORTTAG} ${EXPORTDATE} gcc)" + + if [ -z "${EXPORTTAG}" ]; then + ${CVS} export -d "`basename ${SOURCE_DIRECTORY}`" \ + "${EXPORTDATE}" gcc || \ + error "Could not retrieve sources" + elif [ -z "${EXPORTDATE}" ]; then + ${CVS} export -d "`basename ${SOURCE_DIRECTORY}`" \ + "${EXPORTTAG}" gcc || \ + error "Could not retrieve sources" + else + error "Cannot specify -r and -D at the same time" + fi # Run gcc_update on them to set up the timestamps nicely. changedir "gcc-${RELEASE}" |