From patchwork Wed Apr 17 09:53:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 63105 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 5DDB227BBEA; Wed, 17 Apr 2024 10:55:36 +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 A640D27BBE9 for ; Wed, 17 Apr 2024 10:55:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rx20M-0004l9-QY; Wed, 17 Apr 2024 05:55:02 -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 1rx20K-0004kB-83 for guix-patches@gnu.org; Wed, 17 Apr 2024 05:55:00 -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 1rx20I-0006lS-Il for guix-patches@gnu.org; Wed, 17 Apr 2024 05:54:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rx20V-0005O2-5k for guix-patches@gnu.org; Wed, 17 Apr 2024 05:55:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70380] [PATCH v3 2/4] maint: Generate doc/version[-LANG].texi using `mdate-from-git.scm'. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Apr 2024 09:55:10 +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.171334766120177 (code B ref 70380); Wed, 17 Apr 2024 09:55:10 +0000 Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 09:54:21 +0000 Received: from localhost ([127.0.0.1]:45803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rx1zg-0005F5-05 for submit@debbugs.gnu.org; Wed, 17 Apr 2024 05:54:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rx1zK-0005A5-Ux for 70380@debbugs.gnu.org; Wed, 17 Apr 2024 05:54:05 -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 1rx1z2-0006ey-BA; Wed, 17 Apr 2024 05:53:40 -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=sVDCoqtAM4adlxC6uod3PnFyYqEQbxGaRNsCC4styP4=; b=nwNsBZS4MnknhkOsXRix qxjOoFFWBcN1qn1PZv/4n+PiuqCJfInwik2sk4GglDOjMWGlratdGHfBxHCHZk3c6gkNtmlXdWxoR VqE7XRDsTnG4bh5NhPnxG31E4AQDwZX4bF0eXO0yfH8q41R32e+Oy4telcObQLujTCcmdTwngmuqo pB/48j/a4s9iyAwfibmilgz+5ywS25Sq6GXcaaezziiBOk65vqzgqvYA4SIOAmylg25IlquK49Smr oZYx66WVt6+GhGphAUgmMBmkTooICFeeJi494NZxMyhMQ+Z9Vh4CAYCTpj1qy1XmcVXeM1dUB8MP5 gNBOcRl2cgYHbA==; From: Janneke Nieuwenhuizen Date: Wed, 17 Apr 2024 11:53:29 +0200 Message-ID: <93b2d3b1b675dfd3018d0b3005d19bdbdd97b629.1713340673.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 This replaces Automake's `build-aux/mdate-sh' with our own `build-aux/mdate-from-git.scm' to use reproducible timestamps from Git instead. * build-aux/mdate-from-git.scm: New script. * bootstrap: Use it to replace build-aux/mdate-sh. * Makefile.am (EXTRA_DIST): Add it. Change-Id: I17d0a7de9ffea397129c0db1728f86e28a4e245f --- Makefile.am | 1 + bootstrap | 8 +++- build-aux/mdate-from-git.scm | 86 ++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100755 build-aux/mdate-from-git.scm diff --git a/Makefile.am b/Makefile.am index 39cf4b4b17..1de8149772 100644 --- a/Makefile.am +++ b/Makefile.am @@ -723,6 +723,7 @@ EXTRA_DIST += \ build-aux/config.rpath \ build-aux/convert-xref.scm \ build-aux/generate-authors.scm \ + build-aux/mdate-from-git.scm \ build-aux/test-driver.scm \ build-aux/update-NEWS.scm \ build-aux/update-guix-package.scm \ diff --git a/bootstrap b/bootstrap index de024aeaa5..5bf83175e5 100755 --- a/bootstrap +++ b/bootstrap @@ -24,4 +24,10 @@ for lang in ${langs}; do fi done -exec autoreconf -vfi +autoreconf -vfi + +# Replace Automake's build-aux/mdate-sh with build-aux/mdate-from-git, our +# own, reproducible version. +chmod +w build-aux/mdate-sh +rm -f build-aux/mdate-sh +ln -s mdate-from-git.scm build-aux/mdate-sh diff --git a/build-aux/mdate-from-git.scm b/build-aux/mdate-from-git.scm new file mode 100755 index 0000000000..abe7e97f32 --- /dev/null +++ b/build-aux/mdate-from-git.scm @@ -0,0 +1,86 @@ +#! /bin/sh +# -*-scheme-*- +export LANG=C LANGUAGE=C LC_TIME=C +export TZ=UTC0 +exec guile --no-auto-compile -L $srcdir -C $srcdir -e '(mdate-from-git)' -s "$0" "$@" +!# + +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2024 Janneke Nieuwenhuizen +;;; +;;; This file is part of GNU Guix. +;;; +;;; This program is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; This program is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with this program. If not, see . + +;;;; Commentary: +;;; +;;; Usage: mdate-from-git.scm FILE +;;; +;;; This script is compatible with Automake's `mdate-sh' but uses the timestamp +;;; from Git instead of from the file system. Also, it can be appended to +;;; mdate-sh. + +;;; As a special exception for Guix, it caters for doc/guix.LANG.texi files that +;;; are not stored in Git, by using po/doc/guix-manual.LANG.po for the Git +;;; timestamp. Test doing something like: +;;; +;;; build-aux/mdate-from-git.scm doc/guix.de.texi +;;; +;;;; Code: + +(define-module (mdate-from-git) + #:use-module (ice-9 match) + #:use-module (ice-9 popen) + #:use-module (ice-9 rdelim) + #:use-module (ice-9 regex) + #:export (main)) + +(define (pipe-command command) + (let* ((port (apply open-pipe* OPEN_READ command)) + (output (read-string port))) + (close-port port) + output)) + +(define (guix.LANG.texi->guix-manual.LANG.po file-name) + "Translated manuals doc/guix.LANG.texi are not tracked in Git and are +generated from po/doc/guix-manual.LANG.po. For such an untraced .TEXI file, +return its .PO counterpart." + (let ((m (string-match "doc/guix.([^.]+).texi" file-name))) + (if (not m) file-name + (let ((lang (match:substring m 1))) + (format #f "po/doc/guix-manual.~a.po" lang))))) + + +;;; +;;; Entry point. +;;; +(define (main args) + (match args + ((script file-name) + (let* ((command `("git" "ls-files" "--error-unmatch" "--" ,file-name)) + (tracked? (zero? (with-error-to-port (%make-void-port "w") + (lambda _ (apply system* command))))) + (file-name (if tracked? file-name + (guix.LANG.texi->guix-manual.LANG.po file-name))) + (command `("git" "log" "--pretty=format:%ct" "-n1" "--" ,file-name)) + (timestamp (pipe-command command)) + (source-date-epoch (or (getenv "SOURCE_DATE_EPOCH") "1")) + (timestamp (if (string-null? timestamp) source-date-epoch + timestamp)) + (time (gmtime (string->number timestamp))) + (d-m-y (strftime "%-d %B %Y" time))) + (display d-m-y))) + (_ + (format (current-error-port) "Usage: mdate-from-git.scm FILE\n") + (exit 2))))