bip-release script can now handle an optional release name

This release name is used in the git tag. The previous 'release'
variable was renamed in 'release_version' to avoid confusion.
This commit is contained in:
Marc Dequènes (Duck) 2013-10-19 14:57:15 +02:00
parent ca4dd55e71
commit c34b030e21
1 changed files with 15 additions and 10 deletions

View File

@ -7,13 +7,14 @@ if [ ! -d src ] ; then
exit 1
fi
release="$1"
release_version="$1"
release_name="$2"
: ${MAKEOPTS:=-j -l4}
set_version() {
local release
release="${1}"
sed -i -e '/^AC_INIT/s/\(, \[\)[^]]*/\1'${release}'/' configure.ac
local release_version
release_version="${1}"
sed -i -e '/^AC_INIT/s/\(, \[\)[^]]*/\1'${release_version}'/' configure.ac
}
get_version() {
@ -35,17 +36,21 @@ make_distcheck() {
}
git log > ChangeLog
if [ -n "$release" ]; then
set_version "${release}"
if [ -n "$release_version" ]; then
set_version "${release_version}"
make_distcheck || exit 1
git commit -a -m "Update version and ChangeLog for bip-${release} release."
git tag -s release-$release
git commit -a -m "Update version and ChangeLog for bip-${release_version} release."
TAG_COMMENT="Release ${release_version}"
if [ -n "${release_name}" ]; then
TAG_COMMENT="${TAG_COMMENT} '${release_name}'"
fi
git tag -s -m "${TAG_COMMENT}" release-${release_version}
set_version "${release}-git"
set_version "${release_version}-git"
git commit -a -m "Add -git to version string."
echo "See bip-${release}.tar.gz"
echo "See bip-${release_version}.tar.gz"
else
make_distcheck || exit 1