mirror of
https://github.com/kdave/btrfs-progs
synced 2024-12-28 09:02:19 +00:00
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:
parent
444b88391e
commit
2e1932e6a3
2
Makefile
2
Makefile
@ -337,7 +337,7 @@ test: test-fsck test-mkfs test-convert test-misc test-fuzz test-cli
|
||||
#
|
||||
static: $(progs_static)
|
||||
|
||||
version.h: version.sh version.h.in configure.ac
|
||||
version.h: version.h.in configure.ac
|
||||
@echo " [SH] $@"
|
||||
$(Q)bash ./config.status --silent $@
|
||||
|
||||
|
@ -61,7 +61,6 @@ echo " autoconf: $(autoconf --version | head -1)"
|
||||
echo " autoheader: $(autoheader --version | head -1)"
|
||||
echo " automake: $(automake --version | head -1)"
|
||||
|
||||
chmod +x version.sh
|
||||
rm -rf autom4te.cache
|
||||
|
||||
aclocal -I m4 $AL_OPTS &&
|
||||
|
@ -1,5 +1,5 @@
|
||||
AC_INIT([btrfs-progs],
|
||||
m4_esyscmd([./version.sh --configure]),
|
||||
m4_chomp(m4_include([VERSION])),
|
||||
[linux-btrfs@vger.kernel.org],,
|
||||
[http://btrfs.wiki.kernel.org])
|
||||
|
||||
|
37
version.sh
37
version.sh
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user