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.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@106554 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 16 insertions, 18 deletions

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 82ab4393d01..9a1fa5c0888 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,5 +1,11 @@
 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>
+
 	* gcc_release: Make tags go in /tags.
 	Don't tag for snapshots.
 	Determine revision number of export and put into snapshot
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index c5e69a36433..979247f3ca0 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -181,40 +181,31 @@ EOF
       error "Tag ${TAG} already exists"
     fi
     ${SVN} -m "Tagging source as ${TAG}" cp "${SVNROOT}/${SVNBRANCH}" "${SVNROOT}/${TAG}" || \
-    #  error "Could not tag sources"
-    #EXPORTTAG="${SVNBRANCH}"
+      error "Could not tag sources"
   else
     if [ ${SVNBRANCH} != "/trunk" ]; then
       EXPORTTAG="/branches/${SVNBRANCH}"
       # It does not work to use both "-r" and "-D" with
       # "cvs export" so EXPORTDATE is not set here.
+      SVNREV=`${SVN} info "${SVNROOT}/${EXPORTTAG}"|grep "Revision:"|awk '{print $2}'`
     else
-      # HEAD is the default branch, no need to specify it.
       EXPORTTAG=""
       EXPORTDATE="-D{`date --iso-8601=minutes`}"
+      SVNREV=`${SVN} info ${EXPORTDATE} "${SVNROOT}/trunk"|grep "Revision:"|awk '{print $2}'`
     fi
   fi
 
   # Export the current sources.
-  inform "Retrieving sources (svn export ${EXPORTTAG} ${EXPORTDATE} gcc)"
-
-  if [ -z "${EXPORTTAG}" ]; then
-    ${SVN} -q export ${EXPORTDATE} "${SVNROOT}/trunk" "`basename ${SOURCE_DIRECTORY}`" ||\
-      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
+  inform "Retrieving sources (svn export -r ${SVNREV} ${SVNROOT}/${SVNBRANCH}/gcc)"
+
+  ${SVN} -q export -r${SVNREV} "${SVNROOT}/${SVNBRANCH}" "`basename ${SOURCE_DIRECTORY}`" ||\
+    error "Could not retrieve sources"
 
   # Run gcc_update on them to set up the timestamps nicely, and (re)write
   # the LAST_UPDATED file containing the CVS tag/date used.
   changedir "gcc-${RELEASE}"
   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.
   inform "Retrieving HTML documentation"
@@ -758,7 +749,8 @@ TESTSUITE_DIRS=`adjust_dirs ${TESTSUITE_DIRS}`
 
 # Set up SVNROOT.
 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
     SVNROOT="file:///svn/gcc"
     CVSROOT="/cvs/gcc"