Improve release script version tag management commands.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2787 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
eccd9059d3
commit
1beb24a61c
|
@ -282,9 +282,10 @@ do_version_usage() {
|
||||||
usage: $0 version <command>
|
usage: $0 version <command>
|
||||||
Version Commands:
|
Version Commands:
|
||||||
tag {add|remove} <label> Add or remove the specified tag.
|
tag {add|remove} <label> Add or remove the specified tag.
|
||||||
bump {major|minor|micro|rc} Bump the specified version number;
|
bump {major|minor|micro} Bump the specified version number, and
|
||||||
resets less-significant numbers to zero.
|
reset less-significant numbers to zero.
|
||||||
All but 'rc' releases drop that tag.
|
bump tag <label> Add or bump a versioned tag (e.g. -rcN).
|
||||||
|
bump final <label> Remove a versioned tag (e.g. -rcN).
|
||||||
USAGE
|
USAGE
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -319,7 +320,7 @@ do_version_bump_tag() {
|
||||||
[ "${TAG}" ] || die "TAG argument is missing"
|
[ "${TAG}" ] || die "TAG argument is missing"
|
||||||
local TAGS="${PACKAGE_VERSION_TAGS}"
|
local TAGS="${PACKAGE_VERSION_TAGS}"
|
||||||
if has_version_tag "${TAG}"; then
|
if has_version_tag "${TAG}"; then
|
||||||
local RC=$(echo ${TAGS} | perl -ne "/-${TAG}"'(\d+)/ && print $1')
|
local RC=$(do_version_tag_value "${TAG}")
|
||||||
RC=$((${RC} + 1))
|
RC=$((${RC} + 1))
|
||||||
TAGS=$(echo ${TAGS} | perl -npe "s/-${TAG}[\\d]*/-${TAG}${RC}/")
|
TAGS=$(echo ${TAGS} | perl -npe "s/-${TAG}[\\d]*/-${TAG}${RC}/")
|
||||||
else
|
else
|
||||||
|
@ -328,12 +329,17 @@ do_version_bump_tag() {
|
||||||
PACKAGE_VERSION_TAGS="${TAGS}"
|
PACKAGE_VERSION_TAGS="${TAGS}"
|
||||||
do_version_bump_sed "${PACKAGE_VERSION_BASE}"
|
do_version_bump_sed "${PACKAGE_VERSION_BASE}"
|
||||||
}
|
}
|
||||||
do_version_bump_rc() { do_version_bump_tag 'rc'; }
|
do_version_bump_final() {
|
||||||
|
local TAG="$1"
|
||||||
|
[ "${TAG}" ] || die "TAG argument is missing"
|
||||||
|
has_version_tag "${TAG}" || die "-${TAG} tag is missing"
|
||||||
|
do_version_tag_remove "${TAG}$(do_version_tag_value "${TAG}")"
|
||||||
|
}
|
||||||
do_version_bump() {
|
do_version_bump() {
|
||||||
CMD="$1"
|
CMD="$1"
|
||||||
shift
|
shift
|
||||||
case "${CMD}" in
|
case "${CMD}" in
|
||||||
major|minor|micro|rc|tag)
|
major|minor|micro|final|tag)
|
||||||
eval "do_version_bump_${CMD}" "$@"
|
eval "do_version_bump_${CMD}" "$@"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
@ -345,7 +351,10 @@ do_version_bump() {
|
||||||
has_version_tag() {
|
has_version_tag() {
|
||||||
test "${PACKAGE_VERSION/-${1}/}" != "${PACKAGE_VERSION}"
|
test "${PACKAGE_VERSION/-${1}/}" != "${PACKAGE_VERSION}"
|
||||||
}
|
}
|
||||||
|
do_version_tag_value() {
|
||||||
|
local TAG="$1"
|
||||||
|
echo ${PACKAGE_VERSION_TAGS} | perl -ne "/-${TAG}"'(\d+)/ && print $1'
|
||||||
|
}
|
||||||
do_version_tag_add() {
|
do_version_tag_add() {
|
||||||
local TAG="$1"
|
local TAG="$1"
|
||||||
has_version_tag "${TAG}" && \
|
has_version_tag "${TAG}" && \
|
||||||
|
|
Loading…
Reference in New Issue