trans-coord/gnun/server/gnun ChangeLog GNUmakef...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       14/11/05 14:52:23

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

Log message:
        * GNUmakefile.team (all): Make more suitable for parallel builds.
        (update): Split into `update-www' and `update-team' (suggested
        by Joerg Kohne); don't respect the VCS variable when updating.
        (update-www, update-team): New targets.
        (inform-$(1)): Print more diagnostics.
        * doc/gnun.texi (GNUmakefile.team Targets): Document
        `update-team' and `update-www'.
        * NEWS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.426&r2=1.427
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile.team?cvsroot=trans-coord&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.102&r2=1.103

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -b -r1.426 -r1.427
--- ChangeLog   20 Sep 2014 07:59:32 -0000      1.426
+++ ChangeLog   5 Nov 2014 14:52:22 -0000       1.427
@@ -1,3 +1,15 @@
+2014-11-05  Pavel Kharitonov  <address@hidden>
+
+       * GNUmakefile.team (all): Make more suitable for parallel
+       builds.
+       (update): Split into `update-www' and `update-team' (suggested
+       by Joerg Kohne); don't respect the VCS variable when updating.
+       (update-www, update-team): New targets.
+       (inform-$(1)): Print more diagnostics.
+       * doc/gnun.texi (GNUmakefile.team Targets): Document
+       `update-team' and `update-www'.
+       * NEWS: Update.
+
 2014-09-20  Pavel Kharitonov  <address@hidden>
 
        * GNUmakefile (extract-title): Filter out `span' tags.

Index: GNUmakefile.team
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile.team,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- GNUmakefile.team    29 Apr 2014 04:57:46 -0000      1.36
+++ GNUmakefile.team    5 Nov 2014 14:52:22 -0000       1.37
@@ -1,5 +1,6 @@
 # This is -*-makefile-gmake-*-, because we adore GNU make.
-# Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010, 2011, 2012,
+#   2014 Free Software Foundation, Inc.
 
 # This file is part of GNUnited Nations.
 
@@ -151,14 +152,17 @@
 endef
 
 .PHONY: all
-all: sync format notify
+all:
+       $(MAKE) $(MAKEFLAGS) sync && $(MAKE) $(MAKEFLAGS) format \
+&& $(MAKE) $(MAKEFLAGS) notify
 
 # Update the master and the team repositories.
-.PHONY: update
-update:
-ifeq ($(VCS),yes)
+.PHONY: update update-team update-www
+update: update-team update-www
+update-www:
        @echo Updating the repositories...
        cd $(wwwdir) && $(cvs-update)
+update-team:
 ifeq ($(REPO),CVS)
        $(cvs-update)
 else ifeq ($(REPO),SVN)
@@ -174,9 +178,6 @@
 else ifeq ($(REPO),Arch)
        $(TLA) update
 endif
-else
-       $(info Repositories were not updated, you might want "make VCS=yes".)
-endif
 
 # Synchronize (update) the PO files from the master POTs.
 # The revision of the PO file from ${wwwdir} is used as a possible
@@ -650,16 +651,22 @@
   case ",$$$$flags," in \
     *,force,* ) ;; \
     * ) \
-      grep : $(1).note &> /dev/null || notify=no; \
+      grep : $(1).note &> /dev/null \
+      || { notify=no; echo "Note: No files to work on for \`$(1)'."; } \
       ;; \
   esac; \
   case $$$$notify in \
     yes ) \
       timestamp=`head -n1 $(1).note | grep '^#'`; \
       if test "x$$$$timestamp" != x; then \
-        if test $$$$((`date +%s` - $$$${timestamp#?})) -lt $$$$period; then \
+        dt=$$$$((`date +%s` - $$$${timestamp#?})); \
+        if test $$$$dt -lt $$$$period; then \
           notify=no; \
+         echo "Note: Elapsed time ($$$$dt) is less than \
+period ($$$$period) for \`$(1)'.";\
         fi; \
+      else \
+       echo "Note: New notification for \`$(1)'."; \
       fi; \
       ;; \
   esac; \

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- NEWS        4 Aug 2014 07:20:05 -0000       1.111
+++ NEWS        5 Nov 2014 14:52:22 -0000       1.112
@@ -2,6 +2,10 @@
 
 * Changes in GNUnited Nations 0.10 (????-??-??)
 
+** In GNUmakefile.team, the `update' was split into
+   `update-www' and `update-team'; the repositories are updated
+   unconditionally (previously, they were only updated when VCS=yes).
+
 ** Bugs fixed in 0.10.
 
 *** `gnun-add-fuzzy-diff' didn't work correctly when no input file
@@ -15,6 +19,9 @@
 *** GNUmakefile didn't insert SSI variables for outdated notices
     correctly.
 
+*** The default target in GNUmakefile.team was made more suitable
+    for parallel builds.
+
 * Changes in GNUnited Nations 0.9 (2014-05-22)
 
 ** Apache variables are inserted at the beginning of the generated

Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- doc/gnun.texi       29 Jun 2014 09:03:23 -0000      1.102
+++ doc/gnun.texi       5 Nov 2014 14:52:22 -0000       1.103
@@ -1198,8 +1198,14 @@
 @section Targets in @file{GNUmakefile.team}
 
 @table @code
address@hidden update-team
+Updates the working copy of team's repository.
+
address@hidden update-www
+Updates the working copy of @dfn{www}.
+
 @item update
-Updates the repositories.  Does nothing unless @code{VCS=yes}.
+A shortcut for making @code{update-team} and @code{update-www}.
 
 @item sync
 Merges all available PO files from the corresponding POT in @dfn{www}.