trans-coord/gnun/server/gnun GNUmakefile ChangeLog

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/12/03 14:28:10

Modified files:
        gnun/server/gnun: GNUmakefile ChangeLog 

Log message:
        (compendia/master-translated.$(1).po): Don't break the build
        when the regeneration of the compendium fails.
        (compendia/compendium.$(1).po): Likewise; simplify some commands.
        (check-po): Use make variables instead of shell ones.
        (extra-template-lang-rules, optional-template-lang-rules):
        (article-rules): Adjust `check-po' calls.
        ($(rootdir)/gnusflashes.%.include): Don't touch homepages.
        (files-to-sync, validate-all): Remove $(rootdir)/home.html since it is
        already present in ALL_POTS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.145&r2=1.146
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.308&r2=1.309

Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- GNUmakefile 26 Nov 2012 14:13:04 -0000      1.145
+++ GNUmakefile 3 Dec 2012 14:28:06 -0000       1.146
@@ -346,7 +346,7 @@
 
 # Extract current translations from master compendium.
 compendia/master-translated.$(1).po: compendia/master.$(1).po
-       $(MSGATTRIB) --no-fuzzy --translated -o $$@ $$<
+       -$(MSGATTRIB) --no-fuzzy --translated -o $$@ $$<
 
 MASTER-$(1) := compendia/master-translated.$(1).po
 MASTER-$(1)-OPTION := -C $$(MASTER-$(1))
@@ -354,14 +354,14 @@
 endif # eq ($$(shell test -s compendia/master.$(1).po && echo yes),yes)
 
 compendia/compendium.$(1).po: compendia/compendium.pot $$(ALL_$(1)_POS)
-       $(MSGCAT) --use-first -o address@hidden $$(ALL_$(1)_POS)
+       -$(MSGCAT) --use-first -o address@hidden $$(ALL_$(1)_POS)
        addfile=no; prev_comp=$$@; \
   test -s $$@ || { addfile=yes; prev_comp=/dev/null; } ; \
   if test -s address@hidden; then \
     $(MSGMERGE) --previous -C address@hidden -o address@hidden $$$${prev_comp} 
$$<; \
-  fi \
-  && $(RM) address@hidden \
-  && if test -s address@hidden; then \
+  fi; \
+  $(RM) address@hidden; \
+  if test -s address@hidden; then \
        test $$$${addfile} = no || $$(addfile); \
        $(call check-new-po,$$@); \
      else \
@@ -532,11 +532,11 @@
  || true
 endef
 
-# The command to check the validity of a PO file.
+# The command to check the validity of a PO file $(1).
 define check-po
 $(MAILFAIL) $(NOTIFYSKIP) $(transl-addr) \
-  "[GNUN Error] $$$${PO#../../} is not a valid PO file" \
-  $(VALIDATESKIP) $(MSGFMT) --check --verbose --output-file=/dev/null $$$$PO
+  "[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
@@ -717,8 +717,7 @@
                         PO=$(1).po ; $$(touch-hook))
 endef
 
-# Ensure that generic.LANG.html is always present for the homepage and
-# articles' generation.
+# Ensure that generic.LANG.html is always present for articles' generation.
 
 define generic-var
 GENERIC_LINGUAS += $(1)
@@ -742,12 +741,12 @@
 .PRECIOUS: $(1).$(2).po
 $(1).$(2).po: $(1).pot $(MASTER-$(2))
        [ -f $$@ ] || (cp $$< $$@ ; $(VCSSKIP) $(vcs) add $$@)
-       -PO=$$@ ; $(check-po)
+       $$(call check-po, $$@)
        $(call update-po,$$@,$$<,$(2))
 
 $(subst /po/,/,$(1)).$(2).html: $(subst /po/,/,$(1)).html \
                             $(1).$(2).po
-       PO=$(1).$(2).po ; $(check-po) || (touch $$$$PO ; exit 1)
+       $$(call check-po, $(1).$(2).po) || (touch $(1).$(2).po ; exit 1)
        $$(addfile)
        $(call generate-html,$(2),$(1).$(2).po,$$@)
        $(call merge-empty-lines,$$@)
@@ -776,12 +775,12 @@
 else
 .PRECIOUS: $(1).$(2).po
 $(1).$(2).po: $(1).pot.opt $(MASTER-$(2))
-       -PO=$$@ ; $(check-po)
+       $$(call check-po, $$@)
        $(call update-po,$$@,$$<,$(2))
 
 $(subst /po/,/,$(1)).$(2).html: $(subst /po/,/,$(1)).html \
                             $(1).$(2).po
-       PO=$(1).$(2).po ; $(check-po) || (touch $$$$PO ; exit 1)
+       $$(call check-po, $(1).$(2).po) || (touch $(1).$(2).po ; exit 1)
        $(call generate-html,$(2),$(1).$(2).po,$$@,$(1).pot.opt)
        $(call merge-empty-lines,$$@)
 endif #eq ($(wildcard $(1).$(2).po),)
@@ -817,9 +816,7 @@
 # There is a lot of duplication with article-rules, but at least one
 # command in every recipe has to be different.  Also, we don't want
 # whatsnew to be in gnun.mk as if it is it will be built by the
-# article-rules anyway.  The `whatsnew' targets are built before the
-# homepages in order any newly generated gnusflashes.LANG.include to
-# be #include'd automatically in the corresponding homepage.
+# article-rules anyway.
 $(template-dir)/po/whatsnew.proto: $(template-dir)/whatsnew.html
        $(VALIDATESKIP) $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) $(web-addr) $<
        $(generate-proto)
