aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2004-04-07 17:50:31 +0000
committerMark Mitchell <mark@codesourcery.com>2004-04-07 17:50:31 +0000
commit844c33a1c8eb551c65fb876539e0f2b8f0cf8a94 (patch)
treedecc58aaf245f866f7c5ec0b92240c44422ba4ea
parentfc51f4f8620032605cd2c9b05ea10c5e7bd27f61 (diff)
* gcc_release (build_sources): Do not use "-r" and "-D" at the
same time with "cvs export". git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@80480 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--maintainer-scripts/ChangeLog5
-rwxr-xr-xmaintainer-scripts/gcc_release6
2 files changed, 9 insertions, 2 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 13bd6edf416..7b4f157029c 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-07 Mark Mitchell <mark@codesourcery.com>
+
+ * gcc_release (build_sources): Do not use "-r" and "-D" at the
+ same time with "cvs export".
+
2004-03-27 Gerald Pfeifer <gerald@pfeifer.com>
* gcc_release: Fix sanity check for argument of -p command-line
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index c21c1b94de1..3ac73da469f 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -157,20 +157,22 @@ EOF
fi
# Tag the sources.
+ EXPORTDATE=""
if [ -n "${TAG}" ]; then
inform "Tagging sources as ${TAG}"
${CVS} rtag -r ${CVSBRANCH} -F ${TAG} gcc || \
error "Could not tag sources"
EXPORTTAG="-r${TAG}"
- EXPORTDATE=""
else
if [ ${CVSBRANCH} != "HEAD" ]; then
EXPORTTAG="-r${CVSBRANCH}"
+ # It does not work to use both "-r" and "-D" with
+ # "cvs export" so EXPORTDATE is not set here.
else
# HEAD is the default branch, no need to specify it.
EXPORTTAG=""
+ EXPORTDATE="-D`date -u +"%Y-%m-%d %H:%M"` UTC"
fi
- EXPORTDATE="-D`date -u +"%Y-%m-%d %H:%M"` UTC"
fi
# Export the current sources.