mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-14 13:13:01 +01:00
Code Activity
git/GIT-VERSION-GEN

48 lines
761 B
Text
Raw Normal View History

Makefile: use git-describe to mark the git version. Note: with this commit, the GIT maintainer workflow must change. GIT-VERSION-GEN is now the file to munge when the default version needs to be changed, not Makefile. The tag needs to be pushed into the repository to build the official tarball and binary package beforehand. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27 23:40:17 +01:00
#!/bin/sh
GVF=GIT-VERSION-FILE
GIT 1.5.4-rc5 Hopefully the last rc before the final... Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-01-27 03:39:41 +01:00
DEF_VER=v1.5.4-rc5.GIT
Makefile: use git-describe to mark the git version. Note: with this commit, the GIT maintainer workflow must change. GIT-VERSION-GEN is now the file to munge when the default version needs to be changed, not Makefile. The tag needs to be pushed into the repository to build the official tarball and binary package beforehand. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27 23:40:17 +01:00
GIT-VERSION-GEN: adjust for ancient git When an ancient "git" that does not understand "describe" command is on the $PATH, "git describe" emitted a Usage message without exiting non-zero status (which is a mistake we cannot fix retroactively). Catch this case to make sure we do not try using phoney multi-line string as a version number. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-08 22:11:16 +02:00
LF='
'
GIT-VERSION-FILE: check ./version first. When somebody else extracts git tarball inside a larger project, 'git describe' would reported the version number of that upper level project. Sometimes, using the consistent versioning across subdirectories of a larger project is useful, but it may not always be the right thing to do. This changes the script to check ./vertion file first, and then fall back to "git describe". This way, by default, tarball distribution will get our own version. If the upper level wants to use consistent versioning across its subdirectories, its Makefile can overwrite ./version file to force whatever version number they want to give us before descending into us. Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-14 20:33:04 +01:00
# First see if there is a version file (included in release tarballs),
# then try git-describe, then default.
if test -f version
GIT-VERSION-GEN: squelch unneeded error from "cat version" Now this is really a corner case, but if you have the git source tree from somewhere other than the official tarball, you do not have version file. And if git-describe does not work for you (maybe you do not have git yet), we spilled an error message from "cat version". Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-02 23:38:44 +01:00
then
Make GIT-VERSION-GEN tolerate missing git describe command again Commit 5c7d3c95 broke that by making the git-describe command part of a pipe. Signed-off-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-26 17:39:27 +01:00
VN=$(cat version) || VN="$DEF_VER"
GIT-VERSION-FILE: check ./version first. When somebody else extracts git tarball inside a larger project, 'git describe' would reported the version number of that upper level project. Sometimes, using the consistent versioning across subdirectories of a larger project is useful, but it may not always be the right thing to do. This changes the script to check ./vertion file first, and then fall back to "git describe". This way, by default, tarball distribution will get our own version. If the upper level wants to use consistent versioning across its subdirectories, its Makefile can overwrite ./version file to force whatever version number they want to give us before descending into us. Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-14 20:33:04 +01:00
elif test -d .git &&
VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
case "$VN" in
*$LF*) (exit 1) ;;
v[0-9]*) : happy ;;
esac
then
VN=$(echo "$VN" | sed -e 's/-/./g');
GIT-VERSION-GEN: squelch unneeded error from "cat version" Now this is really a corner case, but if you have the git source tree from somewhere other than the official tarball, you do not have version file. And if git-describe does not work for you (maybe you do not have git yet), we spilled an error message from "cat version". Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-02 23:38:44 +01:00
else
VN="$DEF_VER"
Make GIT-VERSION-GEN tolerate missing git describe command again Commit 5c7d3c95 broke that by making the git-describe command part of a pipe. Signed-off-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-26 17:39:27 +01:00
fi
For release tarballs, include the proper version When producing a release tarball, include a "version" file, which GIT-VERSION-GEN can then use to do the right thing when building from a tarball. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-10 03:07:01 +01:00
VN=$(expr "$VN" : v*'\(.*\)')
GIT-VERSION-GEN: detect dirty tree and mark the version accordingly. If we are building from a working tree with local modifications, mark the version accordingly. Deliberately uses '-' to prevent RPM from being built from such a tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-09 23:25:10 +01:00
Change GIT-VERSION-GEN to call git commands with "git" not "git-". GIT-VERSION-GEN can incorrectly return a default version of "v1.3.GIT" because it tries to execute git commands using the "git-cmd" format that expects all git commands to be in the $PATH. Convert these to "git cmd" format so that a proper answer is returned even when the git commands have been moved out of the $PATH and into a $gitexecdir. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-22 06:39:52 +02:00
dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty=
GIT-VERSION-GEN: detect dirty tree and mark the version accordingly. If we are building from a working tree with local modifications, mark the version accordingly. Deliberately uses '-' to prevent RPM from being built from such a tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-09 23:25:10 +01:00
case "$dirty" in
'')
;;
*)
VN="$VN-dirty" ;;
esac
Makefile: use git-describe to mark the git version. Note: with this commit, the GIT maintainer workflow must change. GIT-VERSION-GEN is now the file to munge when the default version needs to be changed, not Makefile. The tag needs to be pushed into the repository to build the official tarball and binary package beforehand. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27 23:40:17 +01:00
if test -r $GVF
then
VC=$(sed -e 's/^GIT_VERSION = //' <$GVF)
else
VC=unset
fi
test "$VN" = "$VC" || {
echo >&2 "GIT_VERSION = $VN"
echo "GIT_VERSION = $VN" >$GVF
}
Copy permalink