X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=maintainer-scripts%2Fgcc_release;h=6ff6b2a301b26e3b1f5616efbdaa941207413f7a;hb=cebbbe697f89fcff70cb10acd47f4edd35958bbe;hp=0c60cdb512d22f3635454d0951a268eea499ff77;hpb=57c1f568dd4d16dfac5c5a5b79bc4c0bbcc6db2f;p=pf3gnuchains%2Fgcc-fork.git diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release index 0c60cdb512d..6ff6b2a301b 100755 --- a/maintainer-scripts/gcc_release +++ b/maintainer-scripts/gcc_release @@ -9,13 +9,13 @@ # Contents: # Script to create a GCC release. # -# Copyright (c) 2001, 2002 Free Software Foundation. +# Copyright (c) 2001, 2002, 2006, 2009, 2010 Free Software Foundation. # # This file is part of GCC. # # GCC is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # # GCC is distributed in the hope that it will be useful, @@ -24,9 +24,8 @@ # GNU General Public License for more details. # # 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, 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# along with GCC; see the file COPYING3. If not see +# . # ######################################################################## @@ -65,19 +64,19 @@ inform() { usage() { cat < DEV-PHASE && \ - ${CVS} 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} && \ - ${CVS} ci -m 'Update version' ${y}) || \ - error "Could not update ${x}" - done - fi + [ `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 # Tag the sources. - EXPORTDATE="" if [ -n "${TAG}" ]; then 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" + # 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 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 + 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, and (re)write - # the LAST_UPDATED file containing the CVS tag/date used. + # the LAST_UPDATED file containing the SVN tag/revision 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 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. @@ -252,7 +204,7 @@ EOF inform "Building compiler" OBJECT_DIRECTORY=../objdir contrib/gcc_build -d ${SOURCE_DIRECTORY} -o ${OBJECT_DIRECTORY} \ - -c "--enable-generated-files-in-srcdir" build || \ + -c "--enable-generated-files-in-srcdir --disable-multilib" build || \ error "Could not rebuild GCC" fi @@ -279,10 +231,10 @@ EOF 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, and possibly other arguments to tar. +# 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. @@ -324,8 +276,8 @@ 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}` @@ -333,7 +285,6 @@ build_tarfiles() { # Now, build one for each of the languages. 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} @@ -341,7 +292,7 @@ build_tarfiles() { # The core is everything else. EXCLUDES="" - for x in ${ADA_DIRS} ${CPLUSPLUS_DIRS} ${FORTRAN_DIRS} ${FORTRAN95_DIRS}\ + for x in ${ADA_DIRS} ${CPLUSPLUS_DIRS} ${FORTRAN95_DIRS}\ ${JAVA_DIRS} ${OBJECTIVEC_DIRS} ${TESTSUITE_DIRS}; do EXCLUDES="${EXCLUDES} --exclude $x" done @@ -364,7 +315,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-fortran gcc-java gcc-objc gcc-testsuite gcc-core; do + for f in gcc gcc-ada gcc-g++ 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 @@ -432,7 +383,7 @@ upload_files() { done } -#Print description if snapshot exists +# Print description if snapshot exists. snapshot_print() { if [ -e ${RELEASE}/$1 ]; then printf "%-38s%s\n\n" "$1" "$2" >> ${SNAPSHOT_README} @@ -455,8 +406,8 @@ announce_snapshot() { 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}" CVS branch -with the following options: "${EXPORTTAG} ${EXPORTDATE}" +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} @@ -479,8 +430,8 @@ for testing purposes.

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}" CVS branch -with the following options: "${EXPORTTAG} ${EXPORTDATE}"

+

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} @@ -489,7 +440,6 @@ with the following options: "${EXPORTTAG} ${EXPORTDATE}"

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" @@ -534,18 +484,20 @@ Last modified "${TEXT_DATE}" # 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" @@ -574,7 +526,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="" @@ -583,7 +535,7 @@ 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="" @@ -594,10 +546,9 @@ SOURCE_DIRECTORY="" # tar files. These are all relative to the top of the source tree. 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" +JAVA_DIRS="gcc/java libjava libffi boehm-gc" +OBJECTIVEC_DIRS="gcc/objc gcc/objcp libobjc" TESTSUITE_DIRS="gcc/testsuite" # Non-zero if this is the final release, rather than a prerelease. @@ -642,11 +593,11 @@ 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 @@ -680,7 +631,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 @@ -711,25 +662,22 @@ 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 # 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. + # unless the user specified tarballs explicitly. 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 @@ -744,19 +692,20 @@ SOURCE_DIRECTORY="${WORKING_DIRECTORY}/gcc-${RELEASE}" # relative to the WORKING_DIRECTORY. 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 ######################################################################## @@ -796,7 +745,6 @@ if [ $MODE_GZIP -ne 0 ]; then fi # Upload them to the FTP server. - if [ $MODE_UPLOAD -ne 0 ]; then upload_files