From: Tomi Ollila <tomi.ollila@iki.fi>
To: notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: [PATCH v4] build: write VERSION file containing $(VERSION) string
Date: Thu, 6 Feb 2014 00:58:33 +0200 [thread overview]
Message-ID: <1391641113-4669-1-git-send-email-tomi.ollila@iki.fi> (raw)
In-Reply-To: <m261p4mkal.fsf@guru.guru-group.fi>
This version file will be as prerequisite to the target files
that use the version info for some purpose, like printing
it to the user to examine. The contents of the VERSION file
is seldom read by the build system itself as the $(VERSION)
variable has the same information.
---
ctested also with:
mv .git .x
make
cat VERSION version
mv .x .git
make
cat VERSION version
Makefile.local | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/Makefile.local b/Makefile.local
index 174506c..65c91cb 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -21,7 +21,13 @@ endif
VERSION:=$(shell cat ${srcdir}/version)
ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
ifeq ($(IS_GIT),yes)
-VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
+# Also write VERSION file in case its contents differ from $(VERSION)
+VERSION:=$(shell\
+ gv=`git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/`;\
+ test -f VERSION || touch VERSION;\
+ read fv < VERSION;\
+ test x"$$fv" = x"$$gv" || echo "$$gv" > VERSION;\
+ echo "$$gv")
endif
endif
@@ -69,6 +75,11 @@ ifeq ($(shell cat .first-build-message 2>/dev/null),)
endif
endif
+# Depend (also) on 'version' file. In case of ifeq ($(IS_GIT),yes)
+# this file may already have been updated.
+VERSION: version
+ echo $(VERSION) > $@
+
$(TAR_FILE):
if git tag -v $(VERSION) >/dev/null 2>&1; then \
ref=$(VERSION); \
@@ -280,6 +291,8 @@ notmuch_client_srcs = \
notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
+notmuch.o: VERSION
+
notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libutil.a parse-time-string/libparse-time-string.a
$(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
@@ -318,7 +331,7 @@ install-desktop:
desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" notmuch.desktop
SRCS := $(SRCS) $(notmuch_client_srcs)
-CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc
+CLEAN := $(CLEAN) VERSION notmuch notmuch-shared $(notmuch_client_modules)
DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config
--
1.8.4.2
next prev parent reply other threads:[~2014-02-05 22:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-25 22:43 [PATCH 1/1] build: write VERSION file containing $(VERSION) string Tomi Ollila
2014-01-26 19:55 ` Mark Walters
2014-01-27 21:43 ` [PATCH v2] " Tomi Ollila
2014-01-27 21:48 ` [PATCH v3] " Tomi Ollila
2014-01-28 1:56 ` David Bremner
2014-01-28 11:13 ` Tomi Ollila
2014-02-05 22:58 ` Tomi Ollila [this message]
2014-02-08 23:56 ` [PATCH v4] " W. Trevor King
2014-02-09 8:26 ` Tomi Ollila
2014-02-09 14:38 ` [PATCH v5] build: write version.stamp " Tomi Ollila
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1391641113-4669-1-git-send-email-tomi.ollila@iki.fi \
--to=tomi.ollila@iki.fi \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).