From 57da1b4bd21aceced30f658993fb811a5232cff7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 31 May 2013 18:19:09 +0200 Subject: stop building l10n if strings are unchanged The buildsystem tried to build l10n for test applications which never produced the output it expected causing it to try building it all the time. --- po/makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'po/makefile') diff --git a/po/makefile b/po/makefile index ebf6c06d0..5a3c7fb67 100644 --- a/po/makefile +++ b/po/makefile @@ -30,17 +30,23 @@ GETDOMAIN = $(word 1,$(subst /, ,$(1))) # and produce the .pot file. $(POTFILES) : $(PO)/%.pot : echo "Generating POT file $@" - echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d + echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d.tmp + cmp --silent $@.d.tmp $@.d || mv $@.d.tmp $@.d # From sh source - cat $(PO)/domains/$*/*.shlist 2> /dev/null | (cd $(BASE) && xargs -n1 bash --dump-po-strings) > $(PO)/domains/$*/sh.pot + cat $(PO)/domains/$*/*.shlist 2> /dev/null | (cd $(BASE) && xargs -n1 bash --dump-po-strings) > $(PO)/domains/$*/sh.pot.tmp + cmp --silent $(PO)/domains/$*/sh.pot.tmp $(PO)/domains/$*/sh.pot || \ + mv $(PO)/domains/$*/sh.pot.tmp $(PO)/domains/$*/sh.pot # From C/C++ source cat $(PO)/domains/$*/*.srclist > $(PO)/POTFILES_$*.in $(XGETTEXT) --default-domain=$* --directory=$(BASE) \ --add-comments --foreign --keyword=_ --keyword=N_ \ --keyword=P_:1,2 \ - --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot + --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot.tmp + cmp --silent $(PO)/domains/$*/c.pot.tmp $(PO)/domains/$*/c.pot || \ + mv $(PO)/domains/$*/c.pot.tmp $(PO)/domains/$*/c.pot rm -f $(PO)/POTFILES_$*.in - $(MSGCOMM) --omit-header --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@ + $(MSGCOMM) --omit-header --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@.tmp + cmp --silent $@ $@.tmp || mv $@.tmp $@ # copy into the domain dirs to make rosetta happy rm -f $(PO)/domains/$*/*.pot cp $@ $(PO)/domains/$* @@ -93,4 +99,5 @@ ifneq ($(words $(The_DFiles)),0) include $(The_DFiles) endif +# otherwise the output is completely screwed .NOTPARALLEL: -- cgit v1.2.3-70-g09d2 From f026e89ceaacd43b24e3bf4c8e50e69e30d0a633 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 18:01:33 +0200 Subject: add missing Turkish (tr) to po/LINGUAS And while at it ensure that this can't happen again by letting the build fail in case a po file is available but the language isn't mentioned in the LINGUAS file (not even as a disabled language). --- po/LINGUAS | 8 +++++++- po/makefile | 20 +++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) (limited to 'po/makefile') diff --git a/po/LINGUAS b/po/LINGUAS index c5d8999bf..6d77cf856 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1,7 @@ -ar ast bg bs ca cs cy da de dz el es eu fi fr gl hu it ja km ko ku lt mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW +## If a language isn't listed here but a po file is available the build will fail. +## If a language is disabled deliberately, list it in a line starting with a single '#' + +ar ast bg bs ca cs cy da de dz el es eu fi fr gl hu it ja km ko ku lt mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl tr uk vi zh_CN zh_TW + +## disabled by translator request #313283: +# he diff --git a/po/makefile b/po/makefile index 5a3c7fb67..b239da5cc 100644 --- a/po/makefile +++ b/po/makefile @@ -14,7 +14,7 @@ SUBDIR=po # Bring in the default rules include ../buildlib/defaults.mak -CATALOGS := $(addsuffix .gmo,$(shell cat LINGUAS)) +CATALOGS := $(addsuffix .gmo, $(shell sed -e '/^\#/ d' -e '/^$$/ d' LINGUAS | tr '\n' ' ')) DOMAINS := $(notdir $(wildcard $(PO_DOMAINS)/*)) POTFILES := $(addsuffix .pot,$(addprefix $(PO)/,$(DOMAINS))) @@ -66,10 +66,10 @@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po mkdir -p $(LOCALE)/$(notdir $*)/LC_MESSAGES/ cp $@ $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo -stats: +stats: all-linguas-enabled for i in *.pot *.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done -binary: $(POTFILES) $(MOFILES) +binary: $(POTFILES) $(MOFILES) all-linguas-enabled $(PACKAGE)-all.pot: $(POTFILES) # we create our partial pot files without a header to avoid changing dates in *.mo files, @@ -80,8 +80,8 @@ $(PACKAGE)-all.pot: $(POTFILES) $(MSGCOMM) --more-than=0 $(PO)/$(PACKAGE)-dummy.pot $(POTFILES) --output=$(PACKAGE)-all.pot rm -f $(PO)/$(PACKAGE)-dummy.pot -.PHONY: update-po -update-po: $(PACKAGE)-all.pot +.PHONY: update-po all-linguas-enabled +update-po: $(PACKAGE)-all.pot all-linguas-enabled for lang in ${LINGUAS}; do \ echo "Updating $$lang.po"; \ $(MSGMERGE) $$lang.po $(PACKAGE)-all.pot -o $$lang.new.po; \ @@ -89,6 +89,16 @@ update-po: $(PACKAGE)-all.pot rm -f $$lang.new.po; \ done +all-linguas-enabled: LINGUAS +ifdef NOISY + echo "Available Translations: $(shell ls *.po | cut -d'.' -f 1 | sort | tr '\n' ' ')" + echo "Mentioned Translations: $(shell sed -e '/^\#\#/ d' -e '/^$$/ d' -e 's/# //' LINGUAS | tr ' ' '\n' | sort | tr '\n' ' ')" + echo "Build Translations: $(shell echo "$(LINGUAS)" | tr ' ' '\n' | sort | tr '\n' ' ')" +endif + test "$(shell ls *.po | cut -d'.' -f 1 | sort | tr '\n' ' ')" = \ + "$(shell sed -e '/^\#\#/ d' -e '/^$$/ d' -e 's/# //' LINGUAS | tr ' ' '\n' | sort | tr '\n' ' ')" || \ + ( echo "ERROR: Not all available translations are mentioned in po/LINGUAS!"; exit 100) + clean: clean/local clean/local: rm -f $(MOFILES) $(LANG_POFILES) $(PO)/*.d -- cgit v1.2.3-70-g09d2