[Qemu-devel] [PATH 0/4] po/Makefile: Fix regression and some minor issues

[Qemu-devel] [PATH 0/4] po/Makefile: Fix regression and some minor issues

[Stefan Weil]

These patches are included:

[PATCH 1/4] po/Makefile: Fix and improve help message
[PATCH 2/4] po/Makefile: Fix *.mo generation for out-of-tree builds
[PATCH 3/4] po/Makefile: Fix generation of messages.po
[PATCH 4/4] po/Makefile: Use macro quiet-command for nice looking

Regards
Stefan W.

[Qemu-devel] [PATCH 1/4] po/Makefile: Fix and improve help message

[Stefan Weil]

The help message contains single quotes which got lost in the output.
Fix also a typo and use two instead of three lines.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 po/Makefile |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/po/Makefile b/po/Makefile
index 60ccd7d..2c5b202 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -12,9 +12,8 @@ SRC_PATH=..
 vpath %.po $(SRC_PATH)/po
 
 all:
-	@echo Use 'make update' to update translation files
-	@echo or us 'make build' or 'make install' to build and install
-	@echo the translation files
+	@echo "Use 'make update' to update translation files or use 'make build'"
+	@echo "or 'make install' to build and install the translation files."
 
 update: $(SRCS)
 
-- 
1.7.10.4

[Qemu-devel] [PATCH 2/4] po/Makefile: Fix *.mo generation for out-of-tree builds (regression)

[Stefan Weil]

Commit f84756554e32d97db3aa949db1dd58c7eea62375 added a wildcard search
for *.po files. This search found no files for out of tree builds, so
those builds no longer created and installed *.mo files.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 po/Makefile |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/po/Makefile b/po/Makefile
index 2c5b202..0e345b0 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,15 +1,18 @@
 # This makefile is very special as it's meant to build as part of the build
 # process and also within the source tree to update the translation files.
 
-VERSION=$(shell cat ../VERSION)
-SRCS=$(filter-out messages.po,$(wildcard *.po))
-OBJS=$(patsubst %.po,%.mo,$(SRCS))
-
+# Set SRC_PATH for in-tree builds without configuration.
 SRC_PATH=..
 
 -include ../config-host.mak
 
