trans-coord/gnun/server/gnun doc/gnun.texi gnun...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   09/08/01 18:45:54

Modified files:
        gnun/server/gnun/doc: gnun.texi 
        gnun/server/gnun: gnun.mk NEWS GNUmakefile ChangeLog 

Log message:
        Implement `no-validate-articles' as a way to intentionally skip
        HTML validation.
        * gnun.mk (no-validate-articles): New variable.
        * GNUmakefile ($(1).proto, $(subst /po/,/,$(1).html)): Add
        conditionals to skip validation.
        * doc/gnun.texi (Runtime Variables): Document
        `no-validate-articles'.
        * NEWS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun.mk?cvsroot=trans-coord&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.158&r2=1.159

Patches:
Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- doc/gnun.texi       27 Jul 2009 15:14:08 -0000      1.9
+++ doc/gnun.texi       1 Aug 2009 18:45:54 -0000       1.10
@@ -484,6 +484,12 @@
 recommended to run the build this way, even if it is a bit tedious to
 fix the errors that are reported as a result of enforcing validation.
 
+Articles defined in the variable @code{no-validate-articles} are never
+checked for HTML validity.  Its purpose is to skip validation of HTML 5
+articles, until the command-line validation tools are updated to parse
+files that comply with this new standard.  Use it sparingly, since this
+may lead to other errors.
+
 @cindex NOTIFY
 @cindex mail, notifications
 @item NOTIFY=no

Index: gnun.mk
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/gnun.mk,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gnun.mk     28 Jan 2009 10:11:24 -0000      1.30
+++ gnun.mk     1 Aug 2009 18:45:54 -0000       1.31
@@ -30,6 +30,11 @@
 no-grace-articles := $(addprefix $(rootdir)/, \
                        server/po/takeaction)
 
+# List of articles for which VALIDATE has no full effect; i.e. the
+# HTML files are never validated.
+no-validate-articles := $(addprefix $(rootdir)/, \
+                          fry/po/happy-birthday-to-gnu)
+
 ALL_DIRS :=    copyleft \
                fun/jokes \
                gnu \

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- NEWS        27 May 2009 18:13:13 -0000      1.15
+++ NEWS        1 Aug 2009 18:45:54 -0000       1.16
@@ -4,13 +4,21 @@
 
 ** GNUmakefile.team supports GNU Bzr repositories.
 
+** New variable `no-validate-articles'.
+   HTML validation is skipped for articles defined in this variable
+   even if VALIDATE=yes.  This was specifically implemented to
+   workaround the lack of support of HTML 5 in `gnun-validate-html'.
+   Use it with extreme caution and only when necessary (i.e. when the
+   article is HTML 5), as skipping the HTML validation step may easily
+   lead to other errors.
+
 ** Bugs fixed in 0.4.
 
 *** Fix unintentional regression in `msgmerge --previous' behavior.
     The announced functionality in 0.3 about `previous' strings was
     not functioning properly, since the `msgmerge' modifications were
     overwritten by another invocation in all the rules, intended to
-    fix an unrelated bug.
+    fix unrelated bug.
 
 * Changes in GNUnited Nations 0.3 (2009-05-24)
 

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- GNUmakefile 26 Jul 2009 21:15:12 -0000      1.69
+++ GNUmakefile 1 Aug 2009 18:45:54 -0000       1.70
@@ -462,7 +462,10 @@
 ### Rules for all other articles ###
 define article-pot-rules
 $(1).proto: $(subst /po/,/,$(1).html)
+# Skip the validation step if the article is in `no-validate-articles'.
+ifneq ($(1), $(findstring $(1),$(no-validate-articles)))
        $(VALIDATESKIP) $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) $(web-addr) $$<
+endif
        $$(mail-error-proto) $(MAKE-PROTOTYPE) --input=$$< \
          --generic=generic.html --output=$(1).proto \
          --translinks=$(1).translinks \
@@ -528,7 +531,10 @@
 # builds, update the target and validate the result.
 ifndef GRACE
        $(M4) $(1).m4 > $$@
+# Skip HTML validation if the article is in `no-validate-articles'.
+ifneq ($(basename $(1)), $(findstring $(basename 
$(1)),$(no-validate-articles)))
        $(validate-article)
+endif
 # Check if the article is not in `no-grace-articles'.
 else ifneq ($(basename $(1)), \
            $(findstring $(basename $(1)),$(no-grace-articles)))
@@ -539,6 +545,7 @@
 # If the target is of zero size, it means that it was just touched by
 # $(addfile) -- GRACE is ignored in this case to avoid committing
 # empty files to the repository.
+ifneq ($(basename $(1)), $(findstring $(basename 
$(1)),$(no-validate-articles)))
        if ! $(GREP) --quiet "^#, fuzzy" $(1).po || ! test -s $$@; \
          then \
            ($(M4) $(1).m4 > $$@ ; $(validate-article)) ; \
@@ -553,10 +560,21 @@
          fi ; \
        fi
 else
+       if ! $(GREP) --quiet "^#, fuzzy" $(1).po || ! test -s $$@; \
+         then $(M4) $(1).m4 > $$@ ; else \
+         if [ "`date --date="$(GRACE) days ago" +%Y%m%d`" -ge \
+              "`$(AWK) '/POT-Creation-Date/ { gsub(/-/, ""); print $$$$2 }' \
+                $(1).po`" ] ; \
+           then $(M4) $(1).m4 > $$@ ; \
+           else sleep 1 ; touch $(1).po ; fi ; fi
+endif
+else
        @echo 'Ignoring grace period for article "$(notdir $(basename $(1)))"'
        $(M4) $(1).m4 > $$@
+ifneq ($(basename $(1)), $(findstring $(basename 
$(1)),$(no-validate-articles)))
        $(validate-article)
 endif
+endif
 endef
 
 $(foreach base,$(ALL_BASE),$(eval $(call article-pot-rules,$(base))))

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- ChangeLog   28 Jul 2009 18:04:25 -0000      1.158
+++ ChangeLog   1 Aug 2009 18:45:54 -0000       1.159
@@ -1,3 +1,14 @@
+2009-08-01  Yavor Doganov  <address@hidden>
+
+       Implement `no-validate-articles' as a way to intentionally skip
+       HTML validation.
+       * gnun.mk (no-validate-articles): New variable.
+       * GNUmakefile ($(1).proto, $(subst /po/,/,$(1).html)): Add
+       conditionals to skip validation.
+       * doc/gnun.texi (Runtime Variables): Document
+       `no-validate-articles'.
+       * NEWS: Update.
+
 2009-07-28  Yavor Doganov  <address@hidden>
 
        * doc/web-trans.texi (Savannah VCS) <Web-based Systems>: Avoid