From patchwork Mon Apr 15 14:27:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 63049 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0AC8D27BBEA; Mon, 15 Apr 2024 15:29:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D783527BBE9 for ; Mon, 15 Apr 2024 15:29:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwNKI-0004Cn-Mi; Mon, 15 Apr 2024 10:28:54 -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 1rwNKH-0004CN-5Q for guix-patches@gnu.org; Mon, 15 Apr 2024 10:28:53 -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 1rwNKG-0005rH-TM for guix-patches@gnu.org; Mon, 15 Apr 2024 10:28:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwNKS-0007YN-JC for guix-patches@gnu.org; Mon, 15 Apr 2024 10:29:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70380] [PATCH v2 2/3] Revert "maint: Generate 'doc/version-LANG.texi' reproducibly." Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 14:29:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70380@debbugs.gnu.org Received: via spool by 70380-submit@debbugs.gnu.org id=B70380.171319131728848 (code B ref 70380); Mon, 15 Apr 2024 14:29:04 +0000 Received: (at 70380) by debbugs.gnu.org; 15 Apr 2024 14:28:37 +0000 Received: from localhost ([127.0.0.1]:37575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwNJy-0007Uw-Q4 for submit@debbugs.gnu.org; Mon, 15 Apr 2024 10:28:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwNJk-0007Rg-6M for 70380@debbugs.gnu.org; Mon, 15 Apr 2024 10:28:24 -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 1rwNJT-0005l6-56; Mon, 15 Apr 2024 10:28:03 -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=8AejkK/u0zFIXXzdUR6ZcSPHi28dhCnV3kGEsT1Cpwc=; b=J0+jKT/OH+B2eSgMmw9D K9vJw+UwB95rBCc4Qi2L4JmxTXG50xju05uzQ9+6/zFRdM1APdlq6YE6n24QNh50i+WNYxkOcy506 X5ckpeSFTaRBRqLIYAzL+HarNdn8gye5TM6xQ9e7clp5WeBQ/i0FJ3z/xX579o4SgD6SnmgM/Zf8l Q2Wgxo6bZtckg6zs356G4WU30kf7GQiDoWKhXDbgBH58Wv53IHNuWJPS6aYOQqPQXysbIKwuya6Ta uuGS+aFndl7HMMxb2HRGThwsaPWoB1jDAh6w8/CHZrjMg7ACqnTN9nJhM5SABFH2E/jIVNJ2gmbMh CAlOwHsXcVzBnA==; From: Janneke Nieuwenhuizen Date: Mon, 15 Apr 2024 16:27:47 +0200 Message-ID: <70a03da06dc3a247d0b91807d0f3b9c160632dda.1713190364.git.janneke@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Using `build-aux/mdate-from-git.scm' makes this no longer necessary. This reverts commit 0e4ead187d83a958ca0deb54857c04967e84d68b. Change-Id: I9177828f90fa7f7e256bc72fdff35a2fab355780 --- doc/local.mk | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/doc/local.mk b/doc/local.mk index 130f40ece9..77d48902b6 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -260,32 +260,26 @@ endif # Reproducible tarball -# 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 LANG=C LANGUAGE=C LC_ALL=C LC_TIME=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 -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: +# Generate 'version.texi' reproducibly using metadata from Git rather than +# using metadata from the filesystem. This is 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' +$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure + $$(AM_V_GEN)set -e; \ + export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=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 + i:=0 $(eval $(call version.texi-from-git,vti,doc/guix.texi,)) $(foreach lang, $(MANUAL_LANGUAGES), \