From 196c5bfc8fb06642eda30ab2dc4a410bc9d7a8f6 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sun, 9 Feb 2014 16:38:31 +0200 Subject: [PATCH] [PATCH v5] build: write version.stamp file containing $(VERSION) string --- 59/7743c1d2b2fa0890a221d873f76bab7dbe9c5e | 110 ++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 59/7743c1d2b2fa0890a221d873f76bab7dbe9c5e diff --git a/59/7743c1d2b2fa0890a221d873f76bab7dbe9c5e b/59/7743c1d2b2fa0890a221d873f76bab7dbe9c5e new file mode 100644 index 000000000..1a154f248 --- /dev/null +++ b/59/7743c1d2b2fa0890a221d873f76bab7dbe9c5e @@ -0,0 +1,110 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 8D486431FBD + for ; Sun, 9 Feb 2014 06:38:46 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 4L36vr-I1bLF for ; + Sun, 9 Feb 2014 06:38:41 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 9B967431FAF + for ; Sun, 9 Feb 2014 06:38:41 -0800 (PST) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 0146E1000F3; Sun, 9 Feb 2014 16:38:32 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH v5] build: write version.stamp file containing $(VERSION) + string +Date: Sun, 9 Feb 2014 16:38:31 +0200 +Message-Id: <1391956711-21231-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +In-Reply-To: +References: +Cc: tomi.ollila@iki.fi +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 09 Feb 2014 14:38:46 -0000 + +This version file will be as prerequisite to the target files +that use the version info for some purpose, like printing +it for the user to examine. The contents of the version.stamp +file is seldom read by the build system itself as the $(VERSION) +variable has the same information. + +Thanks to Trevor, David and Mark for their contributions. +--- + Makefile.local | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/Makefile.local b/Makefile.local +index 174506c..2cdd281 100644 +--- a/Makefile.local ++++ b/Makefile.local +@@ -18,10 +18,16 @@ else + DATE:=$(shell date +%F) + endif + ++VERSTAMP=version.stamp + 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/-/~/) ++# Write the file 'version.stamp' in case its contents differ from $(VERSION) ++FILE_VERSION:=$(shell test -f $(VERSTAMP) && read vs < $(VERSTAMP) || vs=; echo $$vs) ++ifneq ($(FILE_VERSION),$(VERSION)) ++ $(shell echo "$(VERSION)" > $(VERSTAMP)) ++endif + endif + endif + +@@ -69,6 +75,11 @@ ifeq ($(shell cat .first-build-message 2>/dev/null),) + endif + endif + ++# Depend (also) on the file 'version'. In case of ifeq ($(IS_GIT),yes) ++# this file may already have been updated. ++$(VERSTAMP): 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: $(VERSTAMP) ++ + 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) notmuch notmuch-shared $(notmuch_client_modules) $(VERSTAMP) + + DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config + +-- +1.8.4.2 + -- 2.26.2