diff options
| -rw-r--r-- | maintainer-scripts/ChangeLog | 6 | ||||
| -rwxr-xr-x | maintainer-scripts/gcc_release | 40 |
2 files changed, 26 insertions, 20 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index 79c0170cea1..19a51122f49 100644 --- a/maintainer-scripts/ChangeLog +++ b/maintainer-scripts/ChangeLog @@ -1,3 +1,9 @@ +2003-07-08 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * gcc_release: Move handling of complex modes directly after + switch handling. + (TAG): Include the branch name as part of snapshot CVS tags. + 2003-07-04 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> * gcc_release: Execute gcc.gnu.org-only operations which are diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release index 558cd796225..1dd3c9ff336 100755 --- a/maintainer-scripts/gcc_release +++ b/maintainer-scripts/gcc_release @@ -520,6 +520,25 @@ 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 error "No username specified" @@ -567,7 +586,7 @@ else BRANCH="3.3" CVSBRANCH=gcc-3_3-branch FTP_PATH="${FTP_PATH}/snapshots/${BRANCH}-${LONG_DATE}" - TAG=gcc_ss_${DATE} + TAG=gcc-ss-`echo ${BRANCH} | tr '.' '_'`-${DATE} # Building locally on gcc.gnu.org, we know what the last snapshot date # was. @@ -609,25 +628,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 |