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: Sun, 16 Oct 2011 21:12:48 +0200 Message-ID: References: <87fwnse1d8.fsf@norang.ca> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001485f4231caffb3104af6f461d Return-path: Received: from eggs.gnu.org ([140.186.70.92]:42824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFW8i-0006Un-GE for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 15:12:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFW8h-0003Pt-1O for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 15:12:52 -0400 Received: from mail-wy0-f169.google.com ([74.125.82.169]:64115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFW8g-0003Po-NF for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 15:12:51 -0400 Received: by wyg34 with SMTP id 34so1490613wyg.0 for ; Sun, 16 Oct 2011 12:12:49 -0700 (PDT) In-Reply-To: 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: Org Mode Cc: Bernt Hansen --001485f4231caffb3104af6f461d Content-Type: text/plain; charset=ISO-8859-1 Hi all I made a new patch replacing the previous, now considering the Makefile targets "target" and "help" introduced meanwhile by Achim Gratz and with a shorter name "info-vg" for the new target for easier typing of the make command. The previous patch attachment had a wrong mime type, could therefore not be caught by patchwork and has not been accepted. Michael On Thu, Jun 2, 2011 at 21:36, Michael Brand wrote: > The patch is ready and attached. > > On Thu, Jun 2, 2011 at 17:05, Michael Brand wrote: > [...] >> Since I would like to give the more often used "git describe" >> precedence I will make org-version and "make info_git_describe" >> consistent with git. The ".dirty" postfix of org-version I will leave >> untouched in org-version of course and support also in "make >> info_git_describe". --001485f4231caffb3104af6f461d Content-Type: text/plain; charset=US-ASCII; name="0001-Makefile-info-vg-set-info-version-to-git-describe.patch.txt" Content-Disposition: attachment; filename="0001-Makefile-info-vg-set-info-version-to-git-describe.patch.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gtueue3c0 RnJvbSAxNDhkZGJlMmIyYmRjNDVkNGU1MzMxMjY2OWRhYjIwN2Q1MWQ5ZmQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIEJyYW5kIDxtaWNoYWVsLmNoLmJyYW5kQGdtYWls LmNvbT4KRGF0ZTogU3VuLCAxNiBPY3QgMjAxMSAyMTowNjozNSArMDIwMApTdWJqZWN0OiBbUEFU Q0hdIE1ha2VmaWxlIGluZm8tdmc6IHNldCBpbmZvIHZlcnNpb24gdG8gZ2l0IGRlc2NyaWJlCgoq IE1ha2VmaWxlIChpbmZvLXZnKTogTmV3IHRhcmdldC4KKHJlbGVhc2UpOiBSZW1vdmUgIi1hIiB0 aGF0IGhhcyBiZWNvbWUgaWRsZSBhbHJlYWR5IGJlZm9yZSBmcm9tCmNvbW1hbmQgIlVUSUxJVElF Uy9zZXQtdmVyc2lvbi5wbCIuCihmaXhyZWxlYXNlKTogUmVtb3ZlIGNvbW1hbmQgIlVUSUxJVElF Uy9zZXQtdmVyc2lvbi5wbCAtbyAkKFRBRykiIHRoYXQKaGFzIGJlY29tZSBpZGxlIGFscmVhZHkg YmVmb3JlLgoodGFyZ2V0cyBoZWxwKTogSW5jbHVkZSBuZXcgdGFyZ2V0IGluZm8tdmcuCiogVVRJ TElUSUVTL3NldC12ZXJzaW9uLnBsIChvcmctdGV4aSk6Ck5ldyBvcHRpb24gIi0tb3JnLnRleGkg WzxvcHRpb25hbF9maWxlPl0iLgoqIG9yZy5lbCAob3JnLXZlcnNpb24pOiBPdXRwdXQgZm9ybWF0 IGNvbnNpc3RlbnQgd2l0aCAiZ2l0IGRlc2NyaWJlIi4KClRoZSBuZXcgTWFrZWZpbGUgdGFyZ2V0 IGluZm8tdmcgYnVpbGRzIHRoZSBpbmZvIGZpbGUgZG9jL29yZyBsaWtlIHRoZQp0YXJnZXQgImlu Zm8iIGJ1dCBzZXRzIHRoZSBpbmZvIHZlcnNpb24gdG8gdGhlIG91dHB1dCBvZiB0aGUgY29tbWFu ZAoiZ2l0IGRlc2NyaWJlIi4KLS0tCiBNYWtlZmlsZSAgICAgICAgICAgICAgICAgfCAgIDEzICsr KysrKysrKysrLS0KIFVUSUxJVElFUy9zZXQtdmVyc2lvbi5wbCB8ICAgMzUgKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0KIGxpc3Avb3JnLmVsICAgICAgICAgICAgICB8ICAgIDEg LQogMyBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9NYWtlZmlsZSBiL01ha2VmaWxlCmluZGV4IDhiOWFhNGQuLjMwYmM1NzggMTAw NjQ0Ci0tLSBhL01ha2VmaWxlCisrKyBiL01ha2VmaWxlCkBAIC0yODAsNiArMjgwLDE1IEBAIGh0 bWxfZ3VpZGU6IGRvYy9vcmdndWlkZS50ZXhpCiAKIGluZm86CWRvYy9vcmcKIAorIyBUaGUgZm9s bG93aW5nIHRhcmdldCBidWlsZHMgdGhlIGluZm8gZmlsZSBkb2Mvb3JnIGxpa2UgdGhlIHRhcmdl dCAiaW5mbyIKKyMgYnV0IHNldHMgdGhlIGluZm8gdmVyc2lvbiB0byB0aGUgb3V0cHV0IG9mIHRo ZSBjb21tYW5kICJnaXQgZGVzY3JpYmUiCitpbmZvLXZnOiBUQUc9JChzaGVsbCBnaXQgZGVzY3Jp YmUgLS1hYmJyZXY9NCBIRUFEKSQoc2hlbGwgXAorCXRlc3QgImBnaXQgZGlmZi1pbmRleCAtLW5h bWUtb25seSBIRUFEIC0tYCIgJiYgcHJpbnRmICcuZGlydHknKQoraW5mby12ZzogZG9jL29yZy50 ZXhpCisJY3AgZG9jL29yZy50ZXhpIC90bXAKKwlVVElMSVRJRVMvc2V0LXZlcnNpb24ucGwgJyQo VEFHKScgLS1vcmcudGV4aSAvdG1wL29yZy50ZXhpCisJJChNQUtFSU5GTykgLS1uby1zcGxpdCAv dG1wL29yZy50ZXhpIC1vIGRvYy9vcmcKKwogcGRmOglkb2Mvb3JnLnBkZiBkb2Mvb3JnZ3VpZGUu cGRmCiAKIGNhcmQ6CWRvYy9vcmdjYXJkLnBkZiBkb2Mvb3JnY2FyZF9sZXR0ZXIucGRmIGRvYy9v cmdjYXJkLnR4dApAQCAtMzE1LDcgKzMyNCw3IEBAIHJlbGVhc2U6CiAJZ2l0IHB1c2ggLWYgb3Jp Z2luIG1haW50CiAJZ2l0IGNoZWNrb3V0IG1hc3RlcgogCWdpdCBtZXJnZSAtcyBvdXJzIG1haW50 Ci0JVVRJTElUSUVTL3NldC12ZXJzaW9uLnBsIC1hICQoVEFHKQorCVVUSUxJVElFUy9zZXQtdmVy c2lvbi5wbCAkKFRBRykKIAlnaXQgY29tbWl0IC1hIC1tICJVcGRhdGUgd2Vic2l0ZSB0byBzaG93 ICQoVEFHKSBhcyBjdXJyZW50IHJlbGVhc2UiCiAJZ2l0IHB1c2gKIApAQCAtMzQzLDcgKzM1Miw2 IEBAIGZpeHJlbGVhc2U6CiAJZ2l0IHB1c2ggLWYgb3JpZ2luIG1haW50CiAJZ2l0IGNoZWNrb3V0 IG1hc3RlcgogCWdpdCBtZXJnZSAtcyBvdXJzIG1haW50Ci0JVVRJTElUSUVTL3NldC12ZXJzaW9u LnBsIC1vICQoVEFHKQogCWdpdCBjb21taXQgLWEgLW0gIlVwZGF0ZSB3ZWJzaXRlIHRvIHNob3cg JChUQUcpIGFzIGN1cnJlbnQgcmVsZWFzZSIKIAlnaXQgcHVzaAogCkBAIC01MjEsNiArNTI5LDcg QEAgdGFyZ2V0cyBoZWxwOgogCUBlY2hvICIiCiAJQGVjaG8gIm1ha2UgZG9jIC0gbWFrZSBhbGwg ZG9jdW1lbnRhdGlvbiIKIAlAZWNobyAibWFrZSBpbmZvIC0gbWFrZSBJbmZvIGRvY3VtZW50YXRp b24iCisJQGVjaG8gIm1ha2UgaW5mby12ZyAtIG1ha2UgSW5mbyBkb2MsIHNldCBpbmZvIHZlcnNp b24gdG8gZ2l0IGRlc2NyaWJlIgogCUBlY2hvICJtYWtlIGh0bWwgLSBtYWtlIEhUTUwgZG9jdW1l bnRhdGlvbiIKIAlAZWNobyAibWFrZSBwZGYgLSBtYWtlIHBkZiBkb2N1bWVudGF0aW9uIgogCUBl Y2hvICJtYWtlIGNhcmQgLSBtYWtlIHJlZmNhcmRzIGRvY3VtZW50YXRpb24iCmRpZmYgLS1naXQg YS9VVElMSVRJRVMvc2V0LXZlcnNpb24ucGwgYi9VVElMSVRJRVMvc2V0LXZlcnNpb24ucGwKaW5k ZXggZWQxODVlYS4uNDdkNDM5YiAxMDA3NTUKLS0tIGEvVVRJTElUSUVTL3NldC12ZXJzaW9uLnBs CisrKyBiL1VUSUxJVElFUy9zZXQtdmVyc2lvbi5wbApAQCAtMSw0MyArMSw1OCBAQAogIyEvdXNy L2Jpbi9wZXJsCiAkdmVyc2lvbiA9ICRBUkdWWzBdOwotaWYgKCR2ZXJzaW9uIGVxICItLWFsbCIg b3IgJHZlcnNpb24gZXEgIi1hIikgeworCisjIGlmIG5vIGZ1cnRoZXIgb3B0aW9uIGlzIHByZXNl bnQgdGhlbiBkZWZhdWx0IHRvICJhbGwiCitpZiAobm90ICRBUkdWWzFdKSB7CiAgICRhbGwgPSAx OwotICAkdmVyc2lvbiA9ICRBUkdWWzFdCiB9CiAKLWlmICgkdmVyc2lvbiBlcSAiLS1vbmx5IiBv ciAkdmVyc2lvbiBlcSAiLW8iKSB7Ci0gICRvbmx5ID0gMTsKLSAgJHZlcnNpb24gPSAkQVJHVlsx XQorIyBwYXJzZSBvcHRpb24gIi0tb3JnLnRleGkgWzxvcHRpb25hbF9maWxlPl0iCisjIChvbmx5 IHNpbXBsZSBwYXJzaW5nIHNpbmNlIG5vIG1vcmUgdGhhbiBvbmUgb3B0aW9uIHN1cHBvcnRlZCB5 ZXQpCitpZiAoJEFSR1ZbMV0gZXEgIi0tb3JnLnRleGkiKSB7CisgICRvcmdfdGV4aV9vcHQgPSAx OworICBpZiAoJEFSR1ZbMl0pIHsKKyAgICAkb3JnX3RleGlfZmlsZSA9ICIkQVJHVlsyXSI7Cisg IH0KIH0KIAogZGllICJObyB2ZXJzaW9uIGdpdmVuIiB1bmxlc3MgJHZlcnNpb249fi9cUy87CiAk ZGF0ZSA9IGBkYXRlICIrJUIgJVkiYDsgY2hvbXAgJGRhdGU7CiAkeWVhciA9IGBkYXRlICIrJVki YCA7IGNob21wICR5ZWFyOwogCi1wcmludCBTVERFUlIgIkNoYW5naW5nIHZlcnNpb24gdG8gXCIk dmVyc2lvblwiIGFuZCBkYXRlIHRvIFwiJGRhdGVcIiBpbiBhbGwgcmVsZXZhbnQgZmlsZXNcbiIg OwotCi1pZiAobm90ICRvbmx5KSB7CitwcmludCBTVERFUlIgIkNoYW5naW5nIHZlcnNpb24gdG8g XCIkdmVyc2lvblwiIGFuZCBkYXRlIHRvIFwiJGRhdGVcIiBpbiB0aGUgZm9sbG93aW5nIGZpbGVz OlxuIiA7CiAKK2lmICgkYWxsKSB7CiAgIHByaW50IFNUREVSUiBqb2luKCJcbiIsZ2xvYigibGlz cC8qLmVsIikpLCJcbiI7CiAgICRjbWQgPSBxcXtzL14oOzsgVmVyc2lvbjopXFxzKyhcXFMrKVsg XHRdKlwkL1wkMSAkdmVyc2lvbi87cy9eKFxcKGRlZmNvbnN0IG9yZy12ZXJzaW9uICkiKFxcUysp Ii9cJDEiJHZlcnNpb24iL307CiAgICRjMSA9ICJwZXJsIC1waSAtZSAnJGNtZCcgbGlzcC8qLmVs IjsKICAgc3lzdGVtKCRjMSk7Cit9CiAKLSAgcHJpbnQgU1RERVJSICJkb2Mvb3JnLnRleGlcbiI7 CitpZiAoJGFsbCBvciAkb3JnX3RleGlfb3B0KSB7CisgIGlmIChub3QgIiRvcmdfdGV4aV9maWxl IikgeworICAgICRvcmdfdGV4aV9maWxlID0gImRvYy9vcmcudGV4aSI7CisgIH0KKyAgcHJpbnQg U1RERVJSICIkb3JnX3RleGlfZmlsZVxuIjsKICAgJGNtZCA9IHFxe3MvXihcXFxAc2V0IFZFUlNJ T04pXFxzKyhcXFMrKVsgXHRdKlwkL1wkMSAkdmVyc2lvbi87cy9eKFxcXEBzZXQgREFURSlcXHMr KC4qKVwkL1wkMSAkZGF0ZS87fTsKLSAgJGMxID0gInBlcmwgLXBpIC1lICckY21kJyBkb2Mvb3Jn LnRleGkiOworICAkYzEgPSAicGVybCAtcGkgLWUgJyRjbWQnICckb3JnX3RleGlfZmlsZSciOwog ICBzeXN0ZW0oJGMxKTsKK30KIAoraWYgKCRhbGwpIHsKICAgcHJpbnQgU1RERVJSICJkb2Mvb3Jn Z3VpZGUudGV4aVxuIjsKICAgJGNtZCA9IHFxe3MvXihcXFxAc2V0IFZFUlNJT04pXFxzKyhcXFMr KVsgXHRdKlwkL1wkMSAkdmVyc2lvbi87cy9eKFxcXEBzZXQgREFURSlcXHMrKC4qKVwkL1wkMSAk ZGF0ZS87fTsKICAgJGMxID0gInBlcmwgLXBpIC1lICckY21kJyBkb2Mvb3JnZ3VpZGUudGV4aSI7 CiAgIHN5c3RlbSgkYzEpOworfQogCitpZiAoJGFsbCkgewogICBwcmludCBTVERFUlIgImRvYy9v cmdjYXJkLnRleFxuIjsKICAgJGNtZCA9IHFxe3MvXlxcXFxkZWZcXFxcb3JndmVyc2lvbm51bWJl clxce1xcUytcXH0vXFxcXGRlZlxcXFxvcmd2ZXJzaW9ubnVtYmVyeyR2ZXJzaW9ufS87cy9cXFxc ZGVmXFxcXHZlcnNpb255ZWFyXFx7XFxTK1xcfS9cXFxcZGVmXFxcXHZlcnNpb255ZWFyeyR5ZWFy fS87cy9cXFxcZGVmXFxcXHllYXJcXHtcXFMrXFx9L1xcXFxkZWZcXFxceWVhcnskeWVhcn0vO307 CiAgICRjMSA9ICJwZXJsIC1waSAtZSAnJGNtZCcgZG9jL29yZ2NhcmQudGV4IjsKICAgc3lzdGVt KCRjMSk7Cit9CiAKK2lmICgkYWxsKSB7CiAgIHByaW50IFNUREVSUiAiUkVBRE1FX0RJU1RcbiI7 CiAgICRjbWQgPSBxcXtzL14oVGhlIHZlcnNpb24gb2YgdGhpcyByZWxlYXNlIGlzOilcXHMrKFxc UyspWyBcdF0qXCQvXCQxICR2ZXJzaW9uLzt9OwogICAkYzEgPSAicGVybCAtcGkgLWUgJyRjbWQn IFJFQURNRV9ESVNUIjsKZGlmZiAtLWdpdCBhL2xpc3Avb3JnLmVsIGIvbGlzcC9vcmcuZWwKaW5k ZXggNmFiYTFhMi4uMjdjMmYyYyAxMDA2NDQKLS0tIGEvbGlzcC9vcmcuZWwKKysrIGIvbGlzcC9v cmcuZWwKQEAgLTIyMSw3ICsyMjEsNiBAQCAoZGVmdW4gb3JnLXZlcnNpb24gKCZvcHRpb25hbCBo ZXJlKQogCSAgICAgICh3aXRoLWN1cnJlbnQtYnVmZmVyICIqU2hlbGwgQ29tbWFuZCBPdXRwdXQq IgogCQkoZ290by1jaGFyIChwb2ludC1taW4pKQogCQkoc2V0cSBnaXQtdmVyc2lvbiAoYnVmZmVy LXN1YnN0cmluZyAocG9pbnQpIChwb2ludC1hdC1lb2wpKSkpCi0JICAgICAgKHN1YnN0LWNoYXIt aW4tc3RyaW5nID8tID8uIGdpdC12ZXJzaW9uIHQpCiAJICAgICAgKHdoZW4gKHN0cmluZy1tYXRj aCAiXFxTLSIKIAkJCQkgIChzaGVsbC1jb21tYW5kLXRvLXN0cmluZwogCQkJCSAgICJnaXQgZGlm Zi1pbmRleCAtLW5hbWUtb25seSBIRUFEIC0tIikpCi0tIAoxLjcuNC4yCgo= --001485f4231caffb3104af6f461d--