trans-coord-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

trans-coord/gnun/server/gnun GNUmakefile ChangeLog


From: Pavel Kharitonov
Subject: trans-coord/gnun/server/gnun GNUmakefile ChangeLog
Date: Fri, 05 Oct 2012 16:32:18 +0000

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/10/05 16:32:18

Modified files:
        gnun/server/gnun: GNUmakefile ChangeLog 

Log message:
        Make the `<span class="gnun-split"></span>' separator work
        in templates.
        
        (add-gnun-tags): New function.
        (generate-proto): Move the `sed' invocation to `add-gnun-tags',
        and call that function.
        ($(template-dir)/po/%.proto, $(template-dir)/po/%.pot)
        (extra-template-rules, optional-template-rules): Generate
        POT from .proto file rather than directly from HTML.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.141&r2=1.142
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.297&r2=1.298

Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- GNUmakefile 4 Oct 2012 14:43:17 -0000       1.141
+++ GNUmakefile 5 Oct 2012 16:32:18 -0000       1.142
@@ -624,14 +624,19 @@
      )
 endef
 
+# The command to add "<gnun>" tags in a prototype ($@) where needed.
+define add-gnun-tags
+$(SED) --in-place -e '/<span[[:space:]]*$$/{:egin;N; />[^\n]*$$/! begin};\
+s,<span[[:space:]]\+class="gnun-split"></span>,<gnun></gnun>,g' \
+                  -e "s/\$$Date.*\$$/<gnun>\0<\/gnun>/g" $@
+endef
+
 # The command to generate a prototype for a page.
 define generate-proto
 $(MAILFAIL) $(NOTIFYSKIP) $(web-addr),$(devel-addr) \
   "[GNUN Error] Incompatible change in $(subst $(rootdir)/,,$<)" \
   $(MAKE-PROTOTYPE) < $< > $@ || ($(RM) $@ ; exit 1)
-$(SED) --in-place -e '/<span[[:space:]]*$$/{:egin;N; />[^\n]*$$/! begin};\
-s,<span[[:space:]]\+class="gnun-split"></span>,<gnun></gnun>,g' \
-                  -e "s/\$$Date.*\$$/<gnun>\0<\/gnun>/g" $@
+$(add-gnun-tags)
 endef
 
 # The command to restore the necessary write permissions of the
@@ -731,8 +736,13 @@
   $(eval $(call generic-rules,$(g-lang))))
 
 ### Specific rules for the templates ###
-.PRECIOUS: $(template-dir)/po/%.pot
-$(template-dir)/po/%.pot: $(template-dir)/%.html
+.PRECIOUS: $(template-dir)/po/%.pot $(template-dir)/po/%.proto
+
+$(template-dir)/po/%.proto: $(template-dir)/%.html
+       cp $< $@
+       $(add-gnun-tags)
+
+$(template-dir)/po/%.pot: $(template-dir)/po/%.proto
        $(addfile)
        $(generate-pot)
 
@@ -790,11 +800,16 @@
 endef
 
 define extra-template-rules
-.PRECIOUS: $(1).pot
-$(1).pot: $(subst /po/,/,$(1)).html
+.PRECIOUS: $(1).pot $(1).proto
+
+$(1).pot: $(1).proto
        $$(addfile)
        $$(generate-pot)
 
+$(1).proto: $(subst /po/,/,$(1)).html
+       cp $$< $$@
+       $$(add-gnun-tags)
+
 $(foreach t-lang,$(TEMPLATE_LINGUAS),\
   $(eval $(call extra-template-lang-rules,$(strip $(1)),$(t-lang))))
 endef
@@ -820,11 +835,15 @@
 endef
 
 define optional-template-rules
-.PRECIOUS: $(1).pot.opt
-$(1).pot.opt: $(subst /po/,/,$(1)).html
+.PRECIOUS: $(1).pot.opt $(1).proto
+$(1).pot.opt: $(1).proto
        $$(addfile)
        $$(generate-pot)
 
+$(1).proto: $(subst /po/,/,$(1)).html
+       cp $$< $$@
+       $$(add-gnun-tags)
+
 $(foreach t-lang,$(TEMPLATE_LINGUAS),\
   $(eval $(call optional-template-lang-rules,$(strip $(1)),$(t-lang))))
 endef

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -b -r1.297 -r1.298
--- ChangeLog   4 Oct 2012 14:43:17 -0000       1.297
+++ ChangeLog   5 Oct 2012 16:32:18 -0000       1.298
@@ -1,3 +1,15 @@
+2012-10-05  Pavel Kharitonov  <address@hidden>
+
+       Make the `<span class="gnun-split"></span>' separator work
+       in templates.
+
+       * GNUmakefile (add-gnun-tags): New function.
+       (generate-proto): Move the `sed' invocation to `add-gnun-tags',
+       and call that function.
+       ($(template-dir)/po/%.proto, $(template-dir)/po/%.pot)
+       (extra-template-rules, optional-template-rules): Generate
+       POT from .proto file rather than directly from HTML.
+
 2012-10-04  Pavel Kharitonov  <address@hidden>
 
        Replace `make-prototype' with and awk script; the latter



reply via email to

[Prev in Thread] Current Thread [Next in Thread]