From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 2CjCIxE8FGay6QAAe85BDQ:P1 (envelope-from ) for ; Mon, 08 Apr 2024 20:48:49 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 2CjCIxE8FGay6QAAe85BDQ (envelope-from ) for ; Mon, 08 Apr 2024 20:48:49 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=U57Cmsqq; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1712602129; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=3A0ZRc505yJuHw8CskaMf8wsBklV/lT0oENNS1xPYKc=; b=EBomAxZIb5ELrBq3VC1eX2NAI+klU3ruvY+x4dZo5gLQrqVdJqOka0WRRqwDovmdGnm+f1 uJ6fRxfD6Udhy2lwZ9qgHThhxvOh1Kj6BZ4UUS3vHUDfWXXZQ1Bru7RwRFu/TO17IWplFN 6Y++fQS13f3Nvvp0RDQY0x1Xs/5P8p8LpRLizZxb87xyLx5+Kr5Zjc9J6Jdh7g+d+R3K1W Nn1JZZShYqX+0PGGSfnNkPV5F4LKR+L/qpEtlicS1MBthgKD3zAy1uAxWDDkwh8ULBbYGT u+j0RB3Y3df6305Jtx0UhaL6lafD2fziHFntCFQCiBp0c57/H5/rxGwfnShCKw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1712602129; a=rsa-sha256; cv=none; b=JQIE5KciZl4n3OTEA4kofgjM4Ed50Lmxh9wiUPqoDme/LeS6B6LyP6duDugjjCxMrNLFHP Fsp5X7NtL1T/VrBOr0YU+rAEAwZmfEHfWGVloPvtvZCo9CmiVZgKpLsz8PTAQsIfEMnWaO mJ9AbbBIG8ouv80Oodsyox5XQZxdiYb3iBVoXaIPM7XnExnlGHmpVJoxjAq9LR+p/wZRm5 IeP8fChxp1CPM0F5lpuE5Rui74M6eRiz6pBJP6ifVFMbMaIWmFN9jYa/dm4ohb98zC3HLk xNalGKQwyFcS/HtpTgVXAe5buwOjYwIxec14MMoBqps/KHWysdzWSGs/+Omiug== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=U57Cmsqq; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org 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 5D09165FEC for ; Mon, 8 Apr 2024 20:48:49 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtu2D-00044i-0j; Mon, 08 Apr 2024 14:48:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rtu29-00042o-ID for guix-patches@gnu.org; Mon, 08 Apr 2024 14:47:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rtu29-00056X-9w for guix-patches@gnu.org; Mon, 08 Apr 2024 14:47:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtu2G-0005XA-RK for guix-patches@gnu.org; Mon, 08 Apr 2024 14:48:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70169] [PATCH v3 07/13] maint: Generate 'doc/version-LANG.texi' reproducibly. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Apr 2024 18:48:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70169@debbugs.gnu.org Received: via spool by 70169-submit@debbugs.gnu.org id=B70169.171260206020974 (code B ref 70169); Mon, 08 Apr 2024 18:48:04 +0000 Received: (at 70169) by debbugs.gnu.org; 8 Apr 2024 18:47:40 +0000 Received: from localhost ([127.0.0.1]:47654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtu1r-0005Rx-3W for submit@debbugs.gnu.org; Mon, 08 Apr 2024 14:47:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtu1o-0005R6-7n for 70169@debbugs.gnu.org; Mon, 08 Apr 2024 14:47:36 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rtu1b-00052M-CS; Mon, 08 Apr 2024 14:47:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=3A0ZRc505yJuHw8CskaMf8wsBklV/lT0oENNS1xPYKc=; b=U57CmsqqiwM7ALhP1OxE HkByLw5JZbPoGQxYAqrw98PFgCrynzwH/haamNgNq0paC4rIlRR4vE6IxPUexJ85QSW53J6VsCPUo e5UXnvImwOlqmxyxbgaaacqLfhSVAue27YqZKTqSOYiT440lCWFxLX1uH7zQhqnO/eCg0k/1WXZvW bTKZK95hJwe9O3USS6sezrQOlDDOBxAu+9dbGACKYvGK44xPWX5xvS02nwq5js7N2bkdzU9of64Z3 W/35Bw2Bk76M464Dxn45akzaUDs1Y2xBZ9nIbqKCX32u2U0afwNHVXfno84oClDJfA8O7gPWxV4Su yJIpRSnvYvdPBA==; From: Janneke Nieuwenhuizen Date: Mon, 8 Apr 2024 18:46:50 +0000 Message-ID: <599132e3c89700ae3f29d97460c0f94048cf291e.1712600307.git.janneke@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.07 X-Spam-Score: -6.07 X-Migadu-Queue-Id: 5D09165FEC X-Migadu-Scanner: mx12.migadu.com X-TUID: 5lOYT2GovDDZ * doc/local.mk ($(srcdir)/doc/stamp-vti): Change rule into... (version.texi-from-git): ...this new function. Call it with vti,guix.texi,; and for all MANUAL_LANGUAGES with $(i),po/doc/guix-manual.$(lang).po, -$(lang.po). Change-Id: Ia8df618178066cad320eecea0299337224e23a73 --- doc/local.mk | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/doc/local.mk b/doc/local.mk index 595710a5b8..7a9840187a 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -6,6 +6,7 @@ # Copyright © 2016, 2018 Mathieu Lirzin # Copyright © 2018, 2021 Julien Lepiller # Copyright © 2019 Timothy Sample +# Copyright © 2024 Janneke Nieuwenhuizen # # This file is part of GNU Guix. # @@ -254,19 +255,34 @@ endif # Reproducible tarball -# Generate 'version.texi' reproducibly using metadata from Git rather -# than using metadata from the filesystem. -$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure - $(AM_V_GEN)set -e \ +# Define a rule to build `version[LANG].texi' reproducibly using metadata from +# Git rather than using metadata from the filesystem. +define version.texi-from-git +$(srcdir)/doc/stamp-$(1): $(srcdir)/$(2) $(top_srcdir)/configure + $$(AM_V_GEN)set -e \ export LC_ALL=C; \ export TZ=UTC0; \ - timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \ - || echo $(SOURCE_DATE_EPOCH)) \ - dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \ - my=$$(date --date="@$$timestamp" "+%B %Y"); \ - { echo "@set UPDATED $$dmy"; \ - echo "@set UPDATED-MONTH $$my"; \ - echo "@set EDITION $(VERSION)"; \ - echo "@set VERSION $(VERSION)"; } > $@-t; \ - mv $@-t $@ - @cp $@ $(srcdir)/doc/version.texi + timestamp="$$$$(git log --pretty=format:%ct -n1 -- "$$<" \ + 2>/dev/null \ + || echo $$(SOURCE_DATE_EPOCH))" \ + dmy=$$$$(date --date="@$$$$timestamp" "+%-d %B %Y"); \ + my=$$$$(date --date="@$$$$timestamp" "+%B %Y"); \ + { echo "@set UPDATED $$$$dmy"; \ + echo "@set UPDATED-MONTH $$$$my"; \ + echo "@set EDITION $$$(VERSION)"; \ + echo "@set VERSION $$$(VERSION)"; } > "$$@-t"; + mv "$$@-t" "$$@" + cp -p "$$@" "$$(srcdir)/doc/version$(3).texi" +endef + +# Generate rules for stamp-vti and stamp-N that create version.texi and +# version-LANG.texi to override the Autotools versions that use timestamps +# embedded in the file-system. These are expected to generate warnings: +# +# Makefile:7376: warning: overriding recipe for target 'doc/stamp-vti' +# Makefile:5098: warning: ignoring old recipe for target 'doc/stamp-vti' +i:=0 +$(eval $(call version.texi-from-git,vti,doc/guix.texi,)) +$(foreach lang, $(MANUAL_LANGUAGES), \ + $(eval i=$(shell echo $$(($(i)+1)))) \ + $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po,-$(lang)))) -- 2.41.0