From: W. Trevor King Date: Sat, 8 Feb 2014 23:56:23 +0000 (+1600) Subject: Re: [PATCH v4] build: write VERSION file containing $(VERSION) string X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=92d0c54d5ec44b373cd1b7046748818e03596bf8;p=notmuch-archives.git Re: [PATCH v4] build: write VERSION file containing $(VERSION) string --- diff --git a/4d/b0b08538f37fd60289f3152a2a76afab24a16b b/4d/b0b08538f37fd60289f3152a2a76afab24a16b new file mode 100644 index 000000000..c5f27f30e --- /dev/null +++ b/4d/b0b08538f37fd60289f3152a2a76afab24a16b @@ -0,0 +1,143 @@ +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 1A91E431FBD + for ; Sat, 8 Feb 2014 15:56:29 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.1 +X-Spam-Level: +X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + RCVD_IN_DNSWL_NONE=-0.0001] 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 hwgEYZgMEu2T for ; + Sat, 8 Feb 2014 15:56:25 -0800 (PST) +Received: from qmta02.westchester.pa.mail.comcast.net + (qmta02.westchester.pa.mail.comcast.net [76.96.62.24]) + by olra.theworths.org (Postfix) with ESMTP id 7D264431FBC + for ; Sat, 8 Feb 2014 15:56:25 -0800 (PST) +Received: from omta13.westchester.pa.mail.comcast.net ([76.96.62.52]) + by qmta02.westchester.pa.mail.comcast.net with comcast + id Pzbc1n00117dt5G51zwR2u; Sat, 08 Feb 2014 23:56:25 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by omta13.westchester.pa.mail.comcast.net with comcast + id PzwP1n00L152l3L3ZzwQCM; Sat, 08 Feb 2014 23:56:24 +0000 +Received: by odin.tremily.us (Postfix, from userid 1000) + id 4B28F100D8AE; Sat, 8 Feb 2014 15:56:23 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; + t=1391903783; bh=DH7kOkhbQA9jh8+h6UsaHZFkXBU93D60ai5FWjWPAvM=; + h=Date:From:To:Cc:Subject:References:In-Reply-To; + b=L8L0eY8IRMO3OHaByDBWgX9fuALdAeG9U44Hbu5JwGQuHmH37iMRVqeeJr7MfpjEf + TCPNfnMh/9tUGLNc8yAJTg3rI43ynofA8s32A/TAcsYJuZXQ2+AXh2G+vINhRvDdPd + dNLpILGBuh0Fjpb9jvYeXThD/26A6ePFrAeBn3EE= +Date: Sat, 8 Feb 2014 15:56:23 -0800 +From: "W. Trevor King" +To: Tomi Ollila +Subject: Re: [PATCH v4] build: write VERSION file containing $(VERSION) string +Message-ID: <20140208235623.GF17142@odin.tremily.us> +References: + <1391641113-4669-1-git-send-email-tomi.ollila@iki.fi> +MIME-Version: 1.0 +Content-Type: multipart/signed; micalg=pgp-sha1; + protocol="application/pgp-signature"; boundary="65ImJOski3p8EhYV" +Content-Disposition: inline +In-Reply-To: <1391641113-4669-1-git-send-email-tomi.ollila@iki.fi> +OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8; + url=http://tremily.us/pubkey.txt +User-Agent: Mutt/1.5.22 (2013-10-16) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20121106; t=1391903785; + bh=D4tJBUKr6nvGIZCaxRkhXJz+20/reTG1SEuWlI41SdE=; + h=Received:Received:Received:Date:From:To:Subject:Message-ID: + MIME-Version:Content-Type; + b=d8SyPMtHeMa49fahROhmMrvNEgRvqt+nI8JHdmXFRsGD4GmrAhWsEsKQrETmuoOpd + L59a4L1IUWFJYDOQEjhnqjEpOJ+scSGb124n7BL9CLRr9apyN2O/6l6bCyODdH0Lli + VwrPZb7pKwRQnjU+e6xZlfkwX1mStZ1wMWaEOWtGbfR+a/6VMIa54AtDxMdd07UQ+m + WrOB++Nwbw3LWPw9cOEgWtIYHxY28mPuq9iXMY8BK5lyChI74ussFV+/e7nCG5J6nA + KYHzmpfE70YqA7ilccAEg7Oo5UmYnWrIle5WjZ84/NdB0RpjFgsXVm336l6fWoydXg + 8Tlhcj6/Qi7Hw== +Cc: notmuch@notmuchmail.org +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: Sat, 08 Feb 2014 23:56:29 -0000 + + +--65ImJOski3p8EhYV +Content-Type: text/plain; charset=utf-8 +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +On Thu, Feb 06, 2014 at 12:58:33AM +0200, Tomi Ollila wrote: +> -VERSION:=3D$(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:=3D$(shell\ +> + gv=3D`git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/`= +;\ + +Ew, backticks ;). What about handling more of the logic in Make: + + VERSION :=3D $(shell git describe =E2=80=A6) + FILE_VERSION :=3D $(shell test -f VERSION || touch VERSION; cat VERSION) + ifneq ($(FILE_VERSION), $(VERSION)) + $(shell echo "$(VERSION)" > VERSION) + endif + +> +# Depend (also) on 'version' file. In case of ifeq ($(IS_GIT),yes) +> +# this file may already have been updated. +> +VERSION: version +> + echo $(VERSION) > $@ + +Do we care about case-insensitive filesystems where VERSION will +collide with version? + +> -CLEAN :=3D $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) not= +much.elc +> +CLEAN :=3D $(CLEAN) VERSION notmuch notmuch-shared $(notmuch_client_modu= +les) + +Where did notmuch.elc go? + +Cheers, +Trevor + +--=20 +This email may be signed or encrypted with GnuPG (http://www.gnupg.org). +For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy + +--65ImJOski3p8EhYV +Content-Type: application/pgp-signature; name="signature.asc" +Content-Description: OpenPGP digital signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAEBAgAGBQJS9sQkAAoJEKKfehoaNkbtNIQQAIPJycXMHuHL0HGSoJeg4U8p +OTCt6N9tqkFHOcaIy/L45WY2WJZ+zsPMqFg8P4+/8WMuDrnP9/PJ8LdzRwSwNjO8 +t05p9r8fXksgSVNcN4TiVgNIpQxu7DrIQyh9Ys0kOaGRew+Oo8p/XTyRaYPZsvtS +vWRfOaeN35ctHeNf0ajagcek9k1fup8hN4M8xFBrrFluQf91KWEPpSYHOcjXSUDC +8UHa5aARRFP4ooVFuDmEMygqKuTjMiJN++/JXz0j6rf1Esaz4Gm/HfLHzk7Ut/EN +jJhBcKqGi5HPaFsh4jwAbj06Ydugl9aNHCZRTlrT7yOYVOTkjIRDL2OEd9bpome9 +L8Py/8+/ewTfpWbZfW6qIIYTgn/HE5ItOUzq0H57nu33GCKmXVDMcq2ycQx7U7yG +7BYhVMxCsE37Su/0nw4jU5zhqyf53h8ETs7/3jDpX8cPGCnyxKSprMOodhrBPqNO +WgBlsLqzjNDMvXFESVK6pQVnbI9x+vXInqJApNXGvTHH1tkif9TzSS3oCb7s0foK +rKVr/sCmg8xpv2hvpZUj8ggTUYZh2OUG6/w87fu7xvQ58Cf7vLbNN+PC29Gbo1px +UU428xM5kj+L9+VlfFjHFtjJ3aoglwMspVdJzsZ8IxMBMZlnxRdwYqzv478F/hA1 +4qRJuR845hegTrblJSgA +=WGIC +-----END PGP SIGNATURE----- + +--65ImJOski3p8EhYV--