Use the minor number for the revision numbers.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215055 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2014-08-07 04:21:45 +00:00
parent 81dfaefc4c
commit 14d29b65e5

View File

@ -34,16 +34,16 @@ function usage() {
function tag_version() { function tag_version() {
set -x set -x
for proj in $projects; do for proj in $projects; do
if svn ls $base_url/$proj/branches/release_$release > /dev/null 2>&1 ; then if svn ls $base_url/$proj/branches/release_$branch_release > /dev/null 2>&1 ; then
if [ $rebranch = "no" ]; then if [ $rebranch = "no" ]; then
continue continue
fi fi
svn remove -m "Removing old release_$release branch for rebranching." \ svn remove -m "Removing old release_$branch_release branch for rebranching." \
$base_url/$proj/branches/release_$release $base_url/$proj/branches/release_$branch_release
fi fi
svn copy -m "Creating release_$release branch" \ svn copy -m "Creating release_$branch_release branch" \
$base_url/$proj/trunk \ $base_url/$proj/trunk \
$base_url/$proj/branches/release_$release $base_url/$proj/branches/release_$branch_release
done done
set +x set +x
} }
@ -51,13 +51,13 @@ function tag_version() {
function tag_release_candidate() { function tag_release_candidate() {
set -x set -x
for proj in $projects ; do for proj in $projects ; do
if ! svn ls $base_url/$proj/tags/RELEASE_$release > /dev/null 2>&1 ; then if ! svn ls $base_url/$proj/tags/RELEASE_$tag_release > /dev/null 2>&1 ; then
svn mkdir -m "Creating release directory for release_$release." $base_url/$proj/tags/RELEASE_$release svn mkdir -m "Creating release directory for release_$tag_release." $base_url/$proj/tags/RELEASE_$tag_release
fi fi
if ! svn ls $base_url/$proj/tags/RELEASE_$release/$rc > /dev/null 2>&1 ; then if ! svn ls $base_url/$proj/tags/RELEASE_$tag_release/$rc > /dev/null 2>&1 ; then
svn copy -m "Creating release candidate $rc from release_$release branch" \ svn copy -m "Creating release candidate $rc from release_$tag_release branch" \
$base_url/$proj/branches/release_$release \ $base_url/$proj/branches/release_$branch_release \
$base_url/$proj/tags/RELEASE_$release/$rc $base_url/$proj/tags/RELEASE_$tag_release/$rc
fi fi
done done
set +x set +x
@ -99,7 +99,8 @@ if [ "x$release" = "x" ]; then
exit 1 exit 1
fi fi
release=`echo $release | sed -e 's,\.,,g'` branch_release=`echo $release | sed -e 's,\([0-9]*\.[0-9]*\).*,\1,' | sed -e 's,\.,,g'`
tag_release=`echo $release | sed -e 's,\.,,g'`
if [ "x$rc" = "x" ]; then if [ "x$rc" = "x" ]; then
tag_version tag_version