function tag_version() {
set -x
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
continue
fi
- svn remove -m "Removing old release_$release branch for rebranching." \
- $base_url/$proj/branches/release_$release
+ svn remove -m "Removing old release_$branch_release branch for rebranching." \
+ $base_url/$proj/branches/release_$branch_release
fi
- svn copy -m "Creating release_$release branch" \
+ svn copy -m "Creating release_$branch_release branch" \
$base_url/$proj/trunk \
- $base_url/$proj/branches/release_$release
+ $base_url/$proj/branches/release_$branch_release
done
set +x
}
function tag_release_candidate() {
set -x
for proj in $projects ; do
- if ! svn ls $base_url/$proj/tags/RELEASE_$release > /dev/null 2>&1 ; then
- svn mkdir -m "Creating release directory for release_$release." $base_url/$proj/tags/RELEASE_$release
+ if ! svn ls $base_url/$proj/tags/RELEASE_$tag_release > /dev/null 2>&1 ; then
+ svn mkdir -m "Creating release directory for release_$tag_release." $base_url/$proj/tags/RELEASE_$tag_release
fi
- if ! svn ls $base_url/$proj/tags/RELEASE_$release/$rc > /dev/null 2>&1 ; then
- svn copy -m "Creating release candidate $rc from release_$release branch" \
- $base_url/$proj/branches/release_$release \
- $base_url/$proj/tags/RELEASE_$release/$rc
+ 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_$tag_release branch" \
+ $base_url/$proj/branches/release_$branch_release \
+ $base_url/$proj/tags/RELEASE_$tag_release/$rc
fi
done
set +x
exit 1
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
tag_version