From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id GJFgGahoX2SiIQAASxT56A (envelope-from ) for ; Sat, 13 May 2023 12:38:32 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id qNeAGKhoX2TqRgAAG6o9tA (envelope-from ) for ; Sat, 13 May 2023 12:38:32 +0200 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 22484353C5 for ; Sat, 13 May 2023 12:38:32 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxmdb-0008ON-Rc; Sat, 13 May 2023 06:38:07 -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 1pxmdZ-0008NQ-VX for guix-patches@gnu.org; Sat, 13 May 2023 06:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxmdZ-0001Vr-HX; Sat, 13 May 2023 06:38:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxmdX-00054J-83; Sat, 13 May 2023 06:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63483] [PATCH 3/4] self: Update po4a process. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 13 May 2023 10:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63483 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63483@debbugs.gnu.org Cc: gemmaro , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 63483-submit@debbugs.gnu.org id=B63483.168397423719409 (code B ref 63483); Sat, 13 May 2023 10:38:03 +0000 Received: (at 63483) by debbugs.gnu.org; 13 May 2023 10:37:17 +0000 Received: from localhost ([127.0.0.1]:36058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxmcn-00052y-4c for submit@debbugs.gnu.org; Sat, 13 May 2023 06:37:17 -0400 Received: from mail-pl1-f171.google.com ([209.85.214.171]:61891) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxmci-00052D-NI for 63483@debbugs.gnu.org; Sat, 13 May 2023 06:37:13 -0400 Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1ab1b79d3a7so75335065ad.3 for <63483@debbugs.gnu.org>; Sat, 13 May 2023 03:37:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683974227; x=1686566227; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Rdv2lDxmW3NGtxHGlECRTeDMJJvqZDfGNnmLOSmIr08=; b=jnHoYVaMx57eLtWsS/m0X23olg19oO+8vvcXZ5+9VowU7/3dEGMOv8JZ3phE+w926q pRPqQeD66QujNpIbYteZ6yjwHHpGRO0jdHFUxVDbV8wDoez0YcwzAl7cqBI3JS+1tEcj EofwAO7zU/RGSS85QPSzxUMrDaIUaU/R/DQ5yp9O9UQ9B0it59qXX9CR9mvpx4JHRcPE T9JiywMtwP/aOaISjcucdJmbXQOmU4hCw1pGfQGuU2yc+pqnXh5tJC3SECeXbkC6hwAj nnWsz/Tx0pjAE5QXUkA9dIDguAGUrmRe8qy8toIaZ1XS22RURAfDWHk5F0+lHgl3GkNq cCsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683974227; x=1686566227; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Rdv2lDxmW3NGtxHGlECRTeDMJJvqZDfGNnmLOSmIr08=; b=g8ELz6/3HhMFOu7VcM4Y7SuaoLNq9K2149XqYUpwUmX8xwkaW/iquLWW+S3479C+/m kwZUB3/Yrec1HvPZJg5cwSNiDVxZUx5L9XU+gBF/j/UIE4oGG+0TI83IfLh5C+1uYWka 7djpbnrPdtiHBhO9bZvs5lsSV5RE4AIGgSwV/7bMAkG00fR3L8nos6NXHDUwIZlb46qt 3UZUtzqeahOfeghDCul3jrJ2eeXjeYBaTlqbSlndYGxSXsNuv8Stxer9k9Y/uamCjGMP c973XDL1OFHW8i0ycdv/uvtaRlcsplSp1/9G13iDB9IidY6KiQgYB71GKDswLz1hIOj+ 8aiA== X-Gm-Message-State: AC+VfDzDjAiKcB9wmTBuWe9lYSDj7I5nU9sAN5cxeaSo3UOkk+fuqLdx hL+AyPyC6XNblsWoEIUyGpVryMpsemKf5w== X-Google-Smtp-Source: ACHHUZ7HgwX8cFpJoL4l0Xa29Mqx8lVTurKbNGoAAm+webxthl347ZLwqHeIOtkFXbyCcqa2F5PlZw== X-Received: by 2002:a17:903:230e:b0:1ad:164:74ee with SMTP id d14-20020a170903230e00b001ad016474eemr15288680plh.15.1683974226982; Sat, 13 May 2023 03:37:06 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id 3-20020a170902c10300b001aaed524541sm9483236pli.227.2023.05.13.03.37.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 03:37:06 -0700 (PDT) From: gemmaro Date: Sat, 13 May 2023 19:36:15 +0900 Message-Id: <4f073db4782e3250c3988c7129938765ffe0e0ee.1683969802.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.39.2 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683974312; a=rsa-sha256; cv=none; b=HCQdeOoJC0kapkY1Ef9AOLrAbq6NFUdSXlTnVaY+YWt2vVz4JNTR0fGt8DgMziqP6hmzJ6 I/RKD+Fu1wyMU6nV5IDGVit9Ie5oCfe+4IwjmtznawcjBeT8ncu+1GKM3nIdJHxkeLvfyP Vfc+pZ3JNknL7Hgs4XZgVcfnW4/+vpNc/mfkpUaQYtnzQzIriegFvI9Fm3F3XMaKU1PfqB DoURsklSH5Ol/qyt+Ql6mDaFY8Hp9vx+p4hcXF3xjQQReVZ9I0wY3d7FBn3ki2GJ7BOh3B 3IMoPnxjZWSxv6T/e4p2706MeYuwXSEmcKtOS3Fk+v1lcDoMEd6PP945kZrvug== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=jnHoYVaM; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683974312; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=Rdv2lDxmW3NGtxHGlECRTeDMJJvqZDfGNnmLOSmIr08=; b=kFkhp7fgXz61gzYAaOomHXT2Nz9EH057DXJIDmYITEVHZkL1YnIK/4d9c4TA858lIWnjsS QrUgxMgFgJDq0hbQdrZwfWrPVtGRmeQcQ0VojIJ7ulKwxBM2IxYg2KrPNgTO0tMDB7/zPA YGN4Jx5ml6qw80pPhHEWokEatbgmTgsEq2xbyXNwB8Zc9LHsIKHE+fF5XHP22Hi1X59oCX eRXXRzfxM1eq1QYwyD+YoPA2mPYwj/31KDS6lQQZW1SZlU8JwALnIU/fICjT0VOo5+OJ06 VWbMcTIyw/wIc4f3s6hqUCQljp4lXAhvOBXCq4cuGx6RRBMCRxTTvdgRvjUHvQ== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=jnHoYVaM; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" X-Migadu-Spam-Score: 7.32 X-Spam-Score: 7.32 X-Migadu-Queue-Id: 22484353C5 X-TUID: 8Mlkde9Na4lV --- guix/self.scm | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/guix/self.scm b/guix/self.scm index 74c953bd50e..c9fedae0ea3 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017-2022 Ludovic Courtès ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2023 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -307,12 +308,14 @@ (define (translate-texi-manuals source) (ice-9 vlist) (ice-9 threads) (srfi srfi-1)) - (define (translate-tmp-texi po source output) - "Translate Texinfo file SOURCE using messages from PO, and write -the result to OUTPUT." - (invoke #+(file-append po4a "/bin/po4a-translate") - "-M" "UTF-8" "-L" "UTF-8" "-k" "0" "-f" "texinfo" - "-m" source "-p" po "-l" output)) + (define (translate-tmp-texi) + "Translate Texinfo files using messages from PO, except for cross +references." + (invoke #+(file-append po4a "/bin/po4a") + "--no-update" + (string-append "--srcdir=" #$source) + "--destdir=." + #+(file-append documentation-po "/po4a.cfg"))) (define (canonicalize-whitespace str) ;; Change whitespace (newlines, etc.) in STR to #\space. @@ -322,17 +325,11 @@ (define (translate-texi-manuals source) chr)) str)) - (define* (translate-texi prefix po lang - #:key (extras '())) - "Translate the manual for one language LANG using the PO file. -PREFIX must be the prefix of the manual, 'guix' or 'guix-cookbook'. EXTRAS is -a list of extra files, such as '(\"contributing\")." - (for-each (lambda (file) - (translate-tmp-texi po (string-append file ".texi") - (string-append file "." lang - ".texi.tmp"))) - (cons prefix extras)) - + (define* (translate-texi-xrefs prefix po lang + #:key (extras '())) + "Translate cross references in the manual for one language LANG using the +PO file. PREFIX must be the prefix of the manual, 'guix' or 'guix-cookbook'. EXTRAS +is a list of extra files, such as '(\"contributing\")." (for-each (lambda (file) (let* ((texi (string-append file "." lang ".texi")) (tmp (string-append texi ".tmp"))) @@ -374,17 +371,19 @@ (define (translate-texi-manuals source) (setenv "LC_ALL" "en_US.UTF-8") (setlocale LC_ALL "en_US.UTF-8") + (translate-tmp-texi) + (n-par-for-each parallel-jobs (match-lambda ((language . po) - (translate-texi "guix" po language - #:extras '("contributing")))) + (translate-texi-xrefs "guix" po language + #:extras '("contributing")))) (available-translations "." "guix-manual")) (n-par-for-each parallel-jobs (match-lambda ((language . po) - (translate-texi "guix-cookbook" po language))) + (translate-texi-xrefs "guix-cookbook" po language))) (available-translations "." "guix-cookbook")) (for-each (lambda (file) -- 2.39.2