trans-coord/gnun/prep/gnun ChangeLog GNUmakefile

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   08/02/07 18:07:35

Modified files:
        gnun/prep/gnun : ChangeLog GNUmakefile 

Log message:
        (verbatim-templates): New variable.
        (sync): Synchronize server templates that are not gettextized, to
        enable validation at build time.
        ($(rootdir)/home.$(1).shtml): Add a `trans-coord'-specific
        conditional to specify the languages we want to validate.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/prep/gnun/ChangeLog?cvsroot=trans-coord&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/prep/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.31&r2=1.32

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/prep/gnun/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- ChangeLog   6 Feb 2008 20:58:30 -0000       1.35
+++ ChangeLog   7 Feb 2008 18:07:35 -0000       1.36
@@ -1,3 +1,11 @@
+2008-02-07  Yavor Doganov  <address@hidden>
+
+       * GNUmakefile (verbatim-templates): New variable.
+       (sync): Synchronize server templates that are not gettextized, to
+       enable validation at build time.
+       ($(rootdir)/home.$(1).shtml): Add a `trans-coord'-specific
+       conditional to specify the languages we want to validate.
+
 2008-02-06  Yavor Doganov  <address@hidden>
 
        * validate-html: Add license notice.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/prep/gnun/GNUmakefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- GNUmakefile 6 Feb 2008 16:15:33 -0000       1.31
+++ GNUmakefile 7 Feb 2008 18:07:35 -0000       1.32
@@ -185,7 +185,13 @@
        [ ! -f $(rootdir)/gnusflashes.$(1).include ] || $(SED) --in-place 
"s/\(<!--#include file=\"gnusflashes*\)\(.include\" -->\)/\1.$(1)\2/g" 
$(rootdir)/po/home.$(1).m4
 endif
        $(M4) $(rootdir)/po/home.$(1).m4 > $$@
+# To validate Catalan translations, add `ca' after `bg' and update the
+# variable `verbatim-templates' accordingly.  
+# FIXME: Remove this conditional when GNUN operates in `www', where we
+# want to validate everything.
+ifneq (,$(findstring $(1),bg))
        $(VALIDATESKIP) $(VALIDATE-HTML) $$@
+endif
 endef
 
 $(foreach h_lang,$(HOME_LINGUAS),$(eval $(call home_rules,$(h_lang))))
@@ -244,13 +250,18 @@
 # Special target to sync the original English articles from the `www'
 # repository.  It is intended to be invoked by a fencepost cron job
 # and will be useful even when GNUN is deployed.  Automatic adding and
-# removal is not implemented, so make sure to `cvs add'/`cvs remove'
-# and commit the article when editing gnun.mk.
+# removal is not implemented (except for the `verbatim-templates'), so
+# make sure to `cvs add'/`cvs remove' and commit the article when
+# editing gnun.mk.
 wwwdir := $(rootdir)/$(rootdir)/www
 orig-templates := $(addsuffix .html,$(template_translated_base))
 orig-articles := $(addsuffix .html,$(subst /po/,/,$(ALL_BASE)))
 files-to-sync := $(rootdir)/home.shtml $(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.
+verbatim-templates := $(addprefix server/,header.html footer.html \
+                                         header.bg.html footer.bg.html)
 
 .PHONY: sync
 sync: 
@@ -261,6 +272,13 @@
          else \
            cp -p --update $(wwwdir)/$$file $(rootdir)/$$file ; \
          fi ; done
+       for t in $(verbatim-templates) ; do \
+         if [ ! -f $(rootdir)/$$t ] ; then \
+           cp -p $(wwwdir)/$$t $(rootdir)/$$t \
+             && $(CVSSKIP) $(CVS) add $(rootdir)/$$t ; \
+         else \
+           cp -p --update $(wwwdir)/$$t $(rootdir)/$$t ; \
+         fi ; done
        cd $(rootdir) ; \
          $(CVSSKIP) $(CVS) commit -m \
          "Automatic sync from the master www repository."