git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gcc_release: For RELEASE_MAJOR 5+ only use the major number in branch name. 

* gcc_release: For RELEASE_MAJOR 5+ only use the major
	number in branch name.  When doing final release of 5+,
	if BASE-VER doesn't match release, but is *.*.1 for the
	one smaller minor version, bump BASE-VER.

From-SVN: r222031
This commit is contained in:
Jakub Jelinek 2015-04-12 22:49:37 +02:00 committed by Jakub Jelinek
parent 7d83fb5533
commit e183a9d567
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainer-scripts/ChangeLog
View File

@ -1,5 +1,10 @@
2015-04-12 Jakub Jelinek <jakub@redhat.com> 2015-04-12 Jakub Jelinek <jakub@redhat.com>
* gcc_release: For RELEASE_MAJOR 5+ only use the major
number in branch name. When doing final release of 5+,
if BASE-VER doesn't match release, but is *.*.1 for the
one smaller minor version, bump BASE-VER.
* crontab: Enable snapshots from gcc-5-branch. * crontab: Enable snapshots from gcc-5-branch.
2015-04-07 Gerald Pfeifer <gerald@pfeifer.com> 2015-04-07 Gerald Pfeifer <gerald@pfeifer.com>

24
maintainer-scripts/gcc_release
View File

@ -9,7 +9,7 @@
# Contents: # Contents:
# Script to create a GCC release. # Script to create a GCC release.
# #
# Copyright (c) 2001-2014 Free Software Foundation. # Copyright (c) 2001-2015 Free Software Foundation.
# #
# This file is part of GCC. # This file is part of GCC.
# #
@ -130,8 +130,20 @@ EOF
# Update gcc/DEV-PHASE. # Update gcc/DEV-PHASE.
[ `cat ${SOURCE_DIRECTORY}/gcc/BASE-VER` = ${RELEASE} ] || \ if [ `cat ${SOURCE_DIRECTORY}/gcc/BASE-VER` = ${RELEASE} ]; then
error "Release number ${RELEASE} does not match BASE-VER" [ ${RELEASE_MAJOR} -lt 5 ] && \
error "Release number ${RELEASE} does not match BASE-VER"
if [ `cat ${SOURCE_DIRECTORY}/gcc/BASE-VER` \
= ${RELEASE_MAJOR}.`expr ${RELEASE_MINOR} - 1`.1 \
-a x${RELEASE_REVISION} = x0 ]; then
(changedir ${SOURCE_DIRECTORY}/gcc && \
echo ${RELEASE} > BASE-VER && \
${SVN} -q ci -m 'Bump release' BASE-VER) || \
error "Could not update BASE-VER"
else
error "Release number ${RELEASE} does not match BASE-VER"
fi
fi
(changedir ${SOURCE_DIRECTORY}/gcc && \ (changedir ${SOURCE_DIRECTORY}/gcc && \
: > DEV-PHASE && \ : > DEV-PHASE && \
${SVN} -q ci -m 'Mark as release' DEV-PHASE) || \ ${SVN} -q ci -m 'Mark as release' DEV-PHASE) || \
@ -605,7 +617,11 @@ if [ $SNAPSHOT -eq 0 ]; then
# Compute the name of the branch, which is based solely on the major # Compute the name of the branch, which is based solely on the major
# and minor release numbers. # and minor release numbers.
SVNBRANCH="branches/gcc-${RELEASE_MAJOR}_${RELEASE_MINOR}-branch" if [ ${RELEASE_MAJOR} -ge 5 ]; then
SVNBRANCH="branches/gcc-${RELEASE_MAJOR}-branch"
else
SVNBRANCH="branches/gcc-${RELEASE_MAJOR}_${RELEASE_MINOR}-branch"
fi
# If this is not a final release, set various parameters accordingly. # If this is not a final release, set various parameters accordingly.
if [ ${FINAL} -ne 1 ]; then if [ ${FINAL} -ne 1 ]; then