diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-05-25 12:00:59 +1000 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-06-20 23:38:09 +0200 |
| commit | cd7f401744e1fa65d309c7c9b8e68eb7c6faf2bc (patch) | |
| tree | 6af0b26d869f9f94baf78f31b69ed545a461f3fb | |
| parent | 0a4fc92c77c0386d69f910e7e9fb8b3ac8a29521 (diff) | |
| download | samba-cd7f401744e1fa65d309c7c9b8e68eb7c6faf2bc.tar.gz samba-cd7f401744e1fa65d309c7c9b8e68eb7c6faf2bc.tar.xz samba-cd7f401744e1fa65d309c7c9b8e68eb7c6faf2bc.zip | |
ctdb-mkversion: Support external VERSION specification
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rwxr-xr-x | ctdb/packaging/mkversion.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ctdb/packaging/mkversion.sh b/ctdb/packaging/mkversion.sh index bc50165f98..e4a37adb65 100755 --- a/ctdb/packaging/mkversion.sh +++ b/ctdb/packaging/mkversion.sh @@ -28,12 +28,17 @@ if [ -z "$OUTPUT" ]; then OUTPUT="include/ctdb_version.h" fi +VERSION=$2 +RELEASE=1 + # We use tags and determine the version, as follows: # ctdb-0.9.1 (First release of 0.9). # ctdb-0.9.23 (23rd minor release of the 112 version) # # If we're not directly on a tag, this is a devel release; we append # .0.<patchnum>.<checksum>.devel to the release. +if [ -z "$VERSION" ]; then + TAG=`git describe --match "samba-*"` case "$TAG" in samba-*) @@ -56,6 +61,8 @@ case "$TAG" in ;; esac +fi + cat > "$OUTPUT" <<EOF /* This file is auto-genrated by packaging/mkversion.sh */ |