The branch, master has been updated
via 4804013 script/librelease.sh: keep dots in the release tag
via 84d9cdb release-scripts/create-tarball: always create a tag in form
of samba-${version}
from 76467dc s3:build: add vfs_examples to the everything target
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4804013210ba620a6d20fd813017ac383cc3b946
Author: Stefan Metzmacher <[email protected]>
Date: Tue Jun 28 12:55:47 2011 +0200
script/librelease.sh: keep dots in the release tag
metze
Autobuild-User: Stefan Metzmacher <[email protected]>
Autobuild-Date: Thu Jun 30 18:52:06 CEST 2011 on sn-devel-104
commit 84d9cdb5112e55ae8a1e525ca2b8cef2ae606f22
Author: Stefan Metzmacher <[email protected]>
Date: Tue Jun 28 12:52:37 2011 +0200
release-scripts/create-tarball: always create a tag in form of
samba-${version}
metze
-----------------------------------------------------------------------
Summary of changes:
release-scripts/create-tarball | 26 ++++++--------------------
script/librelease.sh | 2 +-
2 files changed, 7 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 213e35e..e6a515f 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -3,7 +3,6 @@
## option defaults
OPT_BRANCH=""
OPT_DOCSDIR=""
-OPT_TAG=""
OPT_KEYID=""
TOPDIR="`dirname $0`/.."
@@ -32,7 +31,6 @@ function printUsage
echo " --help Print command usage"
echo " --branch <name> Specify the branch to to create the archive
file from"
echo " --copy-docs <dir> Copy documentation from <dir> rather than
building"
- echo " --tag <name> Tag name for release"
echo " --keyid <email> The GnuPG key ID used to sign the release tag"
echo ""
}
@@ -67,15 +65,6 @@ function parseOptions
OPT_DOCSDIR="$1"
shift
;;
- --tag)
- shift
- if [ -z "$1" ]; then
- printUsage
- return 1
- fi
- OPT_TAG="$1"
- shift
- ;;
--keyid)
shift
if [ -z "$1" ]; then
@@ -145,13 +134,10 @@ function buildDocs
##
function createReleaseTag
{
- if [ -z "${OPT_TAG}" ]; then
- echo "Tagging disabled"
- return 0
- fi
+ tagname="$1"
- if [ "x`git tag -l ${OPT_TAG}`" != "x" ]; then
- echo -n "Tag exists. Do you wish to overwrite? (y/N): "
+ if [ "x`git tag -l ${tagname}`" != "x" ]; then
+ echo -n "Tag '${tagname}' exists. Do you wish to overwrite? (y/N): "
read answer
if [ "x$answer" != "xy" ]; then
@@ -168,8 +154,8 @@ function createReleaseTag
fi
fi
- git tag -u ${OPT_KEYID} ${OPT_TAG}
- exitOnError $? "Failed to create tag"
+ git tag -u ${OPT_KEYID} ${tagname}
+ exitOnError $? "Failed to create tag '${tagname}'"
return 0
}
@@ -239,7 +225,7 @@ function main
popd
- createReleaseTag
+ createReleaseTag "samba-${version}"
exitOnError $? "Failed to create release tag"
return 0
diff --git a/script/librelease.sh b/script/librelease.sh
index 7fbca88..6125236 100755
--- a/script/librelease.sh
+++ b/script/librelease.sh
@@ -39,7 +39,7 @@ release_lib() {
exit 1
}
- tagname=$(basename $tarname .tar | sed s/[\.]/-/g)
+ tagname=$(basename $tarname .tar)
echo "tagging as $tagname"
git tag -u $GPG_KEYID -s "$tagname" -m "$lib: tag release $tagname" || {
exit 1
--
Samba Shared Repository
