From 155cb61615af89497814ef6c2685e2dfd098f2f7 Mon Sep 17 00:00:00 2001 From: Kelley Cook Date: Fri, 6 Aug 2004 11:11:11 +0000 Subject: [PATCH] gcc_release (snapshot_print): Accept arguments. 2004-08-06 Kelley Cook * gcc_release (snapshot_print): Accept arguments. Don't use echo -e. (announce_snapshot): Update for above. Don't use echo -e. From-SVN: r85637 --- maintainer-scripts/ChangeLog | 5 ++ maintainer-scripts/gcc_release | 138 ++++++++++++++++----------------- 2 files changed, 70 insertions(+), 73 deletions(-) diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index 9902f1b06db..c17f93a17fc 100644 --- a/maintainer-scripts/ChangeLog +++ b/maintainer-scripts/ChangeLog @@ -1,3 +1,8 @@ +2004-08-06 Kelley Cook + + * gcc_release (snapshot_print): Accept arguments. Don't use echo -e. + (announce_snapshot): Update for above. Don't use echo -e. + 2004-08-03 Kelley Cook * maintainer-scripts (snapshot_print): New function. diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release index 8d49ce9c967..036c8bf943a 100755 --- a/maintainer-scripts/gcc_release +++ b/maintainer-scripts/gcc_release @@ -409,10 +409,10 @@ upload_files() { #Print description if snapshot exists snapshot_print() { - if [ -e ${RELEASE}/${SNAP_FILE} ]; then - printf "%-38s%s\n\n" "${SNAP_FILE}" "${SNAP_DESCRIPTION}" >> ${SNAPSHOT_README} - echo -e " ${SNAP_FILE}\n" \ - " ${SNAP_DESCRIPTION}" >> ${SNAPSHOT_INDEX} + if [ -e ${RELEASE}/$1 ]; then + printf "%-38s%s\n\n" "$1" "$2" >> ${SNAPSHOT_README} + echo " $1" >> ${SNAPSHOT_INDEX} + echo " $2" >> ${SNAPSHOT_INDEX} fi } @@ -425,84 +425,76 @@ announce_snapshot() { SNAPSHOT_INDEX=${RELEASE}/index.html changedir "${SNAPSHOTS_DIR}" - echo -e "Snapshot gcc-"${RELEASE}" is now available on" \ - "\n ftp://gcc.gnu.org/pub/gcc/snapshots/"${RELEASE}"/" \ - "\nand on various mirrors, see http://gcc.gnu.org/mirrors.html for details." \ - "\n\nThis snapshot has been generated from the GCC "${BRANCH}" CVS branch" \ - "\nwith the following options: "${EXPORTTAG} ${EXPORTDATE} \ - "\n\nYou'll find:\n" > ${SNAPSHOT_README} + 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. - echo -e "" \ - "\n\n" \ - "\nGCC "${RELEASE}" Snapshot" \ - "\n" \ - "\n\n" \ - "\n

GCC "${RELEASE}" Snapshot

" \ - "\n\n

The GCC Project makes" \ - "\nperiodic snapshots of the GCC source tree available to the public" \ - "\nfor testing purposes.

" \ - "\n\n

If you are planning to download and use one of our snapshots, then" \ - "\nwe highly recommend you join the GCC developers list. Details for" \ - "\nhow to sign up can be found on the GCC project home page.

" \ - "\n\n

This snapshot has been generated from the GCC "${BRANCH}" CVS branch" \ - "\nwith the following options: "${EXPORTTAG} ${EXPORTDATE}"

" \ - "\n\n" > ${SNAPSHOT_INDEX} +This snapshot has been generated from the GCC "${BRANCH}" CVS branch +with the following options: "${EXPORTTAG} ${EXPORTDATE}" + +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}" CVS branch +with the following options: "${EXPORTTAG} ${EXPORTDATE}"

+ +
" > ${SNAPSHOT_INDEX} - SNAP_FILE=gcc-${RELEASE}.tar.bz2 - SNAP_DESCRIPTION="Complete GCC (includes all of below)" - snapshot_print + 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" - SNAP_FILE=gcc-core-${RELEASE}.tar.bz2 - SNAP_DESCRIPTION="C front end and core compiler" - snapshot_print + echo \ +"Diffs from "${BRANCH}"-"${LAST_DATE}" are available in the diffs/ subdirectory. - SNAP_FILE=gcc-ada-${RELEASE}.tar.bz2 - SNAP_DESCRIPTION="Ada front end and runtime" - snapshot_print +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} - SNAP_FILE=gcc-fortran-${RELEASE}.tar.bz2 - SNAP_DESCRIPTION="Fortran front end and runtime" - snapshot_print + echo \ +"
+

Diffs from "${BRANCH}"-"${LAST_DATE}" are available in the +diffs/ subdirectory.

- SNAP_FILE=gcc-g++-${RELEASE}.tar.bz2 - SNAP_DESCRIPTION="C++ front end and runtime" - snapshot_print +

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.

- SNAP_FILE=gcc-g77-${RELEASE}.tar.bz2 - SNAP_DESCRIPTION="Fortran 77 front end and runtime" - snapshot_print +
- SNAP_FILE=gcc-java-${RELEASE}.tar.bz2 - SNAP_DESCRIPTION="Objective-C front end and runtime" - snapshot_print +
+gcc@gcc.gnu.org +
+Last modified "${TEXT_DATE}" +
+ - SNAP_FILE=gcc-objc-${RELEASE}.tar.bz2 - SNAP_DESCRIPTION="Java front end and runtime" - snapshot_print - - SNAP_FILE=gcc-testsuite-${RELEASE}.tar.bz2 - SNAP_DESCRIPTION="The GCC testsuite" - snapshot_print - - echo -e "\nDiffs from "${BRANCH}"-"${LAST_DATE}" are available in the diffs/ subdirectory." \ - "\n\nWhen a particular snapshot is ready for public consumption the LATEST-"${BRANCH} \ - "\nlink is updated and a message is sent to the gcc list. Please do not use" \ - "\na snapshot before it has been announced that way." >> ${SNAPSHOT_README} - - echo -e "" \ - "\n

Diffs from "${BRANCH}"-"${LAST_DATE}" are available in the" \ - "\ndiffs/ subdirectory.

" \ - "\n\n

When a particular snapshot is ready for public consumption the LATEST-"${BRANCH} \ - "\nlink is updated and a message is sent to the gcc list. Please do not use" \ - "\na snapshot before it has been announced that way.

" \ - "\n\n
" \ - "\n\n
" \ - "\ngcc@gcc.gnu.org" \ - "\n
" \ - "\nLast modified "${TEXT_DATE} \ - "\n
" \ - "\n" \ - "\n\n" >> ${SNAPSHOT_INDEX} +" >> ${SNAPSHOT_INDEX} rm -f LATEST-${BRANCH} ln -s ${RELEASE} LATEST-${BRANCH}