${y}.new && \
- mv ${y}.new ${y} && \
- ${CVS} ci -m 'Update version' ${y}) || \
- error "Could not update ${x}"
- done
+ # Update gcc/DEV-PHASE.
+
+ [ `cat ${SOURCE_DIRECTORY}/gcc/BASE-VER` = ${RELEASE} ] || \
+ error "Release number ${RELEASE} does not match BASE-VER"
+ (changedir ${SOURCE_DIRECTORY}/gcc && \
+ : > DEV-PHASE && \
+ ${SVN} -q ci -m 'Mark as release' DEV-PHASE) || \
+ error "Could not update DEV-PHASE"
# Make sure we tag the sources for a final release.
- TAG="gcc_`echo ${RELEASE} | tr . _`_release"
+ TAG="tags/gcc_`echo ${RELEASE} | tr . _`_release"
rm -rf ${SOURCE_DIRECTORY}
fi
@@ -159,44 +146,33 @@ EOF
# Tag the sources.
if [ -n "${TAG}" ]; then
inform "Tagging sources as ${TAG}"
- ${CVS} rtag -r ${CVSBRANCH} -F ${TAG} gcc || \
+ # We don't want to overwrite an existing tag. So, if the tag
+ # already exists, issue an error message; the release manager can
+ # manually remove the tag if appropriate.
+ echo "${SVN} ls ${SVNROOT}/${TAG}/ChangeLog"
+ if ${SVN} ls "${SVNROOT}/${TAG}/ChangeLog"; then
+ error "Tag ${TAG} already exists"
+ fi
+ ${SVN} -m "Tagging source as ${TAG}" cp "${SVNROOT}/${SVNBRANCH}" "${SVNROOT}/${TAG}" || \
error "Could not tag sources"
- CVSBRANCH=$TAG
+ SVNBRANCH=${TAG}
fi
+ SVNREV=`${SVN} info "${SVNROOT}/${SVNBRANCH}"|awk '/Revision:/ {print $2}'`
# 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 (svn export -r ${SVNREV} ${SVNROOT}/${SVNBRANCH})"
+
+ ${SVN} -q export -r${SVNREV} "${SVNROOT}/${SVNBRANCH}" "`basename ${SOURCE_DIRECTORY}`" ||\
+ error "Could not retrieve sources"
- # 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 SVN tag/revision used.
changedir "gcc-${RELEASE}"
contrib/gcc_update --touch
-
- # Obtain some documentation files from the wwwdocs module.
- inform "Retrieving HTML documentation"
- changedir "${WORKING_DIRECTORY}"
- for x in bugs faq; do
- (${CVS} export -r HEAD wwwdocs/htdocs/${x}.html && \
- cp ${WORKING_DIRECTORY}/wwwdocs/htdocs/${x}.html \
- ${SOURCE_DIRECTORY}) || \
- error "Could not retrieve ${x}.html"
- done
-
- inform "Generating plain-text documentation from HTML"
- changedir "${SOURCE_DIRECTORY}"
- for file in *.html; do
- newfile=`echo $file | sed -e 's/.html//' | tr "[:lower:]" "[:upper:]"`
- (${ENV} TERM=vt100 lynx -dump $file \
- | sed -e "s#file://localhost`/bin/pwd`\(.*\)#http://gcc.gnu.org\1#g" \
- > $newfile) || \
- error "Could not generate text-only version of ${file}"
- done
+ echo "Obtained from SVN: ${SVNBRANCH} revision ${SVNREV}" > LAST_UPDATED
# For a prerelease or real release, we need to generate additional
- # files not present in CVS.
+ # files not present in SVN.
changedir "${SOURCE_DIRECTORY}"
if [ $SNAPSHOT -ne 1 ]; then
# Generate the documentation.
@@ -208,7 +184,7 @@ EOF
${SOURCE_DIRECTORY}/gcc/doc/install.texi2html
# Regenerate the NEWS file.
- contrib/gennews > gcc/NEWS || \
+ contrib/gennews > NEWS || \
error "Could not regenerate NEWS files"
# Now, we must build the compiler in order to create any generated
@@ -217,31 +193,38 @@ EOF
# 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 --disable-multilib" 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.
mv ../objdir/gcc/po/*.gmo gcc/po/
+ [ -f libcpp/po/cpplib.pot ] && mv ../objdir/libcpp/po/*.gmo libcpp/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.
+ echo \
+"# This file contains the MD5 checksums of the files in the
+# gcc-"${RELEASE}".tar.bz2 tarball.
+#
+# Besides verifying that all files in the tarball were correctly expanded,
+# it also can be used to determine if any files have changed since the
+# tarball was expanded or to verify that a patchfile was correctly applied.
+#
+# Suggested usage:
+# md5sum -c MD5SUMS | grep -v \"OK$\"
+" > MD5SUMS
+
+ 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
-# of the tarfile to build, without any suffixes. They will be added
-# automatically. The rest of the arguments are the files or
-# directories to include.
+# Build a single tarfile. The first argument is the name of the tarfile
+# to build, without any suffixes. They will be added automatically. The
+# rest of the arguments are files or directories to include, and possibly
+# other arguments to tar.
build_tarfile() {
# Get the name of the destination tar file.
@@ -264,28 +247,11 @@ build_tarfiles() {
# The GNU Coding Standards specify that all files should
# world readable.
chmod -R a+r ${SOURCE_DIRECTORY}
- # And that all directories have mode 777.
- find ${SOURCE_DIRECTORY} -type d -exec chmod 777 {} \;
+ # And that all directories have mode 755.
+ find ${SOURCE_DIRECTORY} -type d -exec chmod 755 {} \;
# Build one huge tarfile for the entire distribution.
build_tarfile gcc-${RELEASE} `basename ${SOURCE_DIRECTORY}`
-
- # Now, build one for each of the languages.
- build_tarfile gcc-ada-${RELEASE} ${ADA_DIRS}
- build_tarfile gcc-g++-${RELEASE} ${CPLUSPLUS_DIRS}
- build_tarfile gcc-g77-${RELEASE} ${FORTRAN_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} \
- ${JAVA_DIRS} ${OBJECTIVEC_DIRS} ${TESTSUITE_DIRS}; do
- EXCLUDES="${EXCLUDES} --exclude $x"
- done
- build_tarfile gcc-core-${RELEASE} ${EXCLUDES} \
- `basename ${SOURCE_DIRECTORY}`
}
# Build .gz files.
@@ -303,7 +269,7 @@ build_diffs() {
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; do
old_tar=${old_dir}/${f}-${old_vers}.tar.bz2
new_tar=${WORKING_DIRECTORY}/${f}-${RELEASE}.tar.bz2
if [ ! -e $old_tar ]; then
@@ -371,57 +337,128 @@ upload_files() {
done
}
+# Print description if snapshot exists.
+snapshot_print() {
+ if [ -e ${RELEASE}/$1 ]; then
+ hash=`openssl md5 ${RELEASE}/$1 | sed -e 's#(.*)##' -e 's# *= *#=#'`
+ hash2=`openssl sha1 ${RELEASE}/$1 | sed -e 's#(.*)##' -e 's# *= *#=#'`
+
+ printf " %-37s%s\n\n %s\n %s\n\n" "$1" "$2" "$hash" "$hash2" \
+ >> ${SNAPSHOT_README}
+
+ echo " | $1 | " >> ${SNAPSHOT_INDEX}
+ echo " $2 |
" >> ${SNAPSHOT_INDEX}
+ fi
+}
+
# 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`
- cd ~ftp/pub/gcc/snapshots
- 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-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 $$ ${RELEASE}/index.html
-
- touch LATEST-IS-${BRANCH}-${DATE}
- rm -f LATEST-IS-${BRANCH}-${LAST_DATE}
+ SNAPSHOT_README=${RELEASE}/README
+ SNAPSHOT_INDEX=${RELEASE}/index.html
+
+ changedir "${SNAPSHOTS_DIR}"
+ echo \
+"Snapshot gcc-"${RELEASE}" is now available on
+ ftp://gcc.gnu.org/pub/gcc/snapshots/"${RELEASE}"/
+and on various mirrors, see http://gcc.gnu.org/mirrors.html for details.
+
+This snapshot has been generated from the GCC "${BRANCH}" SVN branch
+with the following options: "svn://gcc.gnu.org/svn/gcc/${SVNBRANCH} revision ${SVNREV}"
+
+You'll find:
+" > ${SNAPSHOT_README}
+
+ echo \
+"
+
+
+GCC "${RELEASE}" Snapshot
+
+
+
+GCC "${RELEASE}" Snapshot
+
+The GCC Project makes
+periodic snapshots of the GCC source tree available to the public
+for testing purposes.
+
+If you are planning to download and use one of our snapshots, then
+we highly recommend you join the GCC developers list. Details for
+how to sign up can be found on the GCC project home page.
+
+This snapshot has been generated from the GCC "${BRANCH}" SVN branch
+with the following options: "svn://gcc.gnu.org/svn/gcc/${SVNBRANCH} revision ${SVNREV}"
+
+" > ${SNAPSHOT_INDEX}
+
+ snapshot_print gcc-${RELEASE}.tar.bz2 "Complete GCC"
+
+ echo \
+"Diffs from "${BRANCH}"-"${LAST_DATE}" are available in the diffs/ subdirectory.
+
+When a particular snapshot is ready for public consumption the LATEST-"${BRANCH}"
+link is updated and a message is sent to the gcc list. Please do not use
+a snapshot before it has been announced that way." >> ${SNAPSHOT_README}
+
+ echo \
+"
+Diffs from "${BRANCH}"-"${LAST_DATE}" are available in the
+diffs/ subdirectory.
+
+When a particular snapshot is ready for public consumption the LATEST-"${BRANCH}"
+link is updated and a message is sent to the gcc list. Please do not use
+a snapshot before it has been announced that way.
+
+
+
+
+gcc@gcc.gnu.org
+
+Last modified "${TEXT_DATE}"
+
+
+
+" >> ${SNAPSHOT_INDEX}
+
+ rm -f LATEST-${BRANCH}
+ ln -s ${RELEASE} LATEST-${BRANCH}
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-${RELEASE} is now available" gcc@gcc.gnu.org < ${SNAPSHOT_README}
}
########################################################################
# Initialization
########################################################################
+LC_ALL=C
+export LC_ALL
+
# Today's date.
DATE=`date "+%Y%m%d"`
LONG_DATE=`date "+%Y-%m-%d"`
+SVN=${SVN:-svn}
# The CVS server containing the GCC repository.
-CVS_SERVER="gcc.gnu.org"
+SVN_SERVER="gcc.gnu.org"
# The path to the repository on that server.
-CVS_REPOSITORY="/cvs/gcc"
-# The CVS protocol to use.
-CVS_PROTOCOL="ext"
+SVN_REPOSITORY="/svn/gcc"
# The username to use when connecting to the server.
-CVS_USERNAME="${USER}"
+SVN_USERNAME="${USER}"
# The machine to which files will be uploaded.
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'
@@ -441,7 +478,7 @@ BRANCH=""
# The name of the branch from which the release should be made, as used
# for our version control system.
-CVSBRANCH=""
+SVNBRANCH=""
# The tag to apply to the sources used for the release.
TAG=""
@@ -450,22 +487,13 @@ TAG=""
OLD_TARS=""
# The directory that will be used to construct the release. The
-# release itself will be placed in a subdirectory of this diretory.
+# release itself will be placed in a subdirectory of this directory.
DESTINATION=${HOME}
# The subdirectory.
WORKING_DIRECTORY=""
# The directory that will contain the GCC sources.
SOURCE_DIRECTORY=""
-# 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"
-CPLUSPLUS_DIRS="gcc/cp libstdc++-v3"
-FORTRAN_DIRS="gcc/f libf2c"
-JAVA_DIRS="gcc/java libjava libffi fastjar zlib boehm-gc"
-OBJECTIVEC_DIRS="gcc/objc libobjc"
-TESTSUITE_DIRS="gcc/testsuite"
-
# Non-zero if this is the final release, rather than a prerelease.
FINAL=0
@@ -491,7 +519,7 @@ FILE_LIST=""
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}"
@@ -508,18 +536,17 @@ while getopts "d:fr:u:t:p:s:l" ARG; do
d) DESTINATION="${OPTARG}";;
r) RELEASE="${OPTARG}";;
t) TAG="${OPTARG}";;
- u) CVS_USERNAME="${OPTARG}";;
+ u) SVN_USERNAME="${OPTARG}";;
f) FINAL=1;;
s) SNAPSHOT=1
BRANCH=${OPTARG%:*}
- CVSBRANCH=${OPTARG#*:}
+ SVNBRANCH=${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;;
@@ -547,7 +574,7 @@ while [ $# -ne 0 ]; do
done
# Perform consistency checking.
-if [ ${LOCAL} -eq 0 ] && [ -z ${CVS_USERNAME} ]; then
+if [ ${LOCAL} -eq 0 ] && [ -z ${SVN_USERNAME} ]; then
error "No username specified"
fi
@@ -578,28 +605,25 @@ if [ $SNAPSHOT -eq 0 ]; then
# Compute the name of the branch, which is based solely on the major
# and minor release numbers.
- CVSBRANCH="gcc-${RELEASE_MAJOR}_${RELEASE_MINOR}-branch"
+ SVNBRANCH="branches/gcc-${RELEASE_MAJOR}_${RELEASE_MINOR}-branch"
- # If this is not a final release, set various parameters acordingly.
+ # If this is not a final release, set various parameters accordingly.
if [ ${FINAL} -ne 1 ]; then
- RELEASE="${RELEASE}-${DATE}"
- FTP_PATH="${FTP_PATH}/prerelease-${RELEASE}/"
+ RELEASE="${RELEASE}-RC-${DATE}"
+ FTP_PATH="${SNAPSHOTS_DIR}/${RELEASE}"
else
FTP_PATH="${FTP_PATH}/releases/gcc-${RELEASE}/"
fi
else
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
+ # 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 explicitly.
+ 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
@@ -607,23 +631,13 @@ fi
WORKING_DIRECTORY="${DESTINATION}/gcc-${RELEASE}"
SOURCE_DIRECTORY="${WORKING_DIRECTORY}/gcc-${RELEASE}"
-# Recompute the names of all the language-specific directories,
-# relative to the WORKING_DIRECTORY.
-ADA_DIRS=`adjust_dirs ${ADA_DIRS}`
-CPLUSPLUS_DIRS=`adjust_dirs ${CPLUSPLUS_DIRS}`
-FORTRAN_DIRS=`adjust_dirs ${FORTRAN_DIRS}`
-JAVA_DIRS=`adjust_dirs ${JAVA_DIRS}`
-OBJECTIVEC_DIRS=`adjust_dirs ${OBJECTIVEC_DIRS}`
-TESTSUITE_DIRS=`adjust_dirs ${TESTSUITE_DIRS}`
-
-# Set up CVSROOT.
+# Set up SVNROOT.
if [ $LOCAL -eq 0 ]; then
- CVSROOT=":${CVS_PROTOCOL}:${CVS_USERNAME}@"
- CVSROOT="${CVSROOT}${CVS_SERVER}:${CVS_REPOSITORY}"
+ SVNROOT="svn+ssh://${SVN_USERNAME}@${SVN_SERVER}${SVN_REPOSITORY}"
else
- CVSROOT="${CVS_REPOSITORY}"
+ SVNROOT="file:///svn/gcc"
fi
-export CVSROOT
+export SVNROOT
########################################################################
# Main Program
@@ -662,7 +676,6 @@ if [ $MODE_GZIP -ne 0 ]; then
fi
# Upload them to the FTP server.
-
if [ $MODE_UPLOAD -ne 0 ]; then
upload_files