From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KIHoMeQMTWFfTgAAgWs5BA (envelope-from ) for ; Fri, 24 Sep 2021 01:25:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id GN5tLeQMTWFffAAAbx9fmQ (envelope-from ) for ; Thu, 23 Sep 2021 23:25:24 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A26C9D90F for ; Fri, 24 Sep 2021 01:25:24 +0200 (CEST) Received: from localhost ([::1]:42372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTY5j-0006X7-QV for larch@yhetil.org; Thu, 23 Sep 2021 19:25:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTY50-0006Wz-19 for emacs-orgmode@gnu.org; Thu, 23 Sep 2021 19:24:38 -0400 Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a]:35540) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTY4x-0004No-S4 for emacs-orgmode@gnu.org; Thu, 23 Sep 2021 19:24:37 -0400 Received: by mail-qv1-xf2a.google.com with SMTP id f2so5254840qvx.2 for ; Thu, 23 Sep 2021 16:24:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=references:user-agent:from:to:cc:subject:date:in-reply-to :message-id:mime-version; bh=0c9Qq1t+VqYSvbMfc4swYjfzgoSqa8gxmuxKgfkIlcY=; b=KpClEOyDZcyGV/AHQzYdjFLj99rFAzncOF1fQGDS3KZxuyKe+7JCVuIew3Lxwz8da0 +eIv2AfJGR4BvFjonD1o06/Hp6pK4wZmL17Mbd3cohEU74whCiJ+yAK1vwH46ebqvUap ISEucPd92jgtvEZf1/2WsIXSD/EpZ0a4rLTbdQLVYJq6YVISb8nVKc60PSVawphSXwTV YisYNQdDwwugnmw+9xIvDL4vMOuzG9/6AMnr25KVnYQMQ9bwqegPjL0zURlrSg3XxAMd o/6eL5fIm2QHvplqNz0V3/UwJ+ThES+mo62nS3ifeZ5uaTWda/c9njbCjgqPIkgVaZam BlGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:references:user-agent:from:to:cc:subject:date :in-reply-to:message-id:mime-version; bh=0c9Qq1t+VqYSvbMfc4swYjfzgoSqa8gxmuxKgfkIlcY=; b=rUIIG30WpBPdv1QAgtb188ISZ2Eh6UPueAEERTCBgDjMCpPjKEv78eNptf/cNJTdWg /vceKlVB5YMN1Oj7WVb2CvUpOHtEmzKxYmmBV2TrBo56LOucRCo9Cv8grnmLezfRYDvO 8e7mbAdyKWr/w2Iv9jXgK/WfFJ7wNzsUrrvTo05AdLmJeu9mpPzxlwOM+lQykpgqRbub TmOnqajEwehGKZ2WaTpQHx5JH3OnmJx2nWqH+5XwTzeKpFogbkCe/6lSLX5e8Wz5qBFg nAoun4iOkZ15IHbBpY+Im4kj1FEJjyilVaMS7Pu+DFLGQ17Psce7PEgWHbSLHXhrpFPu Vsfg== X-Gm-Message-State: AOAM531g5rRAIGWHnGOHViIVkX1YRsZEsae4pcdC/egvZfJiAh/qzyB9 Z9Idrp/z08wX9XDVOjfvrlA= X-Google-Smtp-Source: ABdhPJxJxpUyRDQE6Q6OAgQmGjqKoSR0cYLPoZxAZwlyusQma6hQrdgYNQFWB1M6NIpXjMaGB/TXxA== X-Received: by 2002:a05:6214:6b0:: with SMTP id s16mr7209982qvz.61.1632439474717; Thu, 23 Sep 2021 16:24:34 -0700 (PDT) Received: from arch ([2601:82:c200:166d:afae:ebe6:a0e2:409e]) by smtp.gmail.com with ESMTPSA id u189sm5135466qkh.14.2021.09.23.16.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Sep 2021 16:24:34 -0700 (PDT) References: <87y27nt29u.fsf@gmail.com> <87a6k33p7w.fsf@kyleam.com> User-agent: mu4e 1.7.0; emacs 28.0.50 From: No Wayman To: Kyle Meyer Subject: Re: Switching to new Git repositories Date: Thu, 23 Sep 2021 19:13:45 -0400 In-reply-to: <87a6k33p7w.fsf@kyleam.com> Message-ID: <87tuiaub7y.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2607:f8b0:4864:20::f2a; envelope-from=iarchivedmywholelife@gmail.com; helo=mail-qv1-xf2a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wtd@pobox.com, marcowahlsoft@gmail.com, emacs-orgmode@gnu.org, eibhear.geo@gmail.com Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; none X-Migadu-Queue-Id: A26C9D90F X-Spam-Score: -4.00 X-Migadu-Scanner: scn1.migadu.com X-TUID: iQVLPLPJFxua --=-=-= Content-Type: text/plain; format=flowed Kyle Meyer writes: > On 09/23/21 17:17:48 -0400, No Wayman wrote: > It looks like you've unintentionally added a ')' to the end of > the > GITVERSION line. Apologies. Must've been a stray. > Another approach would be to update org.el's version to contain > something that still signals "-dev" but won't trigger the > "Invalid > version syntax" (which, based on grepping the Emacs repo, is > signaled by > version-to-list). But given that in the current setup a clone > with tags > wouldn't use the header version, stripping -dev for consistency > sounds > like the way to go. I agree we should keep it simple and consistent. Out of curiosity I ran this against the repo to see if the "Version" metadata had always followed its current convention: git grep "Version:" $(git rev-list --all) -- lisp/org.el Looks like the "-dev" suffix goes back to "9.4-dev" and before that we have "8.4-git" and "6.08-pre01". I'm not sure what Org's convention is here, but the patsubst could be adjusted to be more flexible if necessary. I tried to be more concrete with the commit message. See attached. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-mk-targets.mk-Fix-ORGVERSION-in-tag-less-repos.patch >From 164029cb66eed8d47d7eb69d449660964749195d Mon Sep 17 00:00:00 2001 From: Nicholas Vollmer Date: Thu, 23 Sep 2021 17:13:34 -0400 Subject: [PATCH] mk/targets.mk: Fix ORGVERSION in tag-less repos * mk/targets.mk (ORGVERSION, GITVERSION): trim "-dev" suffix from ORGVERSION. 61336f80 uses org.el's Version metadata to generate ORGVERSION when the source repository has no tags. This can result in an org-version of "Major.Minor-dev". The "-dev" suffix is not recognized by `version-to-list' as a valid version syntax because it is not part of `version-regexp-alist'. --- mk/targets.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/targets.mk b/mk/targets.mk index 693e3781f..ee6f3f344 100644 --- a/mk/targets.mk +++ b/mk/targets.mk @@ -15,8 +15,8 @@ ifneq ($(wildcard .git),) ifeq ($(ORGVERSION),) # In elpa.git, there are no tags available. Fall back to using # the org.el header. - ORGVERSION := $(shell $(BATCH) --eval "(require 'lisp-mnt)" \ - --visit lisp/org.el --eval '(princ (lm-header "version"))') + ORGVERSION := $(patsubst %-dev,%,$(shell $(BATCH) --eval "(require 'lisp-mnt)" \ + --visit lisp/org.el --eval '(princ (lm-header "version"))')) GITVERSION ?= $(ORGVERSION)-g$(shell git rev-parse --short=6 HEAD) else GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD) -- 2.33.0 --=-=-=--