trans-coord/gnun/server/gnun ChangeLog GNUmakefile

[Yavor Doganov]

CVSROOT:        /cvsroot/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   08/05/19 20:47:59

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile 

Log message:
        ($(template-dir)/%.$(1).html)
        ($(rootdir)/home.$(1).shtml, $(subst /po/,/,$(1).html)): If the PO
        file is invalid and is not fixed within the next GNUN build, touch
        the proper prerequisite to trigger another rebuild.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- ChangeLog   17 May 2008 16:00:38 -0000      1.68
+++ ChangeLog   19 May 2008 20:47:59 -0000      1.69
@@ -1,3 +1,10 @@
+2008-05-19  Yavor Doganov  <address@hidden>
+
+       * GNUmakefile ($(template-dir)/%.$(1).html)
+       ($(rootdir)/home.$(1).shtml, $(subst /po/,/,$(1).html)): If the PO
+       file is invalid and is not fixed within the next GNUN build, touch
+       the proper prerequisite to trigger another rebuild.
+
 2008-05-17  Yavor Doganov  <address@hidden>
 
        * GNUmakefile ($(rootdir)/home.$(1).shtml): Validate the

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- GNUmakefile 17 May 2008 16:00:38 -0000      1.30
+++ GNUmakefile 19 May 2008 20:47:59 -0000      1.31
@@ -206,7 +206,14 @@
 $(template-dir)/%.$(1).html: $(template-dir)/%.html \
                             $(template-dir)/po/%.$(1).po
        $$(addfile)
-       PO=$(template-dir)/po/$$(*F).$(1).po ; $(check-po)
+# If the PO file is invalid and is not fixed within the next GNUN
+# build, touch the proper prerequisite to trigger another rebuild.
+# Otherwise, next time make doesn't execute the recipe as it considers
+# the target up-to-date.  This safeguards against sneaking of an empty
+# and/or corrupt articles which are then #include'd in others thus
+# rendering them invalid.
+       PO=$(template-dir)/po/$$(*F).$(1).po ; $(check-po) \
+         || (touch $$PO ; exit 1)
        PO=$(template-dir)/po/$$(*F).$(1).po OUT=$$@ ; $(generate-html)
        $(SED) --in-place \
          ':egin;N;$$$$!begin;s/\([ \t]*\n[ \t]*\)\{3,\}<!--/\n\n<!--/g' $$@
@@ -241,7 +248,10 @@
 $(rootdir)/home.$(1).shtml: $(rootdir)/po/home.proto \
                            $(rootdir)/po/home.$(1).po generic.$(1).html
        $$(addfile)
-       PO=$(rootdir)/po/home.$(1).po ; $(check-po)
+# If $PO is not valid, then the generated page could be broken even
+# for the reader.  Ensure that the build still barfs next time if the
+# translator doesn't fix it quickly.
+       PO=$(rootdir)/po/home.$(1).po ; $(check-po) || (touch $$PO ; exit 1)
        PO=$(rootdir)/po/home.$(1).po OUT=$(rootdir)/po/home.$(1).m4 ; \
          $(generate-html)
        $(SED) --in-place \
@@ -308,7 +318,7 @@
 $(subst /po/,/,$(1).html): $(basename $(1)).proto $(basename $(1)).translinks \
                           $(1).po generic.$(2).html
        $$(addfile)
-       PO=$(1).po ; $(check-po)
+       PO=$(1).po ; $(check-po) || (touch $$PO ; exit 1)
        PO=$(1).po OUT=$(1).m4 ; $(generate-html)
        $(SED) --in-place \
          "s/\(<gnun>include(\`.*\)\([.]html')<\/gnun>\)/\1.$(2)\2/g" $(1).m4