debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: check .git directory existence in srcdir (for out-of-tree builds)

Browse source 
So that $(VERSION) and version.stamp uses the git-describe -based
version data instead of the content of `version' file.

For consistency also the git commands in Makefile[.local] target
`verify-no-dirty-code' uses the git --git-dir=$srcdir/.git ...
commands (inside ifeq($(IS_GIT),yes)). Attempting to make this
target outside of the tree will fail in any case.
This commit is contained in:
Tomi Ollila 2014-05-06 22:35:28 +03:00 committed by David Bremner
parent 934e333a08
commit 6721222ea8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.local
View file

@ -10,10 +10,10 @@
# repository), we let git append identification of the actual commit. # repository), we let git append identification of the actual commit.
PACKAGE=notmuch PACKAGE=notmuch
IS_GIT=$(shell if [ -d .git ] ; then echo yes ; else echo no; fi) IS_GIT=$(shell if [ -d ${srcdir}/.git ] ; then echo yes ; else echo no; fi)
ifeq ($(IS_GIT),yes) ifeq ($(IS_GIT),yes)
DATE:=$(shell git log --date=short -1 --pretty=format:%cd) DATE:=$(shell git --git-dir=${srcdir}/.git log --date=short -1 --pretty=format:%cd)
else else
DATE:=$(shell date +%F) DATE:=$(shell date +%F)
endif endif
@ -21,7 +21,7 @@ endif
VERSION:=$(shell cat ${srcdir}/version) VERSION:=$(shell cat ${srcdir}/version)
ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),) ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
ifeq ($(IS_GIT),yes) ifeq ($(IS_GIT),yes)
VERSION:=$(shell git describe --abbrev=7 --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/) VERSION:=$(shell git --git-dir=${srcdir}/.git describe --abbrev=7 --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
# Write the file 'version.stamp' in case its contents differ from $(VERSION) # Write the file 'version.stamp' in case its contents differ from $(VERSION)
FILE_VERSION:=$(shell test -f version.stamp && read vs < version.stamp || vs=; echo $$vs) FILE_VERSION:=$(shell test -f version.stamp && read vs < version.stamp || vs=; echo $$vs)
ifneq ($(FILE_VERSION),$(VERSION)) ifneq ($(FILE_VERSION),$(VERSION))
@ -201,11 +201,11 @@ verify-source-tree-and-version: verify-no-dirty-code
verify-no-dirty-code: release-checks verify-no-dirty-code: release-checks
ifeq ($(IS_GIT),yes) ifeq ($(IS_GIT),yes)
@printf "Checking that source tree is clean..." @printf "Checking that source tree is clean..."
ifneq ($(shell git ls-files -m),) ifneq ($(shell git --git-dir=${srcdir}/.git ls-files -m),)
@echo "No" @echo "No"
@echo "The following files have been modified since the most recent git commit:" @echo "The following files have been modified since the most recent git commit:"
@echo "" @echo ""
@git ls-files -m @git --git-dir=${srcdir}/.git ls-files -m
@echo "" @echo ""
@echo "The release will be made from the committed state, but perhaps you meant" @echo "The release will be made from the committed state, but perhaps you meant"
@echo "to commit this code first? Please clean this up to make it more clear." @echo "to commit this code first? Please clean this up to make it more clear."