X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=maintainer-scripts%2Fgcc_release;h=adba309303da30d64836bebf89ac712393be41b8;hp=5e0b3612a275b750d4d9627df9f8c4be9f926cf0;hb=92264cad834c0a11f72bee1702460d1500871471;hpb=d3ca703efa59ff4befeb4393e72058c658ba2d75 diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release index 5e0b3612a27..adba309303d 100755 --- a/maintainer-scripts/gcc_release +++ b/maintainer-scripts/gcc_release @@ -25,8 +25,8 @@ # # You should have received a copy of the GNU General Public License # along with GCC; see the file COPYING. If not, write to -# the Free Software Foundation, 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# the Free Software Foundation, 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # ######################################################################## @@ -64,20 +64,20 @@ inform() { usage() { cat < ${y}.new && \ - mv ${y}.new ${y} && \ - ${CVS} ci -m 'Update version' ${y}) || \ - error "Could not update ${x}" - done + # Update gcc/DEV-PHASE if it exists, otherwise gcc/version.c. + + if [ -f ${SOURCE_DIRECTORY}/gcc/DEV-PHASE ]; then + [ `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" + else + for x in gcc/version.c; do + y=`basename ${x}` + (changedir `dirname ${SOURCE_DIRECTORY}/${x}` && \ + sed -e 's|version_string\[\] = \".*\"|version_string\[\] = \"'${RELEASE}'\"|g' < ${y} > ${y}.new && \ + mv ${y}.new ${y} && \ + ${SVN} -q ci -m 'Update version' ${y}) || \ + error "Could not update ${x}" + done + fi # 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 # Tag the sources. 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}" + # 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" + 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 ${BRANCH} 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 + echo "Obtained from SVN: ${SVNBRANCH} revision ${SVNREV}" > LAST_UPDATED # Obtain some documentation files from the wwwdocs module. inform "Retrieving HTML documentation" @@ -196,7 +214,7 @@ EOF done # 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 +226,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 +235,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" 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. +# directories to include, and possibly other arguments to tar. build_tarfile() { # Get the name of the destination tar file. @@ -254,6 +279,25 @@ build_tarfile() { FILE_LIST="${FILE_LIST} ${TARFILE}" } +# Build a single tarfile if any of the directories listed exist, +# but not if none of them do (because that component doesn't exist +# on this branch). +maybe_build_tarfile() { + dest=$1 + shift + dir_exists=0 + for maybe_dir in "$@"; do + if [ -d "$maybe_dir" ]; then + dir_exists=1 + fi + done + if [ $dir_exists = 1 ]; then + build_tarfile "$dest" "$@" + else + echo "Not building $dest tarfile" + fi +} + # Build the various tar files for the release. build_tarfiles() { @@ -271,16 +315,17 @@ build_tarfiles() { 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} + maybe_build_tarfile gcc-ada-${RELEASE} ${ADA_DIRS} + maybe_build_tarfile gcc-g++-${RELEASE} ${CPLUSPLUS_DIRS} + maybe_build_tarfile gcc-g77-${RELEASE} ${FORTRAN_DIRS} + maybe_build_tarfile gcc-fortran-${RELEASE} ${FORTRAN95_DIRS} + maybe_build_tarfile gcc-java-${RELEASE} ${JAVA_DIRS} + maybe_build_tarfile gcc-objc-${RELEASE} ${OBJECTIVEC_DIRS} + maybe_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 @@ -303,7 +348,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 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 @@ -371,28 +416,102 @@ upload_files() { done } +#Print description if snapshot exists +snapshot_print() { + if [ -e ${RELEASE}/$1 ]; then + printf "%-38s%s\n\n" "$1" "$2" >> ${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%@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 + 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 (includes all of below)" + snapshot_print gcc-core-${RELEASE}.tar.bz2 "C front end and core compiler" + snapshot_print gcc-ada-${RELEASE}.tar.bz2 "Ada front end and runtime" + snapshot_print gcc-fortran-${RELEASE}.tar.bz2 "Fortran front end and runtime" + snapshot_print gcc-g++-${RELEASE}.tar.bz2 "C++ front end and runtime" + snapshot_print gcc-g77-${RELEASE}.tar.bz2 "Fortran 77 front end and runtime" + snapshot_print gcc-java-${RELEASE}.tar.bz2 "Java front end and runtime" + snapshot_print gcc-objc-${RELEASE}.tar.bz2 "Objective-C front end and runtime" + snapshot_print gcc-testsuite-${RELEASE}.tar.bz2 "The GCC testsuite" + + 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-$DATE is now available" gcc@gcc.gnu.org < ~ftp/pub/gcc/snapshots/README + mail -s "gcc-${RELEASE} is now available" gcc@gcc.gnu.org < ${SNAPSHOT_README} } ######################################################################## @@ -403,21 +522,22 @@ announce_snapshot() { DATE=`date "+%Y%m%d"` LONG_DATE=`date "+%Y-%m-%d"` +SVN=${SVN:-/usr/bin/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' @@ -431,9 +551,14 @@ RELEASE_REVISION="" # 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. +SVNBRANCH="" + # The tag to apply to the sources used for the release. TAG="" @@ -450,9 +575,10 @@ 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" +ADA_DIRS="gcc/ada libada gnattools" 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" @@ -482,7 +608,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}" @@ -494,20 +620,22 @@ TAR="${TAR:-tar}" ######################################################################## # 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}";; + u) SVN_USERNAME="${OPTARG}";; f) FINAL=1;; - s) SNAPSHOT=1;; + s) SNAPSHOT=1 + BRANCH=${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;; @@ -515,8 +643,27 @@ while getopts "d:fr:u:t:p:sl" ARG; do 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 +if [ ${LOCAL} -eq 0 ] && [ -z ${SVN_USERNAME} ]; then error "No username specified" fi @@ -547,29 +694,25 @@ if [ $SNAPSHOT -eq 0 ]; then # Compute the name of the branch, which is based solely on the major # and minor release numbers. - BRANCH="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 [ ${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.bz2 + RELEASE=${BRANCH}-${DATE} + FTP_PATH="${FTP_PATH}/snapshots/${RELEASE}" + + # 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 @@ -582,17 +725,20 @@ SOURCE_DIRECTORY="${WORKING_DIRECTORY}/gcc-${RELEASE}" 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}` -# 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}" + CVSROOT=":ext:${SVN_USERNAME}@gcc.gnu.org/cvs/gcc" else - CVSROOT="${CVS_REPOSITORY}" + SVNROOT="file:///svn/gcc" + CVSROOT="/cvs/gcc" fi +export SVNROOT export CVSROOT ######################################################################## @@ -603,25 +749,6 @@ export CVSROOT TZ="UTC0" export TZ -# 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 - # Build the source directory. if [ $MODE_SOURCES -ne 0 ]; then @@ -651,7 +778,6 @@ if [ $MODE_GZIP -ne 0 ]; then fi # Upload them to the FTP server. - if [ $MODE_UPLOAD -ne 0 ]; then upload_files @@ -661,7 +787,7 @@ if [ $MODE_UPLOAD -ne 0 ]; then # Update snapshot date file. changedir ~ - echo $DATE >.snapshot_date + echo $DATE > .snapshot_date-${BRANCH} # Remove working directory rm -rf ${WORKING_DIRECTORY}