btrfs-progs: build: simplify version tracking

There will be a plain file tracking the last released version.

The rest will be simplified to print it where needed. The version
augmented by the current git status was not working anyway since we've
switched to autoconf. The result of version.h with the potential git
status was generated at configure time, which does not mean it's
accurate regarding the git status.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2018-01-23 14:38:30 +01:00
parent 444b88391e
commit 2e1932e6a3
5 changed files with 3 additions and 40 deletions

View File

@ -337,7 +337,7 @@ test: test-fsck test-mkfs test-convert test-misc test-fuzz test-cli
# #
static: $(progs_static) static: $(progs_static)
version.h: version.sh version.h.in configure.ac version.h: version.h.in configure.ac
@echo " [SH] $@" @echo " [SH] $@"
$(Q)bash ./config.status --silent $@ $(Q)bash ./config.status --silent $@

1
VERSION Normal file
View File

@ -0,0 +1 @@
v4.14.1

View File

@ -61,7 +61,6 @@ echo " autoconf: $(autoconf --version | head -1)"
echo " autoheader: $(autoheader --version | head -1)" echo " autoheader: $(autoheader --version | head -1)"
echo " automake: $(automake --version | head -1)" echo " automake: $(automake --version | head -1)"
chmod +x version.sh
rm -rf autom4te.cache rm -rf autom4te.cache
aclocal -I m4 $AL_OPTS && aclocal -I m4 $AL_OPTS &&

View File

@ -1,5 +1,5 @@
AC_INIT([btrfs-progs], AC_INIT([btrfs-progs],
m4_esyscmd([./version.sh --configure]), m4_chomp(m4_include([VERSION])),
[linux-btrfs@vger.kernel.org],, [linux-btrfs@vger.kernel.org],,
[http://btrfs.wiki.kernel.org]) [http://btrfs.wiki.kernel.org])

View File

@ -1,37 +0,0 @@
#!/bin/bash
#
# determine-version -- report a useful version for releases
#
# Copyright 2008, Aron Griffis <agriffis@n01se.net>
# Copyright 2008, Oracle
# Released under the GNU GPLv2
v="v4.14.1"
opt=$1
which git &> /dev/null
if [ $? == 0 -a -d .git ]; then
if head=`git rev-parse --verify HEAD 2>/dev/null`; then
if tag=`git describe --tags 2>/dev/null`; then
v="$tag"
fi
# Are there uncommitted changes?
git update-index --refresh --unmerged > /dev/null
if git diff-index --name-only HEAD | grep -v "^scripts/package" \
| read dummy; then
v="$v"-dirty
fi
fi
fi
if [ "$opt" = "--configure" ]; then
# Omit the trailing newline, so that m4_esyscmd can use the result directly.
echo -n "$v"
else
echo "$v"
fi
exit 0