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: Thu, 2 Jun 2011 21:36:02 +0200 Message-ID: References: <87fwnse1d8.fsf@norang.ca> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=bcaec517a72a5a9ade04a4bfbffb Return-path: Received: from eggs.gnu.org ([140.186.70.92]:45453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QSDgc-0001Kw-88 for emacs-orgmode@gnu.org; Thu, 02 Jun 2011 15:36:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QSDga-0007QJ-LP for emacs-orgmode@gnu.org; Thu, 02 Jun 2011 15:36:05 -0400 Received: from mail-ey0-f169.google.com ([209.85.215.169]:63893) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QSDga-0007Q3-7q for emacs-orgmode@gnu.org; Thu, 02 Jun 2011 15:36:04 -0400 Received: by eyd9 with SMTP id 9so501617eyd.0 for ; Thu, 02 Jun 2011 12:36:03 -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 --bcaec517a72a5a9ade04a4bfbffb Content-Type: text/plain; charset=ISO-8859-1 The patch is ready and attached. Michael 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". --bcaec517a72a5a9ade04a4bfbffb Content-Type: application/octet-stream; name="0001-Use-git-describe-in-version-of-info-file-with-make-i.patch" Content-Disposition: attachment; filename="0001-Use-git-describe-in-version-of-info-file-with-make-i.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gog3t90j0 RnJvbSBjYzVlMGNkYWM4YTljNTBlOGZjN2VjYTZhOWNiODNlZWE1MmVmMDkxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIEJyYW5kIDxtaWNoYWVsLmNoLmJyYW5kQGdtYWls LmNvbT4KRGF0ZTogVGh1LCAyIEp1biAyMDExIDIxOjMyOjA5ICswMjAwClN1YmplY3Q6IFtQQVRD SF0gVXNlIGdpdCBkZXNjcmliZSBpbiB2ZXJzaW9uIG9mIGluZm8gZmlsZSB3aXRoIG1ha2UgaW5m b19naXRfZGVzY3JpYmUKCiogTWFrZWZpbGUgKGluZm9fZ2l0X2Rlc2NyaWJlKTogTmV3IHRhcmdl dC4KKHJlbGVhc2UpOiBSZW1vdmUgIi1hIiB0aGF0IGhhcyBiZWNvbWUgaWRsZSBhbHJlYWR5IGJl Zm9yZSBmcm9tCmNvbW1hbmQgIlVUSUxJVElFUy9zZXQtdmVyc2lvbi5wbCIuCihmaXhyZWxlYXNl KTogUmVtb3ZlIGNvbW1hbmQgIlVUSUxJVElFUy9zZXQtdmVyc2lvbi5wbCAtbyAkKFRBRykiIHRo YXQKaGFzIGJlY29tZSBpZGxlIGFscmVhZHkgYmVmb3JlLgoqIFVUSUxJVElFUy9zZXQtdmVyc2lv bi5wbCAob3JnLXRleGkpOgpOZXcgb3B0aW9uICItLW9yZy50ZXhpIFs8b3B0aW9uYWxfZmlsZT5d Ii4KKiBvcmcuZWwgKG9yZy12ZXJzaW9uKTogQ29uc2lzdGVudCB3aXRoICJnaXQgZGVzY3JpYmUi LgoKVGhlIG5ldyBNYWtlZmlsZSB0YXJnZXQgaW5mb19naXRfZGVzY3JpYmUgYnVpbGRzIGRvYy9v cmcgbGlrZSB0aGUKdGFyZ2V0ICJpbmZvIiBidXQgcmVmbGVjdHMgdGhlIG91dHB1dCBvZiB0aGUg Y29tbWFuZCAiZ2l0IGRlc2NyaWJlIiBpbgp0aGUgdmVyc2lvbiwgc2ltaWxhciB0byB0aGUgT3Jn IG1vZGUgZnVuY3Rpb24gb3JnLXZlcnNpb24uCi0tLQogTWFrZWZpbGUgICAgICAgICAgICAgICAg IHwgICAxMyArKysrKysrKysrKy0tCiBVVElMSVRJRVMvc2V0LXZlcnNpb24ucGwgfCAgIDM1ICsr KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiBsaXNwL29yZy5lbCAgICAgICAgICAg ICAgfCAgICAxIC0KIDMgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvTWFrZWZpbGUgYi9NYWtlZmlsZQppbmRleCAyMzlhYjJlLi4x NWI0MDhkIDEwMDY0NAotLS0gYS9NYWtlZmlsZQorKysgYi9NYWtlZmlsZQpAQCAtMjgxLDYgKzI4 MSwxNiBAQCBodG1sX2d1aWRlOiBkb2Mvb3JnZ3VpZGUudGV4aQogCiBpbmZvOglkb2Mvb3JnCiAK KyMgVGhlIGZvbGxvd2luZyB0YXJnZXQgYnVpbGRzIGRvYy9vcmcgbGlrZSB0aGUgdGFyZ2V0ICJp bmZvIiBidXQKKyMgcmVmbGVjdHMgdGhlIG91dHB1dCBvZiB0aGUgY29tbWFuZCAiZ2l0IGRlc2Ny aWJlIiBpbiB0aGUgdmVyc2lvbiwKKyMgc2ltaWxhciB0byB0aGUgT3JnIG1vZGUgZnVuY3Rpb24g b3JnLXZlcnNpb24KK2luZm9fZ2l0X2Rlc2NyaWJlOiBUQUc9JChzaGVsbCBnaXQgZGVzY3JpYmUg LS1hYmJyZXY9NCBIRUFEKSQoc2hlbGwgXAorCXRlc3QgImBnaXQgZGlmZi1pbmRleCAtLW5hbWUt b25seSBIRUFEIC0tYCIgJiYgcHJpbnRmICcuZGlydHknKQoraW5mb19naXRfZGVzY3JpYmU6IGRv Yy9vcmcudGV4aQorCWNwIGRvYy9vcmcudGV4aSAvdG1wCisJVVRJTElUSUVTL3NldC12ZXJzaW9u LnBsICckKFRBRyknIC0tb3JnLnRleGkgL3RtcC9vcmcudGV4aQorCSQoTUFLRUlORk8pIC0tbm8t c3BsaXQgL3RtcC9vcmcudGV4aSAtbyBkb2Mvb3JnCisKIHBkZjoJZG9jL29yZy5wZGYgZG9jL29y Z2d1aWRlLnBkZgogCiBjYXJkOglkb2Mvb3JnY2FyZC5wZGYgZG9jL29yZ2NhcmRfbGV0dGVyLnBk ZiBkb2Mvb3JnY2FyZC50eHQKQEAgLTMxNiw3ICszMjYsNyBAQCByZWxlYXNlOgogCWdpdCBwdXNo IC1mIG9yaWdpbiBtYWludAogCWdpdCBjaGVja291dCBtYXN0ZXIKIAlnaXQgbWVyZ2UgLXMgb3Vy cyBtYWludAotCVVUSUxJVElFUy9zZXQtdmVyc2lvbi5wbCAtYSAkKFRBRykKKwlVVElMSVRJRVMv c2V0LXZlcnNpb24ucGwgJChUQUcpCiAJZ2l0IGNvbW1pdCAtYSAtbSAiVXBkYXRlIHdlYnNpdGUg dG8gc2hvdyAkKFRBRykgYXMgY3VycmVudCByZWxlYXNlIgogCWdpdCBwdXNoCiAKQEAgLTM0NCw3 ICszNTQsNiBAQCBmaXhyZWxlYXNlOgogCWdpdCBwdXNoIC1mIG9yaWdpbiBtYWludAogCWdpdCBj aGVja291dCBtYXN0ZXIKIAlnaXQgbWVyZ2UgLXMgb3VycyBtYWludAotCVVUSUxJVElFUy9zZXQt dmVyc2lvbi5wbCAtbyAkKFRBRykKIAlnaXQgY29tbWl0IC1hIC1tICJVcGRhdGUgd2Vic2l0ZSB0 byBzaG93ICQoVEFHKSBhcyBjdXJyZW50IHJlbGVhc2UiCiAJZ2l0IHB1c2gKIApkaWZmIC0tZ2l0 IGEvVVRJTElUSUVTL3NldC12ZXJzaW9uLnBsIGIvVVRJTElUSUVTL3NldC12ZXJzaW9uLnBsCmlu ZGV4IGVkMTg1ZWEuLjQ3ZDQzOWIgMTAwNzU1Ci0tLSBhL1VUSUxJVElFUy9zZXQtdmVyc2lvbi5w bAorKysgYi9VVElMSVRJRVMvc2V0LXZlcnNpb24ucGwKQEAgLTEsNDMgKzEsNTggQEAKICMhL3Vz ci9iaW4vcGVybAogJHZlcnNpb24gPSAkQVJHVlswXTsKLWlmICgkdmVyc2lvbiBlcSAiLS1hbGwi IG9yICR2ZXJzaW9uIGVxICItYSIpIHsKKworIyBpZiBubyBmdXJ0aGVyIG9wdGlvbiBpcyBwcmVz ZW50IHRoZW4gZGVmYXVsdCB0byAiYWxsIgoraWYgKG5vdCAkQVJHVlsxXSkgewogICAkYWxsID0g MTsKLSAgJHZlcnNpb24gPSAkQVJHVlsxXQogfQogCi1pZiAoJHZlcnNpb24gZXEgIi0tb25seSIg b3IgJHZlcnNpb24gZXEgIi1vIikgewotICAkb25seSA9IDE7Ci0gICR2ZXJzaW9uID0gJEFSR1Zb MV0KKyMgcGFyc2Ugb3B0aW9uICItLW9yZy50ZXhpIFs8b3B0aW9uYWxfZmlsZT5dIgorIyAob25s eSBzaW1wbGUgcGFyc2luZyBzaW5jZSBubyBtb3JlIHRoYW4gb25lIG9wdGlvbiBzdXBwb3J0ZWQg eWV0KQoraWYgKCRBUkdWWzFdIGVxICItLW9yZy50ZXhpIikgeworICAkb3JnX3RleGlfb3B0ID0g MTsKKyAgaWYgKCRBUkdWWzJdKSB7CisgICAgJG9yZ190ZXhpX2ZpbGUgPSAiJEFSR1ZbMl0iOwor ICB9CiB9CiAKIGRpZSAiTm8gdmVyc2lvbiBnaXZlbiIgdW5sZXNzICR2ZXJzaW9uPX4vXFMvOwog JGRhdGUgPSBgZGF0ZSAiKyVCICVZImA7IGNob21wICRkYXRlOwogJHllYXIgPSBgZGF0ZSAiKyVZ ImAgOyBjaG9tcCAkeWVhcjsKIAotcHJpbnQgU1RERVJSICJDaGFuZ2luZyB2ZXJzaW9uIHRvIFwi JHZlcnNpb25cIiBhbmQgZGF0ZSB0byBcIiRkYXRlXCIgaW4gYWxsIHJlbGV2YW50IGZpbGVzXG4i IDsKLQotaWYgKG5vdCAkb25seSkgeworcHJpbnQgU1RERVJSICJDaGFuZ2luZyB2ZXJzaW9uIHRv IFwiJHZlcnNpb25cIiBhbmQgZGF0ZSB0byBcIiRkYXRlXCIgaW4gdGhlIGZvbGxvd2luZyBmaWxl czpcbiIgOwogCitpZiAoJGFsbCkgewogICBwcmludCBTVERFUlIgam9pbigiXG4iLGdsb2IoImxp c3AvKi5lbCIpKSwiXG4iOwogICAkY21kID0gcXF7cy9eKDs7IFZlcnNpb246KVxccysoXFxTKylb IFx0XSpcJC9cJDEgJHZlcnNpb24vO3MvXihcXChkZWZjb25zdCBvcmctdmVyc2lvbiApIihcXFMr KSIvXCQxIiR2ZXJzaW9uIi99OwogICAkYzEgPSAicGVybCAtcGkgLWUgJyRjbWQnIGxpc3AvKi5l bCI7CiAgIHN5c3RlbSgkYzEpOworfQogCi0gIHByaW50IFNUREVSUiAiZG9jL29yZy50ZXhpXG4i OworaWYgKCRhbGwgb3IgJG9yZ190ZXhpX29wdCkgeworICBpZiAobm90ICIkb3JnX3RleGlfZmls ZSIpIHsKKyAgICAkb3JnX3RleGlfZmlsZSA9ICJkb2Mvb3JnLnRleGkiOworICB9CisgIHByaW50 IFNUREVSUiAiJG9yZ190ZXhpX2ZpbGVcbiI7CiAgICRjbWQgPSBxcXtzL14oXFxcQHNldCBWRVJT SU9OKVxccysoXFxTKylbIFx0XSpcJC9cJDEgJHZlcnNpb24vO3MvXihcXFxAc2V0IERBVEUpXFxz KyguKilcJC9cJDEgJGRhdGUvO307Ci0gICRjMSA9ICJwZXJsIC1waSAtZSAnJGNtZCcgZG9jL29y Zy50ZXhpIjsKKyAgJGMxID0gInBlcmwgLXBpIC1lICckY21kJyAnJG9yZ190ZXhpX2ZpbGUnIjsK ICAgc3lzdGVtKCRjMSk7Cit9CiAKK2lmICgkYWxsKSB7CiAgIHByaW50IFNUREVSUiAiZG9jL29y Z2d1aWRlLnRleGlcbiI7CiAgICRjbWQgPSBxcXtzL14oXFxcQHNldCBWRVJTSU9OKVxccysoXFxT KylbIFx0XSpcJC9cJDEgJHZlcnNpb24vO3MvXihcXFxAc2V0IERBVEUpXFxzKyguKilcJC9cJDEg JGRhdGUvO307CiAgICRjMSA9ICJwZXJsIC1waSAtZSAnJGNtZCcgZG9jL29yZ2d1aWRlLnRleGki OwogICBzeXN0ZW0oJGMxKTsKK30KIAoraWYgKCRhbGwpIHsKICAgcHJpbnQgU1RERVJSICJkb2Mv b3JnY2FyZC50ZXhcbiI7CiAgICRjbWQgPSBxcXtzL15cXFxcZGVmXFxcXG9yZ3ZlcnNpb25udW1i ZXJcXHtcXFMrXFx9L1xcXFxkZWZcXFxcb3JndmVyc2lvbm51bWJlcnskdmVyc2lvbn0vO3MvXFxc XGRlZlxcXFx2ZXJzaW9ueWVhclxce1xcUytcXH0vXFxcXGRlZlxcXFx2ZXJzaW9ueWVhcnskeWVh cn0vO3MvXFxcXGRlZlxcXFx5ZWFyXFx7XFxTK1xcfS9cXFxcZGVmXFxcXHllYXJ7JHllYXJ9Lzt9 OwogICAkYzEgPSAicGVybCAtcGkgLWUgJyRjbWQnIGRvYy9vcmdjYXJkLnRleCI7CiAgIHN5c3Rl bSgkYzEpOworfQogCitpZiAoJGFsbCkgewogICBwcmludCBTVERFUlIgIlJFQURNRV9ESVNUXG4i OwogICAkY21kID0gcXF7cy9eKFRoZSB2ZXJzaW9uIG9mIHRoaXMgcmVsZWFzZSBpczopXFxzKyhc XFMrKVsgXHRdKlwkL1wkMSAkdmVyc2lvbi87fTsKICAgJGMxID0gInBlcmwgLXBpIC1lICckY21k JyBSRUFETUVfRElTVCI7CmRpZmYgLS1naXQgYS9saXNwL29yZy5lbCBiL2xpc3Avb3JnLmVsCmlu ZGV4IDFjYTAzZjQuLjZjMjA3MDUgMTAwNjQ0Ci0tLSBhL2xpc3Avb3JnLmVsCisrKyBiL2xpc3Av b3JnLmVsCkBAIC0yMTQsNyArMjE0LDYgQEAgV2l0aCBwcmVmaXggYXJnIEhFUkUsIGluc2VydCBp dCBhdCBwb2ludC4iCiAJICAgICAgKHdpdGgtY3VycmVudC1idWZmZXIgIipTaGVsbCBDb21tYW5k IE91dHB1dCoiCiAJCShnb3RvLWNoYXIgKHBvaW50LW1pbikpCiAJCShzZXRxIGdpdC12ZXJzaW9u IChidWZmZXItc3Vic3RyaW5nIChwb2ludCkgKHBvaW50LWF0LWVvbCkpKSkKLQkgICAgICAoc3Vi c3QtY2hhci1pbi1zdHJpbmcgPy0gPy4gZ2l0LXZlcnNpb24gdCkKIAkgICAgICAod2hlbiAoc3Ry aW5nLW1hdGNoICJcXFMtIgogCQkJCSAgKHNoZWxsLWNvbW1hbmQtdG8tc3RyaW5nCiAJCQkJICAg ImdpdCBkaWZmLWluZGV4IC0tbmFtZS1vbmx5IEhFQUQgLS0iKSkKLS0gCjEuNy40LjIKCg== --bcaec517a72a5a9ade04a4bfbffb--