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}).
inform "Updating ChangeLogs and version files"
${CVS} co -d "`basename ${SOURCE_DIRECTORY}`" \
- -r ${BRANCH} gcc || \
+ -r ${CVSBRANCH} gcc || \
error "Could not check out release sources"
for x in `find ${SOURCE_DIRECTORY} -name ChangeLog`; do
# Update this ChangeLog file only if it does not yet contain the
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}"
fi
# Tag the sources.
+ EXPORTDATE=""
if [ -n "${TAG}" ]; then
- inform "Tagging release sources"
- ${CVS} rtag -r ${BRANCH} -F ${TAG} gcc || \
- error "Could not tag release sources"
- BRANCH=$TAG
+ inform "Tagging sources as ${TAG}"
+ # The -F option to CVS is intentionally not used below. If you
+ # need to retry a release, you will have to manually remove any
+ # existing tag.
+ ${CVS} rtag -r ${CVSBRANCH} ${TAG} gcc || \
+ error "Could not tag sources"
+ EXPORTTAG="-r${TAG}"
+ 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
fi
# Export the current sources.
- inform "Retrieving release sources"
- ${CVS} \
- export -d "`basename ${SOURCE_DIRECTORY}`" \
- -r ${BRANCH} 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"
changedir "${WORKING_DIRECTORY}"
- for x in bugs gnats faq; do
+ for x in bugs faq; do
(${CVS} export -r HEAD wwwdocs/htdocs/${x}.html && \
cp ${WORKING_DIRECTORY}/wwwdocs/htdocs/${x}.html \
${SOURCE_DIRECTORY}) || \
(${ENV} TERM=vt100 lynx -dump $file \
| sed -e "s#file://localhost`/bin/pwd`\(.*\)#http://gcc.gnu.org\1#g" \
> $newfile) || \
- error "Could not regenerate documentation"
+ error "Could not generate text-only version of ${file}"
done
# For a prerelease or real release, we need to generate additional
# 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.
- (cd ${OBJECT_DIRECTORY}/gcc && make f77.rebuilt) || \
- error "Could not regenerate Fortran NEWS and BUGS files"
fi
# Move message catalogs to source directory.
build_tarfile() {
# Get the name of the destination tar file.
- TARFILE="$1.tar.gz"
+ TARFILE="$1.tar.bz2"
shift
# Build the tar file itself.
- (${TAR} cf - "$@" | ${GZIP} > ${TARFILE}) || \
+ (${TAR} cf - "$@" | ${BZIP2} > ${TARFILE}) || \
error "Could not build tarfile"
FILE_LIST="${FILE_LIST} ${TARFILE}"
}
build_tarfile gcc-ada-${RELEASE} ${ADA_DIRS}
build_tarfile gcc-g++-${RELEASE} ${CPLUSPLUS_DIRS}
build_tarfile gcc-g77-${RELEASE} ${FORTRAN_DIRS}
+ build_tarfile gcc-fortran-${RELEASE} ${FORTRAN95_DIRS}
build_tarfile gcc-java-${RELEASE} ${JAVA_DIRS}
build_tarfile gcc-objc-${RELEASE} ${OBJECTIVEC_DIRS}
build_tarfile gcc-testsuite-${RELEASE} ${TESTSUITE_DIRS}
# The core is everything else.
EXCLUDES=""
- for x in ${ADA_DIRS} ${CPLUSPLUS_DIRS} ${FORTRAN_DIRS} \
+ for x in ${ADA_DIRS} ${CPLUSPLUS_DIRS} ${FORTRAN_DIRS} ${FORTRAN95_DIRS}\
${JAVA_DIRS} ${OBJECTIVEC_DIRS} ${TESTSUITE_DIRS}; do
EXCLUDES="${EXCLUDES} --exclude $x"
done
`basename ${SOURCE_DIRECTORY}`
}
-# Build .bz2 files.
-build_bzip2() {
+# Build .gz files.
+build_gzip() {
for f in ${FILE_LIST}; do
- bzfile=${f%.gz}.bz2
- (zcat $f | ${BZIP2} > ${bzfile}) || error "Could not create ${bzfile}"
+ target=${f%.bz2}.gz
+ (${BZIP2} -d -c $f | ${GZIP} > ${target}) || error "Could not create ${target}"
done
}
build_diffs() {
old_dir=${1%/*}
old_file=${1##*/}
- old_vers=${old_file%.tar.gz}
+ old_vers=${old_file%.tar.bz2}
old_vers=${old_vers#gcc-}
inform "Building diffs against version $old_vers"
- for f in gcc gcc-ada gcc-g++ gcc-g77 gcc-java gcc-objc gcc-testsuite gcc-core; do
- old_tar=${old_dir}/${f}-${old_vers}.tar.gz
- new_tar=${WORKING_DIRECTORY}/${f}-${RELEASE}.tar.gz
- if [ -e $old_tar ] && [ -e $new_tar ]; then
+ for f in gcc gcc-ada gcc-g++ gcc-g77 gcc-fortran gcc-java gcc-objc gcc-testsuite gcc-core; do
+ old_tar=${old_dir}/${f}-${old_vers}.tar.bz2
+ new_tar=${WORKING_DIRECTORY}/${f}-${RELEASE}.tar.bz2
+ if [ ! -e $old_tar ]; then
+ inform "$old_tar not found; not generating diff file"
+ elif [ ! -e $new_tar ]; then
+ inform "$new_tar not found; not generating diff file"
+ else
build_diff $old_tar gcc-${old_vers} $new_tar gcc-${RELEASE} \
- ${f}-${old_vers}-${RELEASE}.diff.gz
+ ${f}-${old_vers}-${RELEASE}.diff.bz2
fi
done
}
tmpdir=gccdiff.$$
mkdir $tmpdir || error "Could not create directory $tmpdir"
changedir $tmpdir
- tar xfz $1 || error "Could not unpack $1 for diffs"
- tar xfz $3 || error "Could not unpack $3 for diffs"
- ${DIFF} $2 $4 > ../${5%.gz}
+ (${BZIP2} -d -c $1 | ${TAR} xf - ) || error "Could not unpack $1 for diffs"
+ (${BZIP2} -d -c $3 | ${TAR} xf - ) || error "Could not unpack $3 for diffs"
+ ${DIFF} $2 $4 > ../${5%.bz2}
if [ $? -eq 2 ]; then
error "Trouble making diffs from $1 to $3"
fi
- ${GZIP} ../${5%.gz} || error "Could not gzip ../${5%.gz}"
+ ${BZIP2} ../${5%.bz2} || error "Could not generate ../$5"
changedir ..
rm -rf $tmpdir
FILE_LIST="${FILE_LIST} $5"
}
# Upload the files to the FTP server.
-
upload_files() {
inform "Uploading files"
done
}
+# Announce a snapshot, both on the web and via mail.
+announce_snapshot() {
+ inform "Updating links and READMEs on the FTP server"
+
+ TEXT_DATE=`date --date=$DATE +%B\ %d,\ %Y`
+ changedir "${SNAPSHOTS_DIR}"
+ 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%@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%@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-${RELEASE} is now available" gcc@gcc.gnu.org < ${SNAPSHOTS_DIR}/${RELEASE}/README
+}
+
########################################################################
# Initialization
########################################################################
GCC_HOSTNAME="gcc.gnu.org"
# The name of the account on the machine to which files are uploaded.
GCC_USERNAME="gccadmin"
-# The directory in which the files will be placed.
-FTP_PATH="~ftp/pub/gcc"
+# The directory in which the files will be placed (do not use ~user syntax).
+FTP_PATH=/var/ftp/pub/gcc
+# The directory in which snapshots will be placed.
+SNAPSHOTS_DIR=${FTP_PATH}/snapshots
# The major number for the release. For release `3.0.2' this would be
# `3'
# The complete name of the release.
RELEASE=""
-# The name of the branch from which the release should be made.
+# The name of the branch from which the release should be made, in a
+# user-friendly form.
BRANCH=""
+# The name of the branch from which the release should be made, as used
+# for our version control system.
+CVSBRANCH=""
+
# The tag to apply to the sources used for the release.
TAG=""
# The directories that should be part of the various language-specific
# tar files. These are all relative to the top of the source tree.
-ADA_DIRS="gcc/ada"
+ADA_DIRS="gcc/ada libada"
CPLUSPLUS_DIRS="gcc/cp libstdc++-v3"
FORTRAN_DIRS="gcc/f libf2c"
+FORTRAN95_DIRS="gcc/fortran libgfortran"
JAVA_DIRS="gcc/java libjava libffi fastjar zlib boehm-gc"
OBJECTIVEC_DIRS="gcc/objc libobjc"
TESTSUITE_DIRS="gcc/testsuite"
LOCAL=0
# Major operation modes.
-MODE_BZIP2=0
+MODE_GZIP=0
MODE_DIFFS=0
MODE_SOURCES=0
MODE_TARFILES=0
MODE_UPLOAD=0
-# .gz files generated to create .bz2 files from.
+# List of archive files generated; used to create .gz files from .bz2.
FILE_LIST=""
# Programs we use.
BZIP2="${BZIP2:-bzip2}"
CVS="${CVS:-cvs -f -Q -z9}"
-DIFF="${DIFF:-diff -Nrc3pad}"
+DIFF="${DIFF:-diff -Nrcpad}"
ENV="${ENV:-env}"
GZIP="${GZIP:-gzip --best}"
SCP="${SCP:-scp -p}"
########################################################################
# 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
PATH=~:/usr/local/bin:$PATH;;
p) OLD_TARS="${OLD_TARS} ${OPTARG}"
- if [ -d ${OPTARG} ]; then
+ if [ ! -f ${OPTARG} ]; then
error "-p argument must name a tarball"
fi;;
\?) usage;;
done
shift `expr ${OPTIND} - 1`
+# Handle the major modes.
+while [ $# -ne 0 ]; do
+ case $1 in
+ diffs) MODE_DIFFS=1;;
+ gzip) MODE_GZIP=1;;
+ sources) MODE_SOURCES=1;;
+ tarfiles) MODE_TARFILES=1;;
+ upload) MODE_UPLOAD=1;;
+ all) MODE_SOURCES=1; MODE_TARFILES=1; MODE_DIFFS=1; MODE_UPLOAD=1;
+ if [ $SNAPSHOT -ne 1 ]; then
+ # Only for releases and pre-releases.
+ MODE_GZIP=1;
+ fi
+ ;;
+ *) error "Unknown mode $1";;
+ esac
+ shift
+done
+
# Perform consistency checking.
if [ ${LOCAL} -eq 0 ] && [ -z ${CVS_USERNAME} ]; then
error "No username specified"
# Compute the name of the branch, which is based solely on the major
# and minor release numbers.
- BRANCH="gcc-${RELEASE_MAJOR}_${RELEASE_MINOR}-branch"
+ CVSBRANCH="gcc-${RELEASE_MAJOR}_${RELEASE_MINOR}-branch"
# 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=gcc-3_3-branch
- FTP_PATH="${FTP_PATH}/snapshots/${LONG_DATE}"
- TAG=gcc_ss_${DATE}
-
- # Building locally on gcc.gnu.org, we know what the last snapshot date
- # was.
- if [ $LOCAL -ne 0 ]; then
- LAST_DATE=`cat ~/.snapshot_date`
- LAST_LONG_DATE=`date --date=$LAST_DATE +%Y-%m-%d`
- LAST_DIR=~ftp/pub/gcc/snapshots/${LAST_LONG_DATE}
- OLD_TARS=${LAST_DIR}/gcc-${LAST_DATE}.tar.gz
+ RELEASE=${BRANCH}-${DATE}
+ FTP_PATH="${FTP_PATH}/snapshots/${RELEASE}"
+ if [ ${CVSBRANCH} != "HEAD" ]; then
+ TAG=gcc-ss-`echo ${RELEASE} | tr '.' '_'`
+ fi
+
+ # If diffs are requested when building locally on gcc.gnu.org, we (usually)
+ # know what the last snapshot date was and take the corresponding tarballs,
+ # unless the user specified tarballs explictly.
+ if [ $MODE_DIFFS -ne 0 ] && [ $LOCAL -ne 0 ] && [ -z "${OLD_TARS}" ]; then
+ LAST_DATE=`cat ~/.snapshot_date-${BRANCH}`
+ OLD_TARS=${SNAPSHOTS_DIR}/${BRANCH}-${LAST_DATE}/gcc-${BRANCH}-${LAST_DATE}.tar.bz2
fi
fi
ADA_DIRS=`adjust_dirs ${ADA_DIRS}`
CPLUSPLUS_DIRS=`adjust_dirs ${CPLUSPLUS_DIRS}`
FORTRAN_DIRS=`adjust_dirs ${FORTRAN_DIRS}`
+FORTRAN95_DIRS=`adjust_dirs ${FORTRAN95_DIRS}`
JAVA_DIRS=`adjust_dirs ${JAVA_DIRS}`
OBJECTIVEC_DIRS=`adjust_dirs ${OBJECTIVEC_DIRS}`
TESTSUITE_DIRS=`adjust_dirs ${TESTSUITE_DIRS}`
TZ="UTC0"
export TZ
-# Handle the major modes.
-while [ $# -ne 0 ]; do
- case $1 in
- bzip2) MODE_BZIP2=1;;
- diffs) MODE_DIFFS=1;;
- sources) MODE_SOURCES=1;;
- tarfiles) MODE_TARFILES=1;;
- upload) MODE_UPLOAD=1;;
- all) MODE_SOURCES=1; MODE_TARFILES=1; MODE_DIFFS=1; MODE_BZIP2=1; MODE_UPLOAD=1;;
- *) error "Unknown mode $1";;
- esac
- shift
-done
-
# Build the source directory.
if [ $MODE_SOURCES -ne 0 ]; then
fi
fi
-# Build bzip2 files
-if [ $MODE_BZIP2 -ne 0 ]; then
- build_bzip2
+# Build gzip files
+if [ $MODE_GZIP -ne 0 ]; then
+ build_gzip
fi
# Upload them to the FTP server.
# For snapshots, make some further updates.
if [ $SNAPSHOT -ne 0 ] && [ $LOCAL -ne 0 ]; then
- # Update links on the FTP server.
- 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" \
- -e "s%@LONG_DATE@%$LONG_DATE%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%@LONG_DATE@%$LONG_DATE%g" \
- -e "s%@TEXT_DATE@%$TEXT_DATE%g" < ~/scripts/snapshot-index.html > $$
- mv $$ index.html
-
- touch LATEST-IS-$LONG_DATE
- rm -f LATEST-IS-$LAST_LONG_DATE
+ announce_snapshot
# Update snapshot date file.
changedir ~
- echo $DATE >.snapshot_date
-
- # Update gcc_latest_snapshot tag.
- ${CVS} rtag -d gcc_latest_snapshot gcc
- ${CVS} rtag -rgcc_ss_${DATE} gcc_latest_snapshot gcc
-
- # Announce the snapshot.
- export QMAILHOST=gcc.gnu.org
- mail -s "gcc-ss-$DATE is now available" gcc@gcc.gnu.org < ~ftp/pub/gcc/snapshots/README
+ echo $DATE > .snapshot_date-${BRANCH}
# Remove working directory
rm -rf ${WORKING_DIRECTORY}
OSDN Git Service
