fi
# Tag the sources.
+ EXPORTDATE=""
if [ -n "${TAG}" ]; then
inform "Tagging sources as ${TAG}"
- ${CVS} rtag -r ${CVSBRANCH} -F ${TAG} gcc || \
+ # 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}"
- 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.
# Move message catalogs to source directory.
mv ../objdir/gcc/po/*.gmo gcc/po/
- # Create a `.brik' file to use for checking the validity of the
- # release.
- changedir "${SOURCE_DIRECTORY}"
- BRIK_FILE=`mktemp /tmp/gcc_release.XXXXXXX`
- ((find . -type f | sort > $BRIK_FILE) && \
- brik -Gb -f ${BRIK_FILE} > .brik && \
- rm ${BRIK_FILE}) || \
- error "Could not compute brik checksum"
+ # Create a "MD5SUMS" file to use for checking the validity of the release.
+ find . -type f |sed -e 's:^\./::' -e '/MD5SUMS/d' |sort |xargs md5sum >MD5SUMS
}
# Buid a single tarfile. The first argument is the name of the name
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
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
+ 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 "Updating links and READMEs on the FTP server"
TEXT_DATE=`date --date=$DATE +%B\ %d,\ %Y`
- changedir ~ftp/pub/gcc/snapshots
+ changedir "${SNAPSHOTS_DIR}"
sed -e "s%@DATE@%$DATE%g" \
-e "s%@TEXT_DATE@%$TEXT_DATE%g" \
-e "s%@LAST_DATE@%$LAST_DATE%g" \
inform "Sending mail"
export QMAILHOST=gcc.gnu.org
- mail -s "gcc-ss-${RELEASE} is now available" gcc@gcc.gnu.org < ~ftp/pub/gcc/snapshots/${RELEASE}/README
+ mail -s "gcc-ss-${RELEASE} is now available" gcc@gcc.gnu.org < ${SNAPSHOTS_DIR}/${RELEASE}/README
}
########################################################################
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'
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"
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}"
;;
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;;
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
+ # 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}`
- LAST_DIR=~ftp/pub/gcc/snapshots/${BRANCH}-${LAST_DATE}
- OLD_TARS=${LAST_DIR}/gcc-${BRANCH}-${LAST_DATE}.tar.bz2
+ 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}`