From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: "git describe" in version of info file with "make info_git_describe" Date: Fri, 28 Oct 2011 11:26:34 +0200 Message-ID: <87fwidpiut.fsf@Rainer.invalid> References: <87fwnse1d8.fsf@norang.ca> <87fwifwv1s.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([140.186.70.92]:39272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJiiC-0005L7-Pb for emacs-orgmode@gnu.org; Fri, 28 Oct 2011 05:26:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJiiB-0000AZ-65 for emacs-orgmode@gnu.org; Fri, 28 Oct 2011 05:26:52 -0400 Received: from lo.gmane.org ([80.91.229.12]:58651) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJiiA-0000AU-TM for emacs-orgmode@gnu.org; Fri, 28 Oct 2011 05:26:51 -0400 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1RJii8-0002GI-MF for emacs-orgmode@gnu.org; Fri, 28 Oct 2011 11:26:48 +0200 Received: from p57aad818.dip.t-dialin.net ([87.170.216.24]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 28 Oct 2011 11:26:48 +0200 Received: from Stromeko by p57aad818.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 28 Oct 2011 11:26:48 +0200 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: emacs-orgmode@gnu.org Michael Brand writes: > If set-version.pl would be obsolete my patch would be much shorter and > I would use something even more portable than perl to change the > version in /tmp/org.texi like the POSIX/SUS ed command, used inline in > the Makefile. Would you agree? I don't know if it is still used by the maintainers for preparing a release. I do know that there are no version numbers in the source files any more, so that part of set-version.pl surely is obsolete. The other parts may become obsolete if whatever is still in used can be moved to make. I've already started to reduce the reliance on perl in my branch, switching to sed where possible. > I can remember some discussion but haven't realized that the outcome > is a pending merge. Hence I declare version 2 of my patch as "Changes > Requested" on patchwork (can't change this myself) and will rebase it > against your changes. 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. > Yes, good point. I was aware of that and therefore for the target > "info-vg", doc/org.texi is copied to /tmp/org.texi, altered only there > and makeinfo reads from there. 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. > 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´´ should do that, in a way that is compatible with version control. Anyway, I've implemented the requested functionality into my Makefile fork, please test. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Waldorf MIDI Implementation & additional documentation: http://Synth.Stromeko.net/Downloads.html#WaldorfDocs