@@ -865,11 +862,7 @@
 
 # Derive the targets from whatsnew.LANG.include.  Pattern rules rule.
 $(rootdir)/gnusflashes.%.include: $(template-dir)/whatsnew.%.include
-# If there is a homepage, touch its PO file in order to be regenerated
-# in the same GNUN run to include gnusflashes.LANG.include.
-       [ -f $@ ] || (touch $@ ; $(VCSSKIP) $(vcs) add $@ \
-         && ([ ! -f $(rootdir)/home.$*.html ] \
-             || touch $(rootdir)/po/home.$*.po))
+       [ -f $@ ] || (touch $@ ; $(VCSSKIP) $(vcs) add $@)
        $(fixperm)
        echo "<!--Automatically generated by GNUN; do not edit!-->" > $@
        $(GREP) --max-count=3 '<dd>.*</dd>' $< >> $@
@@ -973,7 +966,7 @@
 
 define article-rules
 $(1).po: $(basename $(1)).pot $(MASTER-$(2))
-       PO=$$@ ; $(check-po)
+       $$(call check-po, $$@)
        $$(fixperm)
        $(call update-po,$$@,$$<,$(2))
 
@@ -994,7 +987,7 @@
 endif
        exit 1
 endif
-       PO=$(1).po; $(check-po) || (touch $$$$PO; exit 1)
+       $$(call check-po,$(1).po) || (touch $(1).po; exit 1)
        $(call generate-html,$(2),$(1).po,$(1).m4)
        $(call post-generate-html,$(1).m4,$(2))
        -$(RM) address@hidden
@@ -1048,9 +1041,8 @@
 ### End of all articles' rules ###
 
 # If VCS=always, add all necessary files.  The templates' POT are not
-# handled for the moment, but they are more or less stable.  Also,
-# there is no sense in adding home.pot as this should happen only once.
-# WARNING: This is implemented just in case.
+# 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) $(wildcard generic.*.html) \
@@ -1069,7 +1061,7 @@
 wwwdir := $(rootdir)/$(rootdir)/www
 orig-templates := $(addsuffix .html,$(template-translated-base))
 orig-articles := $(addsuffix .html,$(subst /po/,/,$(ALL_BASE)))
-files-to-sync := $(rootdir)/home.html $(orig-templates) $(orig-articles)
+files-to-sync := $(orig-templates) $(orig-articles)
 abs-files-to-sync := $(subst $(rootdir)/,,$(files-to-sync))
 # Templates that are not gettextized, but are necessary to reside in
 # trans-coord for HTML validation at build time.
@@ -1247,8 +1239,7 @@
 # and the page may become invalid in an included file changes.
 .PHONY: validate-all
 validate-all:
-       for html in $(subst /po/,/,$(ALL_POTS:%.pot=%.html)) \
-            $(rootdir)/home.html; do \
+       for html in $(subst /po/,/,$(ALL_POTS:%.pot=%.html)); do \
           echo Validating $${html}...; \
           $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) ${web-addr} $${html}; \
         done

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -b -r1.308 -r1.309
--- ChangeLog   26 Nov 2012 14:13:08 -0000      1.308
+++ ChangeLog   3 Dec 2012 14:28:07 -0000       1.309
@@ -1,3 +1,16 @@
+2012-12-03  Pavel Kharitonov  <address@hidden>
+
+       * GNUmakefile (compendia/master-translated.$(1).po):
+       Don't break the build when the regeneration of the compendium
+       fails.
+       (compendia/compendium.$(1).po): Likewise; simplify some commands.
+       (check-po): Use make variables instead of shell ones.
+       (extra-template-lang-rules, optional-template-lang-rules):
+       (article-rules): Adjust `check-po' calls.
+       ($(rootdir)/gnusflashes.%.include): Don't touch homepages.
+       (files-to-sync, validate-all): Remove $(rootdir)/home.html
+       since it is already present in ALL_POTS.
+
 2012-11-26  Pavel Kharitonov  <address@hidden>
 
        Eliminate hardcoded home and templates.
@@ -6,7 +19,7 @@
        Remove variables.
        (template-translated-base, template-pots): Remove
        `template-files'.
-       (all, no-grace-items, substitute-localized-urls)
+       (all, no-grace-items, substitute-localized-urls):
        (vcs-add-always): Remove `home-translated' as a dependency.
        (validate-all): Don't validate `home-translated'.
        (template-rules, template-dir-rules, rules for homepages):