From patchwork Wed Apr 17 19:08:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 63106 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 B6CB927BBE9; Wed, 17 Apr 2024 20:10:11 +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 6B9CE27BBEA for ; Wed, 17 Apr 2024 20:10:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxAfJ-0002uy-F4; Wed, 17 Apr 2024 15:09:53 -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 1rxAfI-0002uf-DE for guix-patches@gnu.org; Wed, 17 Apr 2024 15:09:52 -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 1rxAfI-0003Ju-4Y for guix-patches@gnu.org; Wed, 17 Apr 2024 15:09:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rxAfV-0000am-0F for guix-patches@gnu.org; Wed, 17 Apr 2024 15:10:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70380] [PATCH v4 2/6] maint: Support `make doc-po-update' from tarball. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Apr 2024 19:10: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.17133809591841 (code B ref 70380); Wed, 17 Apr 2024 19:10:04 +0000 Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 19:09:19 +0000 Received: from localhost ([127.0.0.1]:47601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxAek-0000TY-Gu for submit@debbugs.gnu.org; Wed, 17 Apr 2024 15:09:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxAei-0000Sx-HY for 70380@debbugs.gnu.org; Wed, 17 Apr 2024 15:09:16 -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 1rxAeQ-0003Bh-6c; Wed, 17 Apr 2024 15:08:58 -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=ztA12dl/aUWyzZ8vc5YZx7nLhgxmYPtod4DsYEXdpUk=; b=cEFvvFTwOSrDa0miH/V6 WfQ0XEann1iTO3fPMJC2HHdhKjQF5wpHj1ENskvt+4fXDJ50fqXJ5tgBTpKybYYCzhaEl/nsrO/K9 akpjcjIndrAXECaB3952klHN7AlRCzoq2bHVfIkRy5EwF2jcl3wehOboDPqsq7VI/4RIBZtxTTma6 yY2N4ybpOOlxhunThz48CUOMETdYrBH0/Y8ExW6X5YLDy5FJMDFIDzuvG4gOxIXXEtBvLJRcMbJ8N 5OjgWJ/uaDAMdvxij5CIB8py7g7NQWLbnaPjJ/CWemcoobXujSE62QO4ZRoufbdOQPTgZatexMljZ MxN7RkUi+zyuyw==; From: Janneke Nieuwenhuizen Date: Wed, 17 Apr 2024 21:08:46 +0200 Message-ID: <8c9f63715e8d7613c4a23fcccf828ccb5b323dae.1713379858.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 * build-aux/xgettext.scm: Move setting of environment variables to shell header. (main): Use SOURCE_DATE_EPOCH as fallback for timestamp. This fixes running from a tarball. * Makefile.am (EXTRA_DIST): Add it. Change-Id: Ic487587b22495868fd2a21545a13dc9e3458299c --- Makefile.am | 1 + build-aux/xgettext.scm | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 98008c528d..ca3fa0a693 100644 --- a/Makefile.am +++ b/Makefile.am @@ -727,6 +727,7 @@ EXTRA_DIST += \ build-aux/test-driver.scm \ build-aux/update-NEWS.scm \ build-aux/update-guix-package.scm \ + build-aux/xgettext.scm \ doc/build.scm \ etc/disarchive-manifest.scm \ etc/guix-install.sh \ diff --git a/build-aux/xgettext.scm b/build-aux/xgettext.scm index 44d30b8149..7142336a9d 100755 --- a/build-aux/xgettext.scm +++ b/build-aux/xgettext.scm @@ -2,6 +2,8 @@ # -*-scheme-*- build_aux=$(dirname $0) srcdir=$build_aux/.. +export LC_ALL=en_US.UTF-8 +export TZ=UTC0 exec guile --no-auto-compile -L $srcdir -C $srcdir -e main -s "$0" "$@" !# @@ -59,9 +61,6 @@ (define (pipe-command command) ;;; Entry point. ;;; (define (main args) - ;; Cater for being run in a container. - (setenv "LC_ALL" "en_US.UTF-8") - (setenv "TZ" "UTC0") (fluid-set! %default-port-encoding #f) (let* ((files-from (get-option args "--files-from=")) (default-domain (get-option args "--default-domain=")) @@ -82,9 +81,10 @@ (define (main args) (files (map (cute string-append directory "/" <>) files)) (git-command `("git" "log" "--pretty=format:%ci" "-n1" ,@files)) (timestamp (pipe-command git-command)) + (source-date-epoch (or (getenv "SOURCE_DATE_EPOCH") "1")) + (timestamp (if (string-null? timestamp) source-date-epoch + timestamp)) (po-file (string-append default-domain ".po"))) - (when (string-null? timestamp) - (exit 1)) (substitute* po-file (("(\"POT-Creation-Date: )[^\\]*" all header) (string-append header timestamp)))))))