undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For release tarballs, include the proper version

Browse Source 
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>
This commit is contained in:
H. Peter Anvin 2006-01-09 18:07:01 -08:00 committed by Junio C Hamano
parent 5a2282de13
commit 181129d24c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GIT-VERSION-GEN
View File

@ -1,9 +1,15 @@
#!/bin/sh #!/bin/sh
GVF=GIT-VERSION-FILE GVF=GIT-VERSION-FILE
DEF_VER=v1.1.GIT
VN=$(git-describe --abbrev=4 HEAD 2>/dev/null) || VN=v1.0.GIT # First try git-describe, then see if there is a version file
VN=$(expr "$VN" : v'\(.*\)') # (included in release tarballs), then default
VN=$(git-describe --abbrev=4 HEAD 2>/dev/null) ||
VN=$(cat version) ||
VN="$DEF_VER"
VN=$(expr "$VN" : v*'\(.*\)')
if test -r $GVF if test -r $GVF
then then
VC=$(sed -e 's/^GIT_VERSION = //' <$GVF) VC=$(sed -e 's/^GIT_VERSION = //' <$GVF)

4
Makefile
View File

@ -489,7 +489,9 @@ dist: git.spec git-tar-tree
./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar ./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar
@mkdir -p $(GIT_TARNAME) @mkdir -p $(GIT_TARNAME)
@cp git.spec $(GIT_TARNAME) @cp git.spec $(GIT_TARNAME)
$(TAR) rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git.spec @echo $(GIT_VERSION) > $(GIT_TARNAME)/version
$(TAR) rf $(GIT_TARNAME).tar \
$(GIT_TARNAME)/git.spec $(GIT_TARNAME)/version
@rm -rf $(GIT_TARNAME) @rm -rf $(GIT_TARNAME)
gzip -f -9 $(GIT_TARNAME).tar gzip -f -9 $(GIT_TARNAME).tar