usage() {
cat <<EOF
-gcc_release -r release [further options]
-gcc_release -s [further options]
+gcc_release -r release [-f] [further options]
+gcc_release -s name:cvsbranch [further options]
Options:
-r release Version of the form X.Y or X.Y.Z.
- -s Create a snapshot, not a real release.
+ -s name:cvsbranch Create a snapshot, not a real release.
-d destination Local working directory where we will build the release
(default=${HOME}).
for x in gcc/version.c; do
y=`basename ${x}`
(changedir `dirname ${SOURCE_DIRECTORY}/${x}` && \
- sed -e 's|= \".*\"|= \"'${RELEASE}'\"|g' < ${y} > ${y}.new && \
+ sed -e 's|version_string\[\] = \".*\"|version_string\[\] = \"'${RELEASE}'\"|g' < ${y} > ${y}.new && \
mv ${y}.new ${y} && \
${CVS} ci -m 'Update version' ${y}) || \
error "Could not update ${x}"
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.
+ # 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 CVS: ${EXPORTTAG} ${EXPORTDATE}" > LAST_UPDATED
# Obtain some documentation files from the wwwdocs module.
inform "Retrieving HTML documentation"
# on at least one platform.
inform "Building compiler"
OBJECT_DIRECTORY=../objdir
- contrib/gcc_build -d ${SOURCE_DIRECTORY} -o ${OBJECT_DIRECTORY} build || \
+ contrib/gcc_build -d ${SOURCE_DIRECTORY} -o ${OBJECT_DIRECTORY} \
+ -c "--enable-generated-files-in-srcdir" build || \
error "Could not rebuild GCC"
# Regenerate the Fotran NEWS and BUGS files.
TEXT_DATE=`date --date=$DATE +%B\ %d,\ %Y`
cd ~ftp/pub/gcc/snapshots
- sed -e "s%@DATE@%$DATE%g" -e "s%@LAST_DATE@%$LAST_DATE%g" \
+ sed -e "s%@DATE@%$DATE%g" \
+ -e "s%@TEXT_DATE@%$TEXT_DATE%g" \
+ -e "s%@LAST_DATE@%$LAST_DATE%g" \
-e "s%@BRANCH@%${BRANCH}%g" \
- -e "s%@TEXT_DATE@%$TEXT_DATE%g" < ~/scripts/snapshot-README > $$
- mv $$ README
- sed -e "s%@DATE@%$DATE%g" -e "s%@LAST_DATE@%$LAST_DATE%g" \
+ -e "s%@RELEASE@%${RELEASE}%g" \
+ -e "s%@EXPORT@%${EXPORTTAG} ${EXPORTDATE}%g" \
+ ~/scripts/snapshot-README > $$
+ mv $$ ${RELEASE}/README
+ sed -e "s%@DATE@%$DATE%g" \
+ -e "s%@TEXT_DATE@%$TEXT_DATE%g" \
+ -e "s%@LAST_DATE@%$LAST_DATE%g" \
-e "s%@BRANCH@%${BRANCH}%g" \
- -e "s%@TEXT_DATE@%$TEXT_DATE%g" < ~/scripts/snapshot-index.html > $$
- mv $$ ${BRANCH}-${DATE}/index.html
+ -e "s%@RELEASE@%${RELEASE}%g" \
+ -e "s%@EXPORT@%${EXPORTTAG} ${EXPORTDATE}%g" \
+ ~/scripts/snapshot-index.html > $$
+ mv $$ ${RELEASE}/index.html
touch LATEST-IS-${BRANCH}-${DATE}
rm -f LATEST-IS-${BRANCH}-${LAST_DATE}
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
}
########################################################################
########################################################################
# Parse the options.
-while getopts "d:fr:u:t:p:sl" ARG; do
+while getopts "d:fr:u:t:p:s:l" ARG; do
case $ARG in
d) DESTINATION="${OPTARG}";;
r) RELEASE="${OPTARG}";;
t) TAG="${OPTARG}";;
u) CVS_USERNAME="${OPTARG}";;
f) FINAL=1;;
- s) SNAPSHOT=1;;
+ s) SNAPSHOT=1
+ BRANCH=${OPTARG%:*}
+ CVSBRANCH=${OPTARG#*:}
+ ;;
l) LOCAL=1
SCP=cp
FTP_PATH=~ftp/pub/gcc
# If this is not a final release, set various parameters acordingly.
if [ ${FINAL} -ne 1 ]; then
RELEASE="${RELEASE}-${DATE}"
- FTP_PATH="${FTP_PATH}/snapshots/"
+ FTP_PATH="${FTP_PATH}/prerelease-${RELEASE}/"
else
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}"
+ if [ ${CVSBRANCH} != "HEAD" ]; then
+ TAG=gcc-ss-`echo ${RELEASE} | tr '.' '_'`
+ fi
# 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
OSDN Git Service
