From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Lepiller Subject: Re: [PATCH 1/2] bootstrap: Break automake dependency on generated files. (was Re: =?UTF-8?B?TGV04oCZcw==?= translate!) Date: Fri, 26 Apr 2019 20:55:23 +0200 Message-ID: <20190426205523.1e1134b3@sybil.lepiller.eu> References: <87zhovlztm.fsf@gnu.org> <87wojyllbk.fsf@riseup.net> <20190423024234.706dcc8a@gmail.com> <20190423024342.1abcff62@gmail.com> <39EC6770-B600-4529-81D3-3DB19119AD7D@lepiller.eu> <20190423122752.177e99e2@gmail.com> <20190426113004.13a26056@sybil.lepiller.eu> <20190426130514.6639920e@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/7XQOZCCJM1PJhggTq.I1=Qx" Return-path: Received: from eggs.gnu.org ([209.51.188.92]:36756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hK613-0002md-Jg for guix-devel@gnu.org; Fri, 26 Apr 2019 14:56:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hK60z-0005ah-Fs for guix-devel@gnu.org; Fri, 26 Apr 2019 14:56:07 -0400 In-Reply-To: <20190426130514.6639920e@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Miguel Cc: guix-devel@gnu.org --MP_/7XQOZCCJM1PJhggTq.I1=Qx Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Le Fri, 26 Apr 2019 13:05:14 +0200, Miguel a =C3=A9crit : > Hi, >=20 > El Fri, 26 Apr 2019 11:30:04 +0200 > Julien Lepiller escribi=C3=B3: > > Thank you! I've just pushed it and removed doc/guix.*.texi and > > doc/contributing.*.texi from the repository, added them > > to .gitignore too. =20 >=20 > Thank you very much, my emacs and magit will thank you too, as each > change in the manual was taking awfully long to refresh. :) >=20 > Best regards, > Miguel There was an issue introduced by that patch: the manual was not generated by guix pull anymore. The attached patch fixes that. WDYT? --MP_/7XQOZCCJM1PJhggTq.I1=Qx Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-self-Rebuild-translated-manuals.patch =46rom d93644846ff954c221c2510755766da3f0e27b5c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 26 Apr 2019 14:54:52 +0200 Subject: [PATCH] self: Rebuild translated manuals. * guix/self.scm (info-manual): Run po4a and related commands to generate translated texi files before building translated manuals. --- guix/self.scm | 116 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 1 deletion(-) diff --git a/guix/self.scm b/guix/self.scm index 2a10d1d25f..89d3212f52 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -60,6 +60,8 @@ ("gzip" (ref '(gnu packages compression) 'gzip)) ("bzip2" (ref '(gnu packages compression) 'bzip2)) ("xz" (ref '(gnu packages compression) 'xz)) + ("po4a" (ref '(gnu packages gettext) 'po4a)) + ("gettext" (ref '(gnu packages gettext) 'gettext-minimal)) (_ #f)))) ;no such package =20 =0C @@ -255,6 +257,12 @@ DOMAIN, a gettext domain." =20 (define (info-manual source) "Return the Info manual built from SOURCE." + (define po4a + (specification->package "po4a")) + + (define gettext + (specification->package "gettext")) + (define texinfo (module-ref (resolve-interface '(gnu packages texinfo)) 'texinfo)) @@ -270,6 +278,9 @@ DOMAIN, a gettext domain." (define documentation (file-append* source "doc")) =20 + (define documentation-po + (file-append* source "po/doc")) + (define examples (file-append* source "gnu/system/examples")) =20 @@ -277,6 +288,49 @@ DOMAIN, a gettext domain." (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils)) + (use-modules (ice-9 match)) + (use-modules (ice-9 peg)) + (use-modules (ice-9 regex)) + (use-modules (ice-9 textual-ports)) + (use-modules (srfi srfi-1)) + =20 + ;; A small parser for po files + (define-peg-pattern po-file body (* (or comment entry whitespace= ))) + (define-peg-pattern whitespace body (or " " "\t" "\n")) + (define-peg-pattern comment-chr body (range #\space #\=F0=AF=A7= =BF)) + (define-peg-pattern comment none (and "#" (* comment-chr) "\n")) + (define-peg-pattern entry all + (and (ignore (* whitespace)) (ignore "msgid ") msgid + (ignore (* whitespace)) (ignore "msgstr ") msgstr)) + (define-peg-pattern escape body (or "\\\\" "\\\"" "\\n")) + (define-peg-pattern str-chr body (or " " "!" (and (ignore "\\") = "\"") + "\\n" (and (ignore "\\") "\= \") + (range #\# #\=F0=AF=A7=BF))) + (define-peg-pattern msgid all content) + (define-peg-pattern msgstr all content) + (define-peg-pattern content body + (and (ignore "\"") (* str-chr) (ignore "\"") + (? (and (ignore (* whitespace)) content)))) + =20 + (define (parse-tree->assoc parse-tree) + "Converts a po PARSE-TREE to an association list." + (define regex (make-regexp "\\\\n")) + (match parse-tree + ('() '()) + ((entry parse-tree ...) + (match entry + ((? string? entry) + (parse-tree->assoc parse-tree)) + ;; empty msgid + (('entry ('msgid ('msgstr msgstr))) + (parse-tree->assoc parse-tree)) + ;; empty msgstr + (('entry ('msgid msgid) 'msgstr) + (parse-tree->assoc parse-tree)) + (('entry ('msgid msgid) ('msgstr msgstr)) + (acons (regexp-substitute/global #f regex msgid 'pre "\n= " 'post) + (regexp-substitute/global #f regex msgstr 'pre "\= n" 'post) + (parse-tree->assoc parse-tree))))))) =20 (mkdir #$output) =20 @@ -322,11 +376,15 @@ DOMAIN, a gettext domain." (find-files (string-append #$documentation "/images") "\\.png$")) =20 - ;; Finally build the manual. Copy it the Texinfo files to $PWD = and + ;; Finally build the manual. Copy it the Texinfo and po files t= o $PWD and ;; add a symlink to the 'images' directory so that 'makeinfo' can ;; see those images and produce image references in the Info out= put. (copy-recursively #$documentation "." #:log (%make-void-port "w")) + (for-each + (lambda (file) + (copy-file file (basename file))) + (find-files #$documentation-po ".*.po$")) (delete-file-recursively "images") (symlink (string-append #$output "/images") "images") =20 @@ -334,6 +392,62 @@ DOMAIN, a gettext domain." (setenv "GUIX_LOCPATH" #+(file-append glibc-utf8-locales "/lib/locale")) =20 + (setenv "LC_ALL" "en_US.UTF-8") + (setlocale LC_ALL "en_US.UTF-8") + + (define (create-texi po source texi-name) + (let* ((parse-tree + (peg:tree (match-pattern + po-file + (call-with-input-file po get-string-all))= )) + (translations (parse-tree->assoc parse-tree)) + (tmp-name (string-append texi-name ".tmp"))) + (setenv "PATH" #+(file-append gettext "/bin")) + (invoke #+(file-append po4a "/bin/po4a-translate") + "-M" "UTF-8" "-L" "UTF-8" "-k" "0" "-f" "texinfo" + "-m" source "-p" po "-l" tmp-name) + (with-output-to-file texi-name + (lambda _ + (format #t "~a" + (fold + (lambda (elem content) + (let* ((msgid (car elem)) + (msgstr (cdr elem))) + (if (or (equal? msgstr "") + (string-any (lambda (chr) + (member chr '(#\{ #\} #\( = #\) + #\newline #\= ,))) + msgid)) + content + (let ((regexp1 + (make-regexp + (string-append + "ref\\{" + (string-join + (string-split msgid #\ ) "[ \n]+= ") + ",")))) + (let ((regexp2 + (make-regexp + (string-append + "ref\\{" + (string-join + (string-split msgid #\ ) "[ \n]+= ") + "\\}")))) + (regexp-substitute/global + #f regexp2 + (regexp-substitute/global + #f regexp1 content 'pre "ref{" msgstr ",= " 'post) + 'pre "ref{" msgstr "}" 'post)))))) + (call-with-input-file tmp-name get-string-all) + translations)))))) + (for-each (lambda (po) + (let ((lang (cadr (reverse (string-split po #\.))))) + (create-texi po "guix.texi" + (string-append "guix." lang ".texi")) + (create-texi po "contributing.texi" + (string-append "contributing." lang "= .texi")))) + (find-files "." "^guix-manual\\.[a-z]{2}(_[A-Z]{2})?\\= .po$")) + (for-each (lambda (texi) (unless (string=3D? "guix.texi" texi) ;; Create 'version-LL.texi'. --=20 2.21.0 --MP_/7XQOZCCJM1PJhggTq.I1=Qx--