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

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   11/01/21 19:14:07

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

Log message:
        Preliminary "dummy" Bzr support.
        * GNUmakefile (vcs): Fall back to bzr if neither CVS nor SVN is
        detected.
        * configure.ac: Check for bzr.
        * doc/gnun.texi (Runtime Variables): Mention Bzr.
        (triggers): New paragraph explaining the different VCS approaches.
        * NEWS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.186&r2=1.187
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- ChangeLog   21 Jan 2011 17:58:43 -0000      1.186
+++ ChangeLog   21 Jan 2011 19:14:07 -0000      1.187
@@ -1,5 +1,13 @@
 2011-01-21  Yavor Doganov  <address@hidden>
 
+       Preliminary "dummy" Bzr support.
+       * GNUmakefile (vcs): Fall back to bzr if neither CVS nor SVN is
+       detected.
+       * configure.ac: Check for bzr.
+       * doc/gnun.texi (Runtime Variables): Mention Bzr.
+       (triggers): New paragraph explaining the different VCS approaches.
+       * NEWS: Update.
+
        * GNUmakefile (extract-title): Pass --wrap=0 to base64 to avoid
        undesirable wrapping when the article title is too long.
 

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- GNUmakefile 21 Jan 2011 17:58:43 -0000      1.81
+++ GNUmakefile 21 Jan 2011 19:14:07 -0000      1.82
@@ -40,9 +40,11 @@
 
 # Determine the VCS to use.  The conditional is for efficiency --
 # there's no need to spawn a shell to determine the value when all VCS
-# operations will be skipped anyway.
+# operations will be skipped anyway.  For the time being, Bzr is used
+# as a fallback since gnu.org is expected to switch soon.
 ifneq (,$(findstring yes,$(VCS)))
-vcs := $(shell (test -d CVS && echo cvs) || (test -d .svn && echo svn))
+vcs := $(shell (test -d CVS && echo cvs) \
+         || (test -d .svn && echo svn) || echo bzr)
 endif
 
 # By default, do not add any files to the repository unless VCS=yes.

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- NEWS        6 Aug 2010 14:34:48 -0000       1.28
+++ NEWS        21 Jan 2011 19:14:07 -0000      1.29
@@ -1,6 +1,8 @@
 GNUnited Nations NEWS - User visible changes.
 
-* Changes in GNUnited Nations 0.5 (2010-??-??)
+* Changes in GNUnited Nations 0.5 (2011-??-??)
+
+** GNU Bzr is a supported VCS.
 
 ** New GNUmakefile.team targets: format, publish, clean.
    Please refer to the manual for details.
@@ -168,7 +170,7 @@
 
 -----
 
-Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GNUnited Nations.
 

Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- configure.ac        7 Jan 2010 14:43:04 -0000       1.23
+++ configure.ac        21 Jan 2011 19:14:07 -0000      1.24
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 # This file is part of GNUnited Nations.
 
@@ -123,7 +123,10 @@
 AS_IF([test -n "$CVS"], [cvs="(CVS)"])
 AC_CHECK_PROG([SVN], [svn], [yes])
 AS_IF([test -n "$SVN"], [svn="(Subversion)"])
-AS_IF([test -n "$CVS" || test -n "$SVN"], [have_vcs=yes], [have_vcs=no])
+AC_CHECK_PROG([BZR], [bzr], [yes])
+AS_IF([test -n "$BZR"], [bzr="(Bazaar)"])
+AS_IF([test -n "$CVS" || test -n "$SVN" || test -n "$BZR"],
+      [have_vcs=yes], [have_vcs=no])
 
 # Do not bother checking for xmllint if m4 is not present.
 AS_IF([test -n "$M4"],
@@ -175,7 +178,7 @@
 echo "HTML validation...                      $have_xmllint"
 echo "GRACE support...                        $decent_awk"
 echo "NOTIFY support...                       $have_mail"
-echo "VCS support...                          $have_vcs $cvs $svn"
+echo "VCS support...                          $have_vcs $cvs $svn $bzr"
 echo
 echo "Type \"make\" to build the scripts and \"make install\" to install
 them along with the manuals."

Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- doc/gnun.texi       6 Aug 2010 14:34:48 -0000       1.24
+++ doc/gnun.texi       21 Jan 2011 19:14:07 -0000      1.25
@@ -18,7 +18,8 @@
 @value{VERSION}), a suite for maintaining translations of www.gnu.org
 essays and other address@hidden
 @sp 1
