From nobody Sun Feb 8 19:55:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573228085; cv=none; d=zoho.com; s=zohoarc; b=oGVl0Ck3ekU3KgPz7mqgsf6xbc/YAFKGTLR0QNZstrzEbWDgStmL1GyoJuXTVtL6MN99fxkGeXHkGGzQ8B40wi1bG1ZteXC0dyBy2Vky5TYvUv/A7nHHfYesCvrBvGmiiK9EsBkhCJsVKKFUYD1Tw5MFZEW/lX4dAcuMAJGFkD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573228085; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hP5yrFxtbA6keSZ4nECF1hEe396eS1icRTlr2TSL8KE=; b=ncTqnKLrdy4GuxVO6JtQN7h+SF+HVSKYpO6Fl0aDccRnqUDWygp2Y6OhWKtmGl1T1PfK6FUjGeV1gtC+UrWU0x2UXVKbG9oVLQ1Ljf9xbC1p/nlGAhpd7Tb3IgrzVN4liQar7nXhWM5NxHGxEU4hwwADZDshKcBxQUdI7xIgCIs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1573228085117225.60194307509244; Fri, 8 Nov 2019 07:48:05 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-430-7gg4cfnlOc2QzI4vIwQOVw-1; Fri, 08 Nov 2019 10:47:18 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7EB62107ACC7; Fri, 8 Nov 2019 15:47:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 571C0608B3; Fri, 8 Nov 2019 15:47:13 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0E8FE18184BC; Fri, 8 Nov 2019 15:47:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xA8FgXjL014066 for ; Fri, 8 Nov 2019 10:42:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id 62F4A5D6B7; Fri, 8 Nov 2019 15:42:33 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-52.brq.redhat.com [10.40.200.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id C60F35D6AE for ; Fri, 8 Nov 2019 15:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573228084; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=hP5yrFxtbA6keSZ4nECF1hEe396eS1icRTlr2TSL8KE=; b=RLTS8GuAiEBMvkkGuoL39GMFXkET16oaz5SJi2PUDpGhtJHTwd3qsiOTtVi+EnB09/nGIr 5EB8MwU8zTIncWi6PtAc6pr301Gsx3i07DSAfegaz39+LlppjoHShQzta5eMQDuRdtUKcD xZ+wtpfPamun7epHr0EGV4UIVH0kP9g= From: Pavel Hrdina To: libvir-list@redhat.com Date: Fri, 8 Nov 2019 16:42:07 +0100 Message-Id: <5f112bc5eae304d85d3949defdeb928dfddc9162.1573227570.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v4 06/20] po: generate files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: 7gg4cfnlOc2QzI4vIwQOVw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Historically we did not support VPATH builds and everything was generated into source directory. The introduction of VPATH builds did not changed the way how our translation files are handled. This patch changes the rules to generate everything into build directory and stops distributing generated files in order to have properly separated VPATH builds. Signed-off-by: Pavel Hrdina Reviewed-by: Daniel P. Berrang=C3=A9 --- Notes: Changes in v2: - keep the zanata binary name, this will be fixed by separate patch =20 Chnages in v3: - update --transdir and --srcdir options as they are used by python-zanata-client =20 Changes in v4: - reverted the HAVE_GNU_GETTEXT_TOOLS move .gitignore | 4 ---- po/Makefile.am | 31 +++++++++++++++++++------------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index bd64eb5b1a..4c4807019c 100644 --- a/.gitignore +++ b/.gitignore @@ -39,12 +39,8 @@ Makefile.in .git-module-status =20 # libvirt related ignores -!/po/*.mini.po /build/ /ci/scratch/ -/po/*gmo -/po/*po -/po/*pot /src/access/org.libvirt.api.policy /src/access/viraccessapicheck.c /src/access/viraccessapicheck.h diff --git a/po/Makefile.am b/po/Makefile.am index b0e2c15d44..89e831f839 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -16,17 +16,16 @@ LANGS :=3D \ =20 =20 POTFILE_DEPS :=3D $(shell $(SED) 's,^,$(top_srcdir)/,' $(srcdir)/POTFILES) -POTFILE :=3D $(srcdir)/$(DOMAIN).pot -POFILES :=3D $(LANGS:%=3D$(srcdir)/%.po) -GMOFILES :=3D $(LANGS:%=3D$(srcdir)/%.gmo) +POTFILE :=3D $(DOMAIN).pot +POMINIFILES :=3D $(LANGS:%=3D%.mini.po) +POFILES :=3D $(LANGS:%=3D%.po) +GMOFILES :=3D $(LANGS:%=3D%.gmo) =20 -MAINTAINERCLEANFILES =3D $(POTFILE) $(POFILES) $(GMOFILES) +CLEANFILES =3D $(POTFILE) $(POFILES) $(GMOFILES) =20 EXTRA_DIST =3D \ POTFILES \ - $(POTFILE) \ - $(POFILES) \ - $(GMOFILES) + $(POMINIFILES) =20 if HAVE_GNU_GETTEXT_TOOLS =20 @@ -63,10 +62,18 @@ update-mini-po: $(POTFILE) done =20 push-pot: $(POTFILE) - zanata push --push-type=3Dsource + zanata push \ + --project-config $(srcdir)/zanata.xml \ + --push-type=3Dsource \ + --transdir $(builddir) \ + --srcdir $(srcdir) =20 pull-po: $(POTFILE) - zanata pull --create-skeletons + zanata pull \ + --project-config $(srcdir)/zanata.xml \ + --create-skeletons \ + --transdir $(builddir) \ + --srcdir $(srcdir) $(MAKE) update-mini-po $(MAKE) update-gmo =20 @@ -76,11 +83,11 @@ $(POTFILE): POTFILES $(POTFILE_DEPS) $(SED) $(SED_PO_FIXUP_ARGS) < $@-t > $@ rm -f $@-t =20 -$(srcdir)/%.po: $(srcdir)/%.mini.po $(POTFILE) +%.po: %.mini.po $(POTFILE) $(MSGMERGE) --no-fuzzy-matching $< $(POTFILE) | \ $(SED) $(SED_PO_FIXUP_ARGS) > $@ =20 -$(srcdir)/%.gmo: $(srcdir)/%.po +%.gmo: %.po rm -f $@ $@-t $(MSGFMT) -c -o $@-t $< mv $@-t $@ @@ -99,7 +106,7 @@ install-data-hook: $(GMOFILES) for lang in $(LANGS); do \ d=3D$(DESTDIR)$(langinstdir)/$$lang/LC_MESSAGES; \ mkdir -p $$d; \ - install -m 0644 $(srcdir)/$$lang.gmo $$d/$(DOMAIN).mo; \ + install -m 0644 $$lang.gmo $$d/$(DOMAIN).mo; \ done =20 uninstall-hook: --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list