-vpath %.po $(SRC_PATH)/po
+PO_PATH=$(SRC_PATH)/po
+
+VERSION=$(shell cat $(SRC_PATH)/VERSION)
+SRCS=$(filter-out $(PO_PATH)/messages.po,$(wildcard $(PO_PATH)/*.po))
+OBJS=$(patsubst $(PO_PATH)/%.po,%.mo,$(SRCS))
+
+vpath %.po $(PO_PATH)
 
 all:
 	@echo "Use 'make update' to update translation files or use 'make build'"
@@ -30,12 +33,12 @@ install: $(OBJS)
 	done
 
 %.mo: %.po
-	@msgfmt -o $@ $(SRC_PATH)/po/`basename $@ .mo`.po
+	@msgfmt -o $@ $<
 
-messages.po: $(SRC_PATH)/ui/gtk.c
+$(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
 	@xgettext -o $@ --foreign-user --package-name=QEMU --package-version=$(VERSION) --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C $<
 
-%.po: messages.po
+$(PO_PATH)/%.po: $(PO_PATH)/messages.po
 	@msgmerge $@ $< > $@.bak && mv $@.bak $@
 
 .PHONY: clean all
-- 
1.7.10.4

[Qemu-devel] [PATCH 3/4] po/Makefile: Fix generation of messages.po

[Stefan Weil]

* Tell xgettext that we use UTF-8 encoding (this is currently optional).

* Set charset=UTF-8 in messages.po. This avoids warnings from msgmerge:
  warning: Charset "CHARSET" is not a portable encoding name.

* Use filename relative to root directory (ui/gtk.c instead of ../ui/gtk.c
  or $(SRC_PATH)/ui/gtk.c) for comments in *.po files.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 po/Makefile |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/po/Makefile b/po/Makefile
index 0e345b0..a6ab482 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -36,7 +36,11 @@ install: $(OBJS)
 	@msgfmt -o $@ $<
 
 $(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
-	@xgettext -o $@ --foreign-user --package-name=QEMU --package-version=$(VERSION) --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C $<
+	@cd $(SRC_PATH) && \
+	 (xgettext -o - --from-code=UTF-8 --foreign-user \
+	    --package-name=QEMU --package-version=$(VERSION) \
+	    --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C ui/gtk.c | \
+	  sed -e s/CHARSET/UTF-8/) >$@
 
 $(PO_PATH)/%.po: $(PO_PATH)/messages.po
 	@msgmerge $@ $< > $@.bak && mv $@.bak $@
-- 
1.7.10.4

[Qemu-devel] [PATCH 4/4] po/Makefile: Use macro quiet-command for nice looking messages

[Stefan Weil]

Suppress also the "... done" message from msgmerge.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 po/Makefile |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/po/Makefile b/po/Makefile
index a6ab482..705166e 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -5,6 +5,7 @@
 SRC_PATH=..
 
 -include ../config-host.mak
+include $(SRC_PATH)/rules.mak
 
 PO_PATH=$(SRC_PATH)/po
 
@@ -33,16 +34,16 @@ install: $(OBJS)
 	done
 
 %.mo: %.po
-	@msgfmt -o $@ $<
+	$(call quiet-command, msgfmt -o $@ $<, "  GEN   $@")
 
 $(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
-	@cd $(SRC_PATH) && \
+	$(call quiet-command, cd $(SRC_PATH) && \
 	 (xgettext -o - --from-code=UTF-8 --foreign-user \
 	    --package-name=QEMU --package-version=$(VERSION) \
 	    --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C ui/gtk.c | \
-	  sed -e s/CHARSET/UTF-8/) >$@
+	  sed -e s/CHARSET/UTF-8/) >$@, "  GEN   $@")
 
 $(PO_PATH)/%.po: $(PO_PATH)/messages.po
-	@msgmerge $@ $< > $@.bak && mv $@.bak $@
+	$(call quiet-command, msgmerge -q $@ $< > $@.bak && mv $@.bak $@, "  GEN   $@")
 
 .PHONY: clean all
-- 
1.7.10.4

Re: [Qemu-devel] [PATH 0/4] po/Makefile: Fix regression and some minor issues

[Stefan Weil]

Am 05.07.2013 22:55, schrieb Stefan Weil:
> These patches are included:
>
> [PATCH 1/4] po/Makefile: Fix and improve help message
> [PATCH 2/4] po/Makefile: Fix *.mo generation for out-of-tree builds
> [PATCH 3/4] po/Makefile: Fix generation of messages.po
> [PATCH 4/4] po/Makefile: Use macro quiet-command for nice looking
>
> Regards
> Stefan W.

Ping?

Re: [Qemu-devel] [PATH 0/4] po/Makefile: Fix regression and some minor issues

[Stefan Weil]

Am 16.07.2013 07:16, schrieb Stefan Weil:
> Am 05.07.2013 22:55, schrieb Stefan Weil:
>> These patches are included:
>>
>> [PATCH 1/4] po/Makefile: Fix and improve help message
>> [PATCH 2/4] po/Makefile: Fix *.mo generation for out-of-tree builds
>> [PATCH 3/4] po/Makefile: Fix generation of messages.po
>> [PATCH 4/4] po/Makefile: Use macro quiet-command for nice looking
>>
>> Regards
>> Stefan W.
> Ping?

Ping^2

Re: [Qemu-devel] [PATCH 0/4] po/Makefile: Fix regression and some minor issues

[Stefan Weil]

Am 18.07.2013 21:52, schrieb Stefan Weil:
> Am 16.07.2013 07:16, schrieb Stefan Weil:
>> Am 05.07.2013 22:55, schrieb Stefan Weil:
>>> These patches are included:
>>>
>>> [PATCH 1/4] po/Makefile: Fix and improve help message
>>> [PATCH 2/4] po/Makefile: Fix *.mo generation for out-of-tree builds
>>> [PATCH 3/4] po/Makefile: Fix generation of messages.po
>>> [PATCH 4/4] po/Makefile: Use macro quiet-command for nice looking
>>>
>>> Regards
>>> Stefan W.
>> Ping?
> Ping^2
>

Ping^3

Who is maintaining GTK? Anthony?

Is there any chance to get some of the issues which
are addressed by this series fixed in the next version of
QEMU?

Patch 1 certainly could also be applied via qemu-trivial,
maybe some of the others, too. See
http://patchwork.ozlabs.org/patch/257202/.

Stefan

Re: [Qemu-devel] [PATCH 0/4] po/Makefile: Fix regression and some minor issues

[Anthony Liguori]

Stefan Weil <sw@weilnetz.de> writes:

> Am 18.07.2013 21:52, schrieb Stefan Weil:
>> Am 16.07.2013 07:16, schrieb Stefan Weil:
>>> Am 05.07.2013 22:55, schrieb Stefan Weil:
>>>> These patches are included:
>>>>
>>>> [PATCH 1/4] po/Makefile: Fix and improve help message
>>>> [PATCH 2/4] po/Makefile: Fix *.mo generation for out-of-tree builds
>>>> [PATCH 3/4] po/Makefile: Fix generation of messages.po
>>>> [PATCH 4/4] po/Makefile: Use macro quiet-command for nice looking
>>>>
>>>> Regards
>>>> Stefan W.
>>> Ping?
>> Ping^2
>>
>
> Ping^3
>
> Who is maintaining GTK? Anthony?
>
> Is there any chance to get some of the issues which
> are addressed by this series fixed in the next version of
> QEMU?
>
> Patch 1 certainly could also be applied via qemu-trivial,
> maybe some of the others, too. See
> http://patchwork.ozlabs.org/patch/257202/.

I really don't understand why, but patches completely ignored this
thread so I haven't seen it until this ping.  I can't see any reason off
hand but will investigate further.

Is it possible you sent this differently than you have sent series in
the past?

At any rate, it's enqueued now, will push shortly after testing
completes.  Sorry about that.

Regards,

Anthony Liguori

>
> Stefan

Re: [Qemu-devel] [PATCH 0/4] po/Makefile: Fix regression and some minor issues

[Anthony Liguori]

On Tue, Jul 23, 2013 at 3:47 PM, Anthony Liguori <aliguori@us.ibm.com> wrote:
> Stefan Weil <sw@weilnetz.de> writes:
>
>> Am 18.07.2013 21:52, schrieb Stefan Weil:
>>> Am 16.07.2013 07:16, schrieb Stefan Weil:
>>>> Am 05.07.2013 22:55, schrieb Stefan Weil:
>>>>> These patches are included:
>>>>>
>>>>> [PATCH 1/4] po/Makefile: Fix and improve help message
>>>>> [PATCH 2/4] po/Makefile: Fix *.mo generation for out-of-tree builds
>>>>> [PATCH 3/4] po/Makefile: Fix generation of messages.po
>>>>> [PATCH 4/4] po/Makefile: Use macro quiet-command for nice looking
>>>>>
>>>>> Regards
>>>>> Stefan W.
>>>> Ping?
>>> Ping^2
>>>
>>
>> Ping^3
>>
>> Who is maintaining GTK? Anthony?
>>
>> Is there any chance to get some of the issues which
>> are addressed by this series fixed in the next version of
>> QEMU?
>>
>> Patch 1 certainly could also be applied via qemu-trivial,
>> maybe some of the others, too. See
>> http://patchwork.ozlabs.org/patch/257202/.
>
> I really don't understand why, but patches completely ignored this
> thread so I haven't seen it until this ping.  I can't see any reason off
> hand but will investigate further.

Ah, it's quite obvious now.

Your leader has a typo, "PATH" instead of "PATCH".  My scripts ignore
threads that do not have "PATCH" or "PULL" in the subject.

Regards,

Anthony Liguori