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

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   09/01/19 13:25:27

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile.team TODO gnun.texi 

Log message:
        Add support for Subversion repositories.
        * GNUmakefile.team (SVN, REPO, svn-update): New variables.
        (update): Conditionally use cvs-update or svn-update.
        (sync): Invoke conditionally the appropriate VCS command.
        * gnun.texi (GNUmakefile.team Variables): Document supported VCSes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile.team?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/TODO?cvsroot=trans-coord&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun.texi?cvsroot=trans-coord&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- ChangeLog   8 Jan 2009 22:46:24 -0000       1.118
+++ ChangeLog   19 Jan 2009 13:25:27 -0000      1.119
@@ -1,3 +1,12 @@
+2009-01-19  Yavor Doganov  <address@hidden>
+
+       Add support for Subversion repositories.
+       * GNUmakefile.team (SVN, REPO, svn-update): New variables.
+       (update): Conditionally use cvs-update or svn-update.
+       (sync): Invoke conditionally the appropriate VCS command.
+       * gnun.texi (GNUmakefile.team Variables): Document supported
+       VCSes.
+
 2009-01-09  Yavor Doganov  <address@hidden>
 
        * configure.ac: Exit with an error if GNU make is missing.  Don't
@@ -1555,7 +1564,7 @@
        * philosophy/schools.html: philosophy/schools.html на 
английски и
        български.
 
- Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
 
  This file is part of GNUnited Nations.
 

Index: GNUmakefile.team
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile.team,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- GNUmakefile.team    14 Mar 2008 06:29:25 -0000      1.2
+++ GNUmakefile.team    19 Jan 2009 13:25:27 -0000      1.3
@@ -1,5 +1,5 @@
 # This is -*-makefile-gmake-*-, because we adore GNU make.
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 
 # This file is part of GNUnited Nations.
 
@@ -26,6 +26,7 @@
 # GNU make >= 3.81 (prereleases are OK too)
 # GNU gettext >= 0.14
 # CVS
+# Subversion (if the www-LANG repository is SVN)
 
 SHELL = /bin/bash
 
@@ -40,9 +41,16 @@
 MSGMERGE := msgmerge
 MSGFMT := msgfmt
 CVS := cvs
+SVN := svn
 
 translations := $(shell find -name '*.$(TEAM).po' | sort)
 
+# Determine the VCS.
+REPO := $(shell (test -d CVS && echo CVS) || (test -d .svn && echo SVN))
+ifndef REPO
+$(error Unsupported Version Control System)
+endif
+
 # For those who love details.
 ifdef VERBOSE
 $(info translations = $(translations))
@@ -51,14 +59,19 @@
 CVSQUIET :=
 endif
 
-# If not in VERBOSE mode, suppress the output from cvs.
+# If not in VERBOSE mode, suppress the output from cvs/svn.
 CVSQUIET ?= -q
 
-# The command to update the repositories.
+# The command to update the CVS repositories.
 define cvs-update
 $(CVS) $(CVSQUIET) update -d -P
 endef
 
+# The command to update the Subversion repository.
+define svn-update
+$(SVN) $(CVSQUIET) update
+endef
+
 .PHONY: all
 all: update sync
 
@@ -68,8 +81,12 @@
 ifeq ($(VCS),yes)
        @echo Updating the repositories...
        cd $(wwwdir) && $(cvs-update)
+ifeq ($(REPO),CVS)
        $(cvs-update)
 else
+       $(svn-update)
+endif
+else
        $(info Repositories were not updated, you might want "make VCS=yes".)
 endif
 
@@ -81,7 +98,11 @@
          $(wwwdir)`dirname $$file`/po/`basename $${file/.$(TEAM).po/.pot}` ; \
        done
 ifeq ($(VCS),yes)
+ifeq ($(REPO),CVS)
        $(CVS) commit -m "Automatic merge from the master repository."
+else
+       $(SVN) commit -m "Automatic merge from the master repository."
+endif
 endif
 
 # Helper target to check which articles have to be updated.

Index: TODO
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/TODO,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- TODO        5 Dec 2008 23:58:11 -0000       1.25
+++ TODO        19 Jan 2009 13:25:27 -0000      1.26
@@ -67,10 +67,7 @@
 
 * Non-essential
 
-** Implement Subversion support for GNUmakefile.team.
-   Some teams already use Subversion in their project repository, so
-   although straightforward, ideally GNUmakefile.team should support
-   this VCS out of the box (i.e. w/o extra modifications).
+** Implement Arch, Bzr, Hg and Git support for GNUmakefile.team.
 
 ** Implement a `report' target that would be language specific and will
    output the state of all files for a language team, and extended

Index: gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/gnun.texi,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gnun.texi   6 Dec 2008 14:20:31 -0000       1.41
+++ gnun.texi   19 Jan 2009 13:25:27 -0000      1.42
@@ -19,7 +19,7 @@
 a suite for maintaining translations of www.gnu.org essays and other
 address@hidden
 @sp 1
-Copyright @copyright{} 2008 Free Software Foundation, Inc.
+Copyright @copyright{} 2008, 2009 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -1425,14 +1425,16 @@
 
 @table @samp
 @item VERBOSE=yes
-Print more information from @command{cvs} and @command{msgmerge}; off by
-default.  Note that @code{VERBOSE} can be defined to any string, it will
-have the same effect.
+Print more information from @command{cvs}, @command{svn} and
address@hidden; off by default.  Note that @code{VERBOSE} can be
+defined to any string, it will have the same effect.
 
 @item VCS=yes
 Update both `www' and address@hidden' repositories, then commit the
-merged PO files in the latter repository.  By default, there is no CVS
-interaction.
+merged PO files in the latter repository.  By default, there is no VCS
+interaction.  The VCS of the translation project repository is
+determined automatically; currently only CVS and Subversion repositories
+are supported.
 @end table
 
 @unnumberedsubsubsec Targets in @file{GNUmakefile.team}