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

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   09/09/28 12:10:24

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile NEWS TODO config.mk 
                          config.mk.in configure.ac 
        gnun/server/gnun/doc: gnun.texi 

Log message:
        Add support for Subversion, needed for windows7sins.org.
        * GNUmakefile (vcs): New variable, replacing CVS.  All uses
        updated.
        (CVSSKIP): Rename as...
        (VCSSKIP): ...for consistency.  All uses updated.
        * configure.ac: Check for SVN.  Don't define CVS as precious
        variable.
        * config.mk.in (CVS): Remove; not needed anymore, if ever.
        * doc/gnun.texi (Runtime Variables): Mention Subversion, add
        indexing commands.
        (triggers): Add alternative commands for svn.
        * NEWS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.166&r2=1.167
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/TODO?cvsroot=trans-coord&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/config.mk?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/config.mk.in?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- ChangeLog   15 Aug 2009 16:02:28 -0000      1.166
+++ ChangeLog   28 Sep 2009 12:10:21 -0000      1.167
@@ -1,3 +1,18 @@
+2009-09-28  Yavor Doganov  <address@hidden>
+
+       Add support for Subversion, needed for windows7sins.org.
+       * GNUmakefile (vcs): New variable, replacing CVS.  All uses
+       updated.
+       (CVSSKIP): Rename as...
+       (VCSSKIP): ...for consistency.  All uses updated.
+       * configure.ac: Check for SVN.  Don't define CVS as precious
+       variable.
+       * config.mk.in (CVS): Remove; not needed anymore, if ever.
+       * doc/gnun.texi (Runtime Variables): Mention Subversion, add
+       indexing commands.
+       (triggers): Add alternative commands for svn.
+       * NEWS: Update.
+
 2009-08-15  Yavor Doganov  <address@hidden>
 
        Take advantage of new features in Automake 1.11.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- GNUmakefile 1 Aug 2009 18:45:54 -0000       1.70
+++ GNUmakefile 28 Sep 2009 12:10:21 -0000      1.71
@@ -38,11 +38,18 @@
                    -o "untranslated=W<gnun> W<script>" \
                    -o "translated=W<pre>"
 
-# Do not `cvs add' any files by default unless VCS=yes.
+# 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.
+ifdef VCS
+vcs := $(shell (test -d CVS && echo cvs) || (test -d .svn && echo svn))
+endif
+
+# By default, do not add any files to the repository unless VCS=yes.
 ifneq (,$(findstring yes,$(VCS)))
-CVSSKIP :=
+VCSSKIP :=
 else
-CVSSKIP := echo "SKIP:"
+VCSSKIP := echo "SKIP:"
 endif
 
 # Do not validate any files by default unless VALIDATE=yes.
@@ -141,7 +148,7 @@
 
 # The command to add a file to the repository.
 define addfile
-[ -f $@ ] || (touch $@ ; $(CVSSKIP) $(CVS) add $@)
+[ -f $@ ] || (touch $@ ; $(VCSSKIP) $(vcs) add $@)
 endef
 
 # The command to generate pot file which perform additional checks
@@ -257,7 +264,7 @@
 # once.  Create a copy for every PO file in TEMPLATE_LINGUAS so that
 # the build can continue without errors.
 # FIXME: Check if this approach works with gettext >> 0.14.
-       [ -f $$@ ] || (cp $$< $$@ ; $(CVSSKIP) $(CVS) add $$@)
+       [ -f $$@ ] || (cp $$< $$@ ; $(VCSSKIP) $(vcs) add $$@)
 # Since we handle the case when new templates are added by webmasters,
 # it is OK to ignore errors from these, at least until fencepost has
 # an old version of gettext.  The XHTML validation errors should be
@@ -346,7 +353,7 @@
 $(rootdir)/gnusflashes.%.include: $(template-dir)/whatsnew.%.include
 # If there is a homepage, touch its PO file in order to be regenerated
 # in the same GNUN run to include gnusflashes.LANG.include.
