trans-coord/gnun/server/gnun GNUmakefile ChangeLog

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       14/04/11 15:32:13

Modified files:
        gnun/server/gnun: GNUmakefile ChangeLog 

Log message:
        Fix obsolete comments.
        (all, vcs-add-always): Eliminate references to `gnunews'.
        (article-rules): Remove unneeded `sleep 1; touch  $(1).po${po-suffix};'
        commands.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.178&r2=1.179
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.407&r2=1.408

Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -b -r1.178 -r1.179
--- GNUmakefile 8 Apr 2014 06:21:20 -0000       1.178
+++ GNUmakefile 11 Apr 2014 15:32:13 -0000      1.179
@@ -176,8 +176,6 @@
 no-validate-items := \
 $(addprefix $(rootdir)/,$(call transfer-to-po,$(no-validate-articles)))
 ### Special variables for all other articles ###
-# FIXME: Variables' computation could be optimized, but in any event
-# it is much better if translators do not have to add manually anything.
 articles := $(foreach dir,$(ALL_DIRS),$(addprefix $(dir)/po/,$(value $(dir))))
 articles-pot := $(addprefix $(rootdir)/,$(articles:%=%.pot))
 root-articles := $(foreach root-article,$(ROOT), \
@@ -192,13 +190,13 @@
 $(info ALL_POTS = $(ALL_POTS))                         
 $(info articles-translated = $(articles-translated))
 endif
-### End of variables declaration (all articles) ###
+### End of variables for all other articles ###
 
 .PHONY: all vcs-add-always no-grace-items
 ifeq ($(_have-Makefile),yes)
 include Makefile
 else
-all: compendia $(template-pots) $(template-translated) $(gnunews) \
+all: compendia $(template-pots) $(template-translated) \
      $(ALL_POTS) \
      $(articles-translated) $(patsubst %.pot,%.translist,$(ALL_POTS)) \
      final-stage
@@ -700,15 +698,14 @@
 draft-suffix := .humbly-drafted-by-GNUN
 
 # The command to validate an ordinary article; remove the generated file
-# (when VCS operations are enabled).
+# if it's invalid (when VCS operations are enabled).
 define validate-article
 $(VALIDATESKIP) $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) $(transl-addr) \
   address@hidden || ($(VCSSKIP) $(RM) address@hidden; exit 1)
 endef
 
-### Specific rules for extra templates ###
-# Essentially duplicate rules for templates, but define per-template
-# rules rather than use static patterns
+### Specific rules for templates ###
+# All templates are currently either "extra" or "optional".
 define extra-template-lang-rules
 .PRECIOUS: $(1).$(2).po
 $(1).$(2).po: $(1).pot $(MASTER-$(2))
@@ -778,7 +775,7 @@
           $(dir $(addprefix $(rootdir)/, \
                   $(template)))po/$(notdir $(template)))))
 
-### End of rules for extra templates ###
+### End of rules for templates ###
 
 ### Rules for all other articles ###
 define article-pot-rules
@@ -828,10 +825,7 @@
 
 $(subst /po/,/,$(1).html): $(basename $(1)).proto $(1).po${po-suffix}
 # If the server templates are missing, assume the worst and exit with
-# an error to prevent the generation of broken translations -- even if
-# validation is not enforced there will be Apache error.  The case
-# when the templates are present but not built by GNUN is valid in
-# practice, but not recommended.
+# an error to prevent the generation of broken translations.
 ifeq (,$(call find-language,$(2),$(TEMPLATE_LINGUAS)))
 ifndef NOTIFYSKIP
        echo 'The "$(2)" language code is not defined in TEMPLATE_LINGUAS.' \
@@ -851,8 +845,7 @@
 # Check if the article is not in `no-grace-items'.
 else ifneq ($(basename $(1)), \
            $(findstring $(basename $(1)),$(no-grace-items)))
-# If there are no fuzzy strings, there might be untranslated or
-# obsolete, so proceed as usual.  If there are fuzzy strings, compare
+# If the translation is outdated, compare
 # the Outdated-Since in the $(1).po${po-suffix} with the current time
 # shifted by value of the $(GRACE) period and invoke regeneration only
 # if the grace period is over.  Likewise, check against
@@ -863,8 +856,6 @@
          $(output-article-html); \
        elif $(call grace-is-over,$(1).po${po-suffix},$(GRACE)) ; then \
          $(output-article-html); \
-       else \
-         sleep 1; touch $(1).po${po-suffix}; \
        fi
 else
        @echo 'Ignoring grace period for article "$(notdir $(basename $(1)))"'
@@ -906,14 +897,14 @@
 $(foreach base,$(ALL_BASE),$(eval $(call article-pot-rules,$(base))))
 $(foreach po-base,$(ALL_POS_BASE), \
   $(eval $(call article-rules,$(po-base),$(subst .,,$(suffix $(po-base))))))
-### End of all articles' rules ###
+### End of rules for all other articles ###
 
 # If VCS=always, add all necessary files.  The templates' POT are not
 # handled for the moment, but they are more or less stable.
 # WARNING: This is implemented just in case, rarely used and probably broken.
 ifneq (,$(findstring always,$(VCS)))
 vcs-add-always: $(template-translated) $(ALL_POTS) \
-               $(articles-translated) $(gnunews) \
+               $(articles-translated) \
                substitute-localized-urls
          -$(vcs) add $(filter-out substitute-localized-urls,$^)
 else
@@ -1058,7 +1049,7 @@
 endif
 # Validate all articles under GNUN's control.
 # This is needed because GNUN doesn't track included files,
-# and the page may become invalid in an included file changes.
+# and the page may become invalid when an included file changes.
 .PHONY: validate-all
 validate-all:
        for html in $(subst /po/,/,$(ALL_POTS:%.pot=%.html)); do \

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -b -r1.407 -r1.408
--- ChangeLog   8 Apr 2014 06:21:20 -0000       1.407
+++ ChangeLog   11 Apr 2014 15:32:13 -0000      1.408
@@ -1,3 +1,10 @@
+2014-04-11  Pavel Kharitonov  <address@hidden>
+
+       * GNUmakefile: Fix obsolete comments.
+       (all, vcs-add-always): Eliminate references to `gnunews'.
+       (article-rules): Remove unneeded
+       `sleep 1; touch  $(1).po${po-suffix};' commands.
+
 2014-04-08  Pavel Kharitonov  <address@hidden>
 
        * GNUmakefile (PO4A-XHTMLFLAGS): Declare the `<style>'