Updated to use svn instead of cvs

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1760 f882894a-f735-0410-b71e-b25c423dba1c

2 files changed, 28 insertions, 20 deletions

diff --git a/tools/sfsnapshot b/tools/sfsnapshot
index 46f34a3..efc5f01 100755
--- a/tools/sfsnapshot
+++ b/tools/sfsnapshot
@@ -12,26 +12,27 @@
 
 function die { echo $1; exit 1; }
 
-# This makes the distribution. Expects $1 as CVS tag, otherwise uses HEAD
+# This makes the distribution. Expects $1 as branches/name, otherwise uses trunk
 function make_dist {
         if [[ -n $1 ]] ; then
-                cvs_rel=$1
-                v="$1-"
+                svn_url_suffix=$1
+                name=${1##*/}
         else
-                cvs_rel="HEAD"
-                v="HEAD-"
+                svn_url_suffix="trunk"
+                name="trunk"
         fi
+        v="$name-"
         
         # Get compile server to do the work
         # Variables will be expanded locally before being run on $CF
         ssh $CF <<EOF
         set -x
         PATH=$PATH:/usr/local/bin
-        [[ ! -d $COMPILE_DIR/$cvs_rel ]] && mkdir -p $COMPILE_DIR/$cvs_rel
-        cd $COMPILE_DIR/$cvs_rel
+        [[ ! -d $COMPILE_DIR/$name ]] && mkdir -p $COMPILE_DIR/$name
+        cd $COMPILE_DIR/$name
 
         # Cannot use cvs export due to conflicts on second run - think this is better for cvs server
-        CVS_RSH=ssh cvs -z3 -d:ext:tonvoon@nagiosplug.cvs.sourceforge.net:/cvsroot/nagiosplug co -r $cvs_rel nagiosplug
+        svn export https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/$svn_url_suffix $PROJECT
 
         cd $PROJECT
 
@@ -60,11 +61,11 @@ COMPILE_DIR=/tmp/tonvoon/tmp_snapshot
 IN=${HOME}/tmp_snapshot
 
 # Where to place the generated files
-OUT_SERVER="shell.sf.net"
+OUT_SERVER="tonvoon@shell.sf.net"
 OUT="/home/groups/n/na/nagiosplug/htdocs/snapshot"
 
 # Make sure prereqs are satisfied on server!
-CF="x86-linux2"
+CF="localhost"
 DS=`date -u +%Y%m%d%H%M`
 
 # Setup home directory area
@@ -80,7 +81,7 @@ done
 set -x
 files=$(ls $IN/*.gz 2>/dev/null)
 [[ -z $files ]] && die "No files created"
-head_file=$(cd $IN && ls *HEAD*.gz 2>/dev/null)
+head_file=$(cd $IN && ls *-trunk-*.gz 2>/dev/null)
 ssh -2 $OUT_SERVER "rm -f $OUT/*.gz"
 scp -2 $files $OUT_SERVER:$OUT
 if [[ -n $head_file ]] ; then
@@ -91,10 +92,11 @@ fi
 ssh -2 $OUT_SERVER << EOF
 cd $OUT
 cat <<-END_README > README
-This is the daily CVS snapshot of nagiosplug, consisting of the CVS HEAD
+This is the daily SVN snapshot of nagiosplug, consisting of the SVN trunk
 and any other branches.
 
-The nagios-plugins-HEAD.tar.gz link will always go to the latest HEAD snapshot.
+The nagios-plugins-HEAD.tar.gz link will always go to the latest trunk snapshot
+(name kept for existing tinderbox scripts to link correctly).
 
 The MD5SUM is:
 END_README
diff --git a/tools/sfwebcron b/tools/sfwebcron
index 9824de8..d836a0f 100755
--- a/tools/sfwebcron
+++ b/tools/sfwebcron
@@ -11,19 +11,25 @@ function die { echo $1; exit 1; }
 # Set working variables
 PROJECT=nagiosplug
 IN=${HOME}/tmp_sfwebcron
+OUT_SERVER="tonvoon@shell.sf.net"
 OUT="/home/groups/n/na/nagiosplug/htdocs"
 
+if [[ ! -e developer-guidelines.html.last ]] ; then
+        touch developer-guidelines.html.last
+fi
+
 # Get latest dev guildelines
 [[ ! -d $IN ]] && mkdir $IN
 cd $IN
-if [[ ! -d $PROJECT ]] ; then
-        cvs -z3 -d:pserver:anonymous@cvs1:/cvsroot/nagiosplug co nagiosplug || die "Cannot cvs"
+if [[ ! -d doc ]] ; then
+        #cvs -z3 -d:pserver:anonymous@cvs1:/cvsroot/nagiosplug co nagiosplug || die "Cannot cvs"
+        svn checkout http://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk/doc doc
 fi
-cd nagiosplug/doc
-cvs update
+cd doc
+svn update
 
-# Is the dev guidelines updated?
 make
-if [[ developer-guidelines.html -nt $OUT/developer-guidelines.html ]] ; then
-        cp developer-guidelines.html developer-guidelines.sgml $OUT
+if [[ developer-guidelines.html -nt developer-guidelines.html.last ]] ; then
+        scp developer-guidelines.{html,sgml} $OUT_SERVER:$OUT
+        touch developer-guidelines.html.last
 fi