-       [ -f $@ ] || (touch $@ ; $(CVSSKIP) $(CVS) add $@ \
+       [ -f $@ ] || (touch $@ ; $(VCSSKIP) $(vcs) add $@ \
          && ([ ! -f $(rootdir)/home.$*.shtml ] \
              || touch $(rootdir)/po/home.$*.po))
        $(fixperm)
@@ -369,7 +376,7 @@
          $$PO || (touch $$PO ; exit 1)
        [ -f $(template-dir)/$(@F) ] \
          || (touch $(template-dir)/$(@F) ; \
-            $(CVSSKIP) $(CVS) add $(template-dir)/$(@F))
+            $(VCSSKIP) $(vcs) add $(template-dir)/$(@F))
 # Unconditionally update the PO file; see the comment in `article-rules'.
        $(MSGMERGE) --update --previous $(template-dir)/po/whatsnew.$*.po \
          $(template-dir)/po/whatsnew.pot
@@ -590,7 +597,7 @@
 vcs-add-always:
        for file in $(template-translated) $(home-translated) $(ALL_POTS) \
          $(articles-translated) $(gnunews) $(wildcard generic.*.html); do \
-         ($(CVS) add $$file ; exit 0) ; done
+         ($(vcs) add $$file ; exit 0) ; done
 else
 vcs-add-always: ;
 endif
@@ -630,21 +637,21 @@
        for file in $(abs-files-to-sync) ; do \
          if [ ! -f $(wwwdir)/$$file ] ; then \
            echo "Warning: $$file missing in www; update the variable?" \
-           | $(CVSSKIP) mail -s "sync: missing file" $(devel-addr) ; \
+           | $(VCSSKIP) mail -s "sync: missing file" $(devel-addr) ; \
          else \
            cp -p --update $(wwwdir)/$$file $(rootdir)/$$file ; \
          fi ; done
 # Copy all necessary templates that are not under GNUN's control and
-# `cvs add' them if VCS=yes.
+# add them if VCS=yes.
        for t in $(verbatim-templates) ; do \
          if [ ! -f $(rootdir)/$$t ] ; then \
            cp -p $(wwwdir)/$$t $(rootdir)/$$t \
-             && $(CVSSKIP) $(CVS) add $(rootdir)/$$t ; \
+             && $(VCSSKIP) $(vcs) add $(rootdir)/$$t ; \
          else \
            cp -p --update $(wwwdir)/$$t $(rootdir)/$$t ; \
          fi ; done
        cd $(rootdir) ; \
-         $(CVSSKIP) $(CVS) commit -m \
+         $(VCSSKIP) $(vcs) commit -m \
          "Automatic sync from the master www repository."
 
 # Special target to check which translations need updating.

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- NEWS        6 Aug 2009 14:26:39 -0000       1.20
+++ NEWS        28 Sep 2009 12:10:21 -0000      1.21
@@ -17,6 +17,11 @@
 
 ** GNUmakefile.team supports Mercurial (Hg) repositories.
 
+** Subversion is a supported VCS along with CVS.
+   VCS=yes automatically detects the VCS to use, choosing between CVS
+   and Subversion (in that order).  This is useful for other sites
+   that are maintained with Subversion, such as windows7sins.org.
+
 * Changes in GNUnited Nations 0.3.1 (2009-08-02)
 
 ** GNUmakefile.team supports GNU Bzr repositories.

Index: TODO
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/TODO,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- TODO        6 Aug 2009 14:26:39 -0000       1.33
+++ TODO        28 Sep 2009 12:10:21 -0000      1.34
@@ -32,6 +32,8 @@
 
 * General (when bugs are fixed)
 
+** Add support for windows7sins.org.
+
 ** The documentation is not complete, and should be improved.
 
 ** Experiment with msgmerge's `--previous' option and make it the

Index: config.mk
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/config.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- config.mk   26 Jul 2009 14:36:49 -0000      1.2
+++ config.mk   28 Sep 2009 12:10:21 -0000      1.3
@@ -12,7 +12,3 @@
 MSGMERGE       := msgmerge
 PO4A_GETTEXTIZE := po4a-gettextize
 PO4A_TRANSLATE  := po4a-translate
-# This variable exists only for the purpose of defining it to a
-# non-standard executable while testing future cvs releases.  The
-# rules already depend on cvs-specific options.
-CVS            := cvs

Index: config.mk.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/config.mk.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- config.mk.in        26 Jul 2009 14:36:49 -0000      1.3
+++ config.mk.in        28 Sep 2009 12:10:21 -0000      1.4
@@ -13,7 +13,3 @@
 MSGMERGE       := @MSGMERGE@
 PO4A_GETTEXTIZE := @PO4A_GETTEXTIZE@
 PO4A_TRANSLATE  := @PO4A_TRANSLATE@
-# This variable exists only for the purpose of defining it to a
-# non-standard executable while testing future cvs releases.  The
-# rules already depend on cvs-specific options.
-CVS            := @CVS@

Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- configure.ac        15 Aug 2009 16:02:28 -0000      1.20
+++ configure.ac        28 Sep 2009 12:10:21 -0000      1.21
@@ -115,9 +115,15 @@
                gnun_cv_gnu_mailutils=yes ;
                fi])
 fi
-AC_ARG_VAR([CVS], [the CVS client program])
-AC_CHECK_PROGS([CVS], [cvs])
-AS_IF([test -n "$CVS"], [have_cvs=yes], [have_cvs=no])
+
+# Check for supported VCS.  Currently the tests are run only for the
+# sake of pretty-printing the summary at the end, but the results will
+# be used for the future testsuite.
+AC_CHECK_PROG([CVS], [cvs], [yes])
+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])
 
 # Do not bother checking for xmllint if m4 is not present.
 AS_IF([test -n "$M4"],
@@ -169,7 +175,7 @@
 echo "HTML validation...                      $have_xmllint"
 echo "GRACE support...                        $decent_awk"
 echo "NOTIFY support...                       $have_mail"
-echo "VCS support...                          $have_cvs"
+echo "VCS support...                          $have_vcs $cvs $svn"
 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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- doc/gnun.texi       6 Aug 2009 14:26:39 -0000       1.12
+++ doc/gnun.texi       28 Sep 2009 12:10:23 -0000      1.13
@@ -444,6 +444,8 @@
 @table @samp
 @cindex VCS
 @cindex CVS
address@hidden Subversion
address@hidden SVN
 @item VCS=no
 @itemx @dots{}
 
@@ -452,22 +454,23 @@
 that expects assigning the value `no'.
 
 @item VCS=yes
-Automatically add any new files in the repository.  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 the
-server templates will be added, computed on the basis of the
+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
+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
+the server templates will be added, computed on the basis of the
 @code{template-files} variable.
 
 @item VCS=always
 Because @acronym{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 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.
+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.
 
 @cindex VALIDATE
 @cindex validation
@@ -537,10 +540,10 @@
 @end table
 
 Note that @code{VCS=yes,always} is a valid combination: because POT
-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, @code{cvs add}-ing all necessary files.
+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
address@hidden and will perform additional check at the end,
address@hidden|svn 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
@@ -649,9 +652,11 @@
 @node triggers
 @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 commit}.
+This is a special target intended to be run by the automatic build after
+the main build and @emph{after} @code{cvs|svn commit}.
 
address@hidden FIXME: Check how Subversion behaves with keywords and update the
address@hidden paragraph below.
 When a @acronym{GNUN} build completes and some translations fail at the
 XHTML validation stage, the result is checked in the repository, as
 explained earlier (@pxref{Runtime Variables}).  Thus, CVS updates the
@@ -671,9 +676,9 @@
 deletes all those @file{*.hook} files.
 
 To summarize, for effective operation @acronym{GNUN} should be invoked
-automatically as @code{make ; cvs commit -m @dots{} ; make triggers}.
-To illustrate this, here is a concrete example showing the official job
-running at fencepost.gnu.org:
+automatically as @code{make ; cvs|svn commit -m @dots{} ; make
+triggers}.  To illustrate this, here is a concrete example showing the
+official job running at fencepost.gnu.org:
 
 @example
 @group