-Copyright @copyright{} 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 2008, 2009, 2010, 2011 Free Software Foundation,
+Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -460,6 +461,8 @@
 @cindex CVS
 @cindex Subversion
 @cindex SVN
address@hidden Bazaar
address@hidden bzr
 @item VCS=no
 @itemx @dots{}
 
@@ -468,10 +471,14 @@
 that expects assigning the value `no'.
 
 @item VCS=yes
-Automatically add any new files in the repository (CVS or
-Subversion---the repository type is auto-determined at build time).
-These are any POT files, if they are generated for the first time, and
-the translated articles (@address@hidden) in HTML format.  In
+Automatically add any new files in the repository (CVS, Subversion or
+GNU Bazaar---the repository type is auto-determined at build time,
address@hidden being a fallback)address@hidden GNU Bzr is used, files
+are added locally only; you need to take care to use @command{bzr push}
+manually (or via cron) to take care of effectively adding them to the
+public repository.  @xref{triggers}, for a short explanation.} These are
+any POT files, if they are generated for the first time, and the
+translated articles (@address@hidden) in HTML format.  In
 addition, if there is no @file{server/gnun/address@hidden file
 for the specific language an article is being generated, an empty file
 will be added.  Finally, any missing PO and their HTML counterparts of
@@ -481,10 +488,10 @@
 @item VCS=always
 Because GNU Make considers the targets up-to-date after a successful
 build, if it was performed with no VCS interaction, the important newly
-created files will not be added (and committed when you do @code{cvs|svn
-commit}) in the repository.  Assigning this value enables additional
-check and forcefully adds all files.  Use it sparingly, since it is very
-slow and generally less reliable.
+created files will not be added (and committed when you do
address@hidden|svn|bzr commit}) in the repository.  Assigning this value
+enables additional check and forcefully adds all files.  Use it
+sparingly, since it is very slow and generally less reliable.
 
 @cindex VALIDATE
 @cindex validation
@@ -574,7 +581,7 @@
 files of the server templates are not handled by @code{always}, running
 the build this way will commit any newly added files as specified in
 @code{TEMPLATE_LINGUAS} and will perform additional check at the end,
address@hidden|svn add}-ing all necessary files.
address@hidden|svn|bzr add}-ing all necessary files.
 
 When validation is enabled (i.e. with @code{VALIDATE=yes}), the
 original English articles are validated first, before any commands
@@ -684,7 +691,7 @@
 @subsubsection The @code{triggers} target
 
 This is a special target intended to be run by the automatic build after
-the main build and @emph{after} @code{cvs|svn commit}.
+the main build and @emph{after} @code{cvs|svn|bzr commit}.
 
 @c FIXME: Check how Subversion behaves with keywords and update the
 @c paragraph below.
@@ -720,7 +727,7 @@
 supposed to be human-readable.
 
 To summarize, for effective operation GNUN should be invoked
-automatically as @code{make ; cvs|svn commit -m @dots{} ; make
+automatically as @code{make ; cvs|svn|bzr commit -m @dots{} ; make
 triggers}.  To illustrate this, here is a concrete example showing the
 official job running at fencepost.gnu.org:
 
@@ -735,6 +742,16 @@
 @end group
 @end example
 
+The above example is for CVS; if the underlying repository is
+Subversion, they need to be amended accordingly.  If it is GNU Bzr,
+remember to add a @command{bzr push} after commit (in the usual
+scenario), otherwise changes will be committed only locally.  Since a
+distributed Version Control System can be used in multiple (sometimes
+radically different) ways, this step cannot be anticipated and therefore
+cannot be automated.  Adding the @command{push} command in the makefile
+rules would not work if a so called ``bound branch'' is used, for
+instance.
+
 In the future, this target may be extended further to do other useful
 things that should be ``triggered'' after the main build.