From 6156c1de02e239d416f1e62c4908c1904d829456 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sat, 22 Feb 2014 01:20:35 +0200 Subject: [PATCH] [PATCH 1/3] build: write version.stamp file containing $(VERSION) string --- 18/d004d9c027f3cf2a2cbe870905fd092bf7c9d3 | 124 ++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 18/d004d9c027f3cf2a2cbe870905fd092bf7c9d3 diff --git a/18/d004d9c027f3cf2a2cbe870905fd092bf7c9d3 b/18/d004d9c027f3cf2a2cbe870905fd092bf7c9d3 new file mode 100644 index 000000000..58e60ada9 --- /dev/null +++ b/18/d004d9c027f3cf2a2cbe870905fd092bf7c9d3 @@ -0,0 +1,124 @@ +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 5ED43431FC0 + for ; Fri, 21 Feb 2014 15:20:51 -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 rALMZVP26hcD for ; + Fri, 21 Feb 2014 15:20:46 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 98EAC431FB6 + for ; Fri, 21 Feb 2014 15:20:46 -0800 (PST) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 093FA100063; Sat, 22 Feb 2014 01:20:39 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH 1/3] build: write version.stamp file containing $(VERSION) + string +Date: Sat, 22 Feb 2014 01:20:35 +0200 +Message-Id: <1393024837-30394-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +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: Fri, 21 Feb 2014 23:20:51 -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. +--- + +This is version 6 of + + id:1391956711-21231-1-git-send-email-tomi.ollila@iki.fi + + The only change is $(VERSTAMP) -> version.stamp -- $(VERSTAMP) does not + get expanded for prerequisities if those are not already defined, + and as emacs/Makefile.local is included before Makefile.local $(VERSTAMP) + is useless in emacs/... (expands to nothing). And my original idea for + $(VERSTAMP) was for typo-checking -- I just did not realize that make does + not tell me that the variable is undefined so the typo-check I thought of + just did't happen. + + +And the following 2 patches version 2 of + + id:1390135903-28167-1-git-send-email-tomi.ollila@iki.fi + + Now utilizes version.stamp to know when notmuch.el is to be + re-bytecompiled. + + Makefile.local | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/Makefile.local b/Makefile.local +index 174506c..3a56c06 100644 +--- a/Makefile.local ++++ b/Makefile.local +@@ -22,6 +22,11 @@ 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 version.stamp && read vs < version.stamp || vs=; echo $$vs) ++ifneq ($(FILE_VERSION),$(VERSION)) ++ $(shell echo "$(VERSION)" > version.stamp) ++endif + endif + endif + +@@ -69,6 +74,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. ++version.stamp: version ++ echo $(VERSION) > $@ ++ + $(TAR_FILE): + if git tag -v $(VERSION) >/dev/null 2>&1; then \ + ref=$(VERSION); \ +@@ -280,6 +290,8 @@ notmuch_client_srcs = \ + + notmuch_client_modules = $(notmuch_client_srcs:.c=.o) + ++notmuch.o: version.stamp ++ + 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 +330,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) version.stamp + + DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config + +-- +1.8.0 + -- 2.26.2