Skip to content

Commit

Permalink
Move fall-back version string to Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
jonas committed Apr 29, 2012
1 parent e6cf79e commit 965f9cb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -20,7 +20,7 @@ GITDESC = $(subst tig-,,$(shell git describe))
WTDIRTY = $(if $(shell git diff-index HEAD 2>/dev/null),-dirty)
VERSION = $(GITDESC)$(WTDIRTY)
else
VERSION = $(shell test -f VERSION && cat VERSION || echo "unknown-version")
VERSION = 0.18
endif
ifdef DIST_VERSION
VERSION = $(DIST_VERSION)
Expand Down
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

3 changes: 2 additions & 1 deletion contrib/release.sh
Expand Up @@ -3,7 +3,7 @@
# Script for preparing a release or updating the release branch.
# Usage: $0 version
#
# Copyright (c) 2009-2010 Jonas Fonseca <fonseca@diku.dk>
# Copyright (c) 2009-2012 Jonas Fonseca <fonseca@diku.dk>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
Expand Down Expand Up @@ -34,6 +34,7 @@ if test -n "$VERSION"; then

# Update files which should reference the version.
echo "$VERSION" > VERSION
sed -i "s/VERSION\s=\s[0-9]\+[.][0-9]\+/VERSION = $VERSION/" Makefile
perl -pi -e 's/^tig master.*/@@TITLE@@/ms' NEWS
perl -pi -e "s/^@@TITLE@@.*/$TITLE/" NEWS

Expand Down

0 comments on commit 965f9cb

Please sign in to comment.