From 7cac51f620e1df9d8413efa15d7825a8f010b8ea Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Sun, 22 Mar 2009 14:18:18 +0100 Subject: [PATCH] gemspec: patchlevel = number of commits since tag --- rbot.gemspec | 5 ++++- tag-release | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rbot.gemspec b/rbot.gemspec index 6369b595..fd8e4553 100644 --- a/rbot.gemspec +++ b/rbot.gemspec @@ -1,6 +1,9 @@ Gem::Specification.new do |s| s.name = 'rbot' - s.version = '0.9.14' + version = '0.9.14' + patchlevel = `git describe | cut -f3 -d-`.to_i + version << ".#{patchlevel}" if patchlevel > 0 + s.version = version s.summary = <<-EOF A modular ruby IRC bot. EOF diff --git a/tag-release b/tag-release index ba1b8022..ce9eb633 100755 --- a/tag-release +++ b/tag-release @@ -18,12 +18,11 @@ echo "Version: $VERSION" sed -i -e "/^\$version =/ c \$version = '$FULLVERSION'" launch_here.rb sed -i -e "/^\$version ||=/ c \$version ||= '$FULLVERSION'" bin/rbot -sed -i -e "/^ s.version =/ c \ s.version = '$VERSION'" rbot.gemspec +sed -i -e "/^ version =/ c \ version = '$VERSION'" rbot.gemspec NOGIT=${FULLVERSION/-git/} if [ $NOGIT == $FULLVERSION ]; then # Not a git version - rake package || abort "Failed to build package!" git commit -m "Version $FULLVERSION" -a || abort "Failed to commit release!" git tag -a -m "rbot $FULLVERSION" rbot-$FULLVERSION || abort "Failed to tag release!" if [ $VERSION != $FULLVERSION ]; then @@ -33,6 +32,7 @@ if [ $NOGIT == $FULLVERSION ]; then mv rbot-$VERSION.zip rbot-$FULLVERSION.zip popd fi + rake package || abort "Failed to build package!" else # git version git commit -m "Start working on $NOGIT" -a -- 2.32.0.93.g670b81a890