|
|
|
@ -134,13 +134,14 @@ tag=`git tag | \
|
|
|
|
|
|
|
|
|
|
count=`git log $tag --pretty=oneline | wc -l`
|
|
|
|
|
|
|
|
|
|
pkgver=$TARGET
|
|
|
|
|
if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then
|
|
|
|
|
pkgver=$pkgver~pre$count+$(git rev-parse HEAD | cut -c 1-8)
|
|
|
|
|
fi
|
|
|
|
|
if [ "$SUFFIX" = "true" ]; then
|
|
|
|
|
package=$(basename $PWD)-trinity-$TARGET
|
|
|
|
|
package=$(basename $PWD)-trinity-$pkgver
|
|
|
|
|
else
|
|
|
|
|
package=trinity-$(basename $PWD)-$TARGET
|
|
|
|
|
fi
|
|
|
|
|
if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then
|
|
|
|
|
package=$package~pre$count+$(git rev-parse HEAD | cut -c 1-8)
|
|
|
|
|
package=trinity-$(basename $PWD)-$pkgver
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Create tarball
|
|
|
|
@ -149,6 +150,7 @@ if [ ! -e $TARBALL_DIR/$package.tar$TAR_SUFFIX ]; then
|
|
|
|
|
echo "Creating tarball in $TARBALL_DIR."
|
|
|
|
|
echo "# TDE SCM module information" > .tdescminfo
|
|
|
|
|
echo "Name: $MODULE" >> .tdescminfo
|
|
|
|
|
echo "Version: R$pkgver" >> .tdescminfo
|
|
|
|
|
echo "Revision: $branch-$(git rev-parse HEAD)" >> .tdescminfo
|
|
|
|
|
date +"DateTime: %m/%d/%Y %H:%M" -u -d "@$(git log -1 --pretty=format:"%ct")" >> .tdescminfo
|
|
|
|
|
trap "rm $TARBALL_DIR/tar-$$; rm .tdescminfo; exit 1" INT
|
|
|
|
|