trans-coord/gnun/server/gnun ChangeLog GNUmakefile

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       13/09/05 10:27:59

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile 

Log message:
        Merge `check-po' to `update-po'.
        
        * GNUmakefile (generate-html): Remove `update-po' call.
        (check-po, update-po): Move all commands from `check-po'
        to the beginning of `update-po'.
        (extra-template-rules, optional-template-lang-rules):
        (article-rules): Use `update-po' instead of `check-po'.
        (article-rules): Remove drafted page after use.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.384&r2=1.385
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.166&r2=1.167

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -b -r1.384 -r1.385
--- ChangeLog   2 Sep 2013 12:31:15 -0000       1.384
+++ ChangeLog   5 Sep 2013 10:27:59 -0000       1.385
@@ -1,3 +1,14 @@
+2013-09-05  Pavel Kharitonov  <address@hidden>
+
+       Merge `check-po' to `update-po'.
+
+       * GNUmakefile (generate-html): Remove `update-po' call.
+       (check-po, update-po): Move all commands from `check-po'
+       to the beginning of `update-po'.
+       (extra-template-rules, optional-template-lang-rules):
+       (article-rules): Use `update-po' instead of `check-po'.
+       (article-rules): Remove drafted page after use.
+
 2013-09-02  Pavel Kharitonov  <address@hidden>
 
        * GNUmakefile (article-rules): `update-po' before checking

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- GNUmakefile 2 Sep 2013 12:31:36 -0000       1.166
+++ GNUmakefile 5 Sep 2013 10:27:59 -0000       1.167
@@ -484,7 +484,6 @@
 # since there's no match between msgid/msgstr.  Invoke update-po
 # unconditionally to cope with that (valid) scenario.
 define generate-html
-$(call update-po,$(2),$(if $(4),$(4),$(2:.$(1).po=.pot)),$(1)); \
 $(PO4A_TRANSLATE) $(PO4A-XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) \
   --master $$< --po $(2) --localized $(3); \
   $(call substitute-localized-includes,$(1)) $(3)
@@ -552,13 +551,6 @@
  || true
 endef
 
-# The command to check the validity of a PO file $(1).
-define check-po
-$(MAILFAIL) $(NOTIFYSKIP) $(transl-addr) \
-  "[GNUN Error] $(patsubst $(rootdir)/%,%,$(1)) is not a valid PO file" \
-  $(VALIDATESKIP) $(MSGFMT) --check --verbose --output-file=/dev/null $1
-endef
-
 # Get the generation date of the oldest POT with incomplete
 # translation stored in `Outdated-Since' field of the header.
 define extract-outdated-date
@@ -621,6 +613,10 @@
 # For sitemaps the special compendium is used when available and fuzzy matching
 # is suppressed (it proved to do more harm than good for sitemaps).
 define update-po
+$(MAILFAIL) $(NOTIFYSKIP) $(transl-addr) \
+  "[GNUN Error] $(patsubst $(rootdir)/%,%,$(1)) is not a valid PO file" \
+  $(VALIDATESKIP) $(MSGFMT) --check --verbose --output-file=/dev/null $1 \
+  || { touch $(1); exit 1; }; \
 $(SED) \
   '1{ \
       :egin; /\nmsgstr /b msgstr; N; begin; \
@@ -758,12 +754,11 @@
 .PRECIOUS: $(1).$(2).po
 $(1).$(2).po: $(1).pot $(MASTER-$(2))
        [ -f $$@ ] || (cp $$< $$@ ; $(VCSSKIP) $(vcs) add $$@)
-       $$(call check-po, $$@)
        $(call update-po,$$@,$$<,$(2))
 
 $(subst /po/,/,$(1)).$(2).html: $(subst /po/,/,$(1)).html \
                             $(1).$(2).po
-       $$(call check-po, $(1).$(2).po) || (touch $(1).$(2).po ; exit 1)
+       $(call update-po,$(1).$(2).po,$(1).pot,$(2))
        $$(addfile)
        $(call generate-html,$(2),$(1).$(2).po,$$@)
        $(call merge-empty-lines,$$@)
@@ -792,12 +787,11 @@
 else
 .PRECIOUS: $(1).$(2).po
 $(1).$(2).po: $(1).pot.opt $(MASTER-$(2))
-       $$(call check-po, $$@)
        $(call update-po,$$@,$$<,$(2))
 
 $(subst /po/,/,$(1)).$(2).html: $(subst /po/,/,$(1)).html \
                             $(1).$(2).po
-       $$(call check-po, $(1).$(2).po) || (touch $(1).$(2).po ; exit 1)
+       $(call update-po,$$@,$$<,$(2))
        $(call generate-html,$(2),$(1).$(2).po,$$@,$(1).pot.opt)
        $(call merge-empty-lines,$$@)
 endif #eq ($(wildcard $(1).$(2).po),)
@@ -979,7 +973,6 @@
 
 define article-rules
 $(1).po: $(basename $(1)).pot $(MASTER-$(2))
-       $$(call check-po, $$@)
        $$(fixperm)
        $(call update-po,$$@,$$<,$(2))
 
@@ -999,7 +992,6 @@
 endif
        exit 1
 endif
-       $$(call check-po,$(1).po) || (touch $(1).po; exit 1)
        $(call update-po,$(1).po,$(basename $(1)).pot,$(2))
        -$(RM) address@hidden
 # If GRACE is not defined, which is the usual case for local manual
@@ -1034,6 +1026,7 @@
              $$(fixperm); \
              mv address@hidden $$@; \
         fi
+       -$(RM) address@hidden
        $(announce) 
        $(if $(findstring $(basename $(1)),$(no-grace-items)), \
            echo 'Ignoring delay for article "$(notdir $(basename $(1)))"', \