From b99f39de82511c02ee2e11a7a2889747cda71772 Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
Date: Sat, 19 Jul 2003 14:12:39 +0200
Subject: [PATCH] gcc_release (announce_snapshot): Use ${RELEASE} instead of
${BRANCH}-${DATE} to refer to the snapshot directory.
* gcc_release (announce_snapshot): Use ${RELEASE} instead
of ${BRANCH}-${DATE} to refer to the snapshot directory.
Put README file into the snapshot directory.
(RELEASE): Define as ${BRANCH}-${DATE} for snapshots.
(FTP_PATH): Use ${RELEASE} in case of snapshots.
(TAG): Ditto.
(OLD_TARS): Adjust to new directory scheme for snapshots.
From-SVN: r69584
---
maintainer-scripts/ChangeLog | 11 +++++++++++
maintainer-scripts/gcc_release | 15 ++++++++-------
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index a46a26b1cfb0..66c53a20af2c 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,14 @@
+2003-07-19 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
+
+ * gcc_release (announce_snapshot): Use ${RELEASE} instead
+ of ${BRANCH}-${DATE} to refer to the snapshot directory.
+ Put README file into the snapshot directory.
+
+ (RELEASE): Define as ${BRANCH}-${DATE} for snapshots.
+ (FTP_PATH): Use ${RELEASE} in case of snapshots.
+ (TAG): Ditto.
+ (OLD_TARS): Adjust to new directory scheme for snapshots.
+
2003-07-14 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
* gcc_release (announce_snapshot): Add substitution of @RELEASE@
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index 479a19f8a9a3..3417abb08722 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -382,13 +382,13 @@ announce_snapshot() {
-e "s%@BRANCH@%${BRANCH}%g" \
-e "s%@RELEASE@%${RELEASE}%g" \
-e "s%@TEXT_DATE@%$TEXT_DATE%g" < ~/scripts/snapshot-README > $$
- mv $$ README
+ mv $$ ${RELEASE}/README
sed -e "s%@DATE@%$DATE%g" \
-e "s%@LAST_DATE@%$LAST_DATE%g" \
-e "s%@BRANCH@%${BRANCH}%g" \
-e "s%@RELEASE@%${RELEASE}%g" \
-e "s%@TEXT_DATE@%$TEXT_DATE%g" < ~/scripts/snapshot-index.html > $$
- mv $$ ${BRANCH}-${DATE}/index.html
+ mv $$ ${RELEASE}/index.html
touch LATEST-IS-${BRANCH}-${DATE}
rm -f LATEST-IS-${BRANCH}-${LAST_DATE}
@@ -396,7 +396,7 @@ announce_snapshot() {
inform "Sending mail"
export QMAILHOST=gcc.gnu.org
- mail -s "gcc-ss-${BRANCH}-${DATE} is now available" gccadmin@gcc.gnu.org < ~ftp/pub/gcc/snapshots/README
+ mail -s "gcc-ss-${RELEASE} is now available" gcc@gcc.gnu.org < ~ftp/pub/gcc/snapshots/${RELEASE}/README
}
########################################################################
@@ -585,19 +585,20 @@ if [ $SNAPSHOT -eq 0 ]; then
FTP_PATH="${FTP_PATH}/releases/gcc-${RELEASE}/"
fi
else
- RELEASE=$DATE
# For now snapshots come from the 3.3 branch.
BRANCH="3.3"
CVSBRANCH=gcc-3_3-branch
- FTP_PATH="${FTP_PATH}/snapshots/${BRANCH}-${DATE}"
- TAG=gcc-ss-`echo ${BRANCH} | tr '.' '_'`-${DATE}
+
+ RELEASE=${BRANCH}-${DATE}
+ FTP_PATH="${FTP_PATH}/snapshots/${RELEASE}"
+ TAG=gcc-ss-`echo ${RELEASE} | tr '.' '_'`
# Building locally on gcc.gnu.org, we know what the last snapshot date
# was.
if [ $MODE_DIFFS -ne 0 ] && [ $LOCAL -ne 0 ]; then
LAST_DATE=`cat ~/.snapshot_date-${BRANCH}`
LAST_DIR=~ftp/pub/gcc/snapshots/${BRANCH}-${LAST_DATE}
- OLD_TARS=${LAST_DIR}/gcc-${LAST_DATE}.tar.bz2
+ OLD_TARS=${LAST_DIR}/gcc-${BRANCH}-${LAST_DATE}.tar.bz2
fi
fi
--
GitLab