From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Brand Subject: Re: "git describe" in version of info file with "make info_git_describe" Date: Sat, 29 Oct 2011 13:40:53 +0200 Message-ID: References: <87fwnse1d8.fsf@norang.ca> <87fwifwv1s.fsf@Rainer.invalid> <87fwidpiut.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([140.186.70.92]:56618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RK7HU-00033S-6K for emacs-orgmode@gnu.org; Sat, 29 Oct 2011 07:40:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RK7HS-0007XW-DE for emacs-orgmode@gnu.org; Sat, 29 Oct 2011 07:40:56 -0400 Received: from mail-ww0-f49.google.com ([74.125.82.49]:44430) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RK7HS-0007XS-7f for emacs-orgmode@gnu.org; Sat, 29 Oct 2011 07:40:54 -0400 Received: by wwe3 with SMTP id 3so103689wwe.30 for ; Sat, 29 Oct 2011 04:40:53 -0700 (PDT) In-Reply-To: <87fwidpiut.fsf@Rainer.invalid> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Achim Gratz Cc: emacs-orgmode@gnu.org Hi Achim On Fri, Oct 28, 2011 at 11:26, Achim Gratz wrote: > Again I don't know if or when this gets merged. I've already used up my > TINYCHANGEs and hit an impasse with the FSF papers that I don't know how > to resolve... :-( Then again, the build system doesn't really become > part of Emacs, but it's up to the maintainers to decide. I hope that this can be solved and that your Makefile restructuring will be merged into master. > I'd much prefer to inject the version in a different way, not making an > altered copy that the build works from. The result is the same, but it > doesn't feel OK... so probably the solution should be to get the version > injected via some @set in an @include file (that's the recommended way > from the Texinfo perspective, anyway) that is produced by make whenever > the source file changes. I prefer this cleaner solution you have just implemented too of course. >> And I _added_ the target "info-vg" because implementing the same >> functionality in the target "info" itself, by either adding an >> auto-detect whether git describe is available (like org-version does) >> or using org-version itself, is not an option. One still needs to have >> the unchanged target "info" to build a release with the info version >> not possibly influenced by git describe. > > I posit that if it's worth to have that (I'd say yes), ``make info=B4=B4 > should do that, in a way that is compatible with version control. Is it possible with your current "make info" to get an info file without git describe for a release like ELPA when made from within a git repo and also for Emacs when building Emacs from a bzr-mirroring git repo? > Anyway, I've implemented the requested functionality into my Makefile > fork, please test. Thank you for this implementation. Since my patch discussed here is now superseded by your branch I thought it would be cleaner to put my comments to the sub-thread "Makefile restructuring" starting here: http://lists.gnu.org/archive/html/emacs-orgmode/2011-07/msg00680.html Michael