trans-coord/gnun/server/gnun GNUmakefile ChangeLog

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/04/20 04:06:10

Modified files:
        gnun/server/gnun: GNUmakefile ChangeLog 

Log message:
        Disable staged pages; the feature didn't prove to be useful.
        
        * GNUmakefile: Don't instantiate rules for staged pages.
        (home-lang): Remove $(rootdir)/home-staged.$(1).html.
        (staged-articles, staged-originals, staged-rules)
        ($(rootdir)/po/home-staged.proto)
        ($(rootdir)/po/home-staged.pot): Delete.
        (no-grace-items): Remove $(staged-articles).
        (all, no-grace-items): Don't depend on $(staged-originals).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.263&r2=1.264

Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- GNUmakefile 19 Apr 2012 04:50:21 -0000      1.120
+++ GNUmakefile 20 Apr 2012 04:06:10 -0000      1.121
@@ -140,7 +140,7 @@
 ### End of variables declaration (whatsnew) ###
 
 ### Special variables for the home pages ###
-home-lang = $(rootdir)/home.$(1).html $(rootdir)/home-staged.$(1).html
+home-lang = $(rootdir)/home.$(1).html
 home-translated := $(foreach h-lang,$(HOME_LINGUAS), \
                     $(call home-lang,$(h-lang)))
 ifeq ($(VERBOSE),yes)
@@ -150,9 +150,7 @@
 
 find-po = $(wildcard $(1).*.po)
 ### Special variables for `no-grace' items ###
-staged-articles := $(no-grace-articles:%=%-staged)
-staged-originals := $(subst /po/,/,$(staged-articles:%=%.html))
-no-grace-items := $(no-grace-articles) $(staged-articles)
+no-grace-items := $(no-grace-articles)
 no-grace-pot := $(no-grace-items:%=%.pot)
 no-grace-po := $(foreach pot, $(no-grace-pot),\
                 $(call find-po,$(basename $(pot))))
@@ -183,11 +181,11 @@
 include Makefile
 else
 all: compendia $(template-pots) $(template-translated) $(gnunews) \
-     $(home-translated) $(ALL_POTS) $(staged-originals) \
+     $(home-translated) $(ALL_POTS) \
      $(articles-translated) final-stage
 endif
 no-grace-items: $(template-pots) $(template-translated) \
-               $(home-translated) $(staged-originals) \
+               $(home-translated) \
                $(no-grace-translated) final-stage
 
 .PHONY: substitute-localized-urls update-localized-URLs final-stage
@@ -236,14 +234,6 @@
                 fi;\
               done;)
 
-define staged-rules
-$(1)-staged.html: $(1).html
-       $$(addfile)
-       cp $$< $$@
-endef
-$(foreach article, $(subst /po/,/,$(no-grace-articles)) $(rootdir)/home,\
-  $(eval $(call staged-rules,$(article))))
-
 # The command to add a file to the repository.
 define add-file
 [ -f $(1) ] || (touch $(1) $(2) ; $(VCSSKIP) $(vcs) add $(1))
@@ -907,21 +897,6 @@
        $(fixperm)
        $(generate-pot)
 
-$(rootdir)/po/home-staged.proto: $(rootdir)/home-staged.html
-# Delete the target if the script exits with a non-zero status in
-# order to prevent further messing up in the chain.  For extra safety,
-# exit with an error so that make does not proceed to the next
-# command.
-       $(VALIDATESKIP) $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) $(web-addr) $<
-       $(mail-error-proto) $(MAKE-PROTOTYPE) --home --input=$< \
-         --generic=generic.html --output=$@ || ($(RM) $@ ; exit 1)
-       $(SED) --in-place "s/\$$Date.*\$$/<gnun>\0<\/gnun>/g" $@
-
-$(rootdir)/po/home-staged.pot: $(rootdir)/po/home-staged.proto
-       $(addfile)
-       $(fixperm)
-       $(generate-pot)
-
 define home-rules
 $(rootdir)/po/$(2).$(1).po: $(rootdir)/po/$(2).pot $(MASTER-$(1))
        PO=$$@ ; $(check-po)
@@ -969,9 +944,8 @@
        mv address@hidden $$@
 endef
 
-$(foreach h-name,home home-staged, \
-  $(foreach h-lang,$(HOME_LINGUAS), \
-    $(eval $(call home-rules,$(h-lang),$(h-name)))))
+$(foreach h-lang,$(HOME_LINGUAS), \
+  $(eval $(call home-rules,$(h-lang),home)))
 ### End of the homepages-specific rules ###
 
 ### Rules for all other articles ###

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -b -r1.263 -r1.264
--- ChangeLog   19 Apr 2012 04:50:20 -0000      1.263
+++ ChangeLog   20 Apr 2012 04:06:10 -0000      1.264
@@ -1,3 +1,15 @@
+2012-04-20  Pavel Kharitonov  <address@hidden>
+
+       Disable staged pages; the feature didn't prove to be useful.
+
+       * GNUmakefile: Don't instantiate rules for staged pages.
+       (home-lang): Remove $(rootdir)/home-staged.$(1).html.
+       (staged-articles, staged-originals, staged-rules)
+       ($(rootdir)/po/home-staged.proto)
+       ($(rootdir)/po/home-staged.pot): Delete.
+       (no-grace-items): Remove $(staged-articles).
+       (all, no-grace-items): Don't depend on $(staged-originals).
+
 2012-04-19  Pavel Kharitonov  <address@hidden>
 
        Prevent committing incomplete and invalid translations.