[Nagiosplug-checkins] CVS: nagiosplug/tools sfsnapshot,1.14,1.15

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18837

Modified Files:
	sfsnapshot 
Log Message:
Change of compile server and cleanups


Index: sfsnapshot
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/tools/sfsnapshot,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** sfsnapshot	26 Jun 2004 05:13:25 -0000	1.14
--- sfsnapshot	26 Jun 2004 16:39:02 -0000	1.15
***************
*** 4,11 ****
  # Can only run on the shell compile farm server
  # Will always create a snapshot of HEAD
! # If want multiple snapshots, just run with "sfsnapshot {branch} [branch2 ...]"
  # Assumes:
  #  ssh setup to send to shell.sf.net and $CF without password prompt
! #  autconf and automake installed on shell cf at v 2.57 & 1.72 and in PATH
  # Install in cron with something like:
  #  47 * * * * $HOME/bin/mail_error -o $HOME/sfsnapshot.out -m tonvoon at users.sf.net sfsnapshot r1_3_0
--- 4,11 ----
  # Can only run on the shell compile farm server
  # Will always create a snapshot of HEAD
! # If want multiple snapshots, just run with "sfsnapshot [branch ...]"
  # Assumes:
  #  ssh setup to send to shell.sf.net and $CF without password prompt
! #  the compile server has all the prerequisites stated at http://nagiosplug.sourceforge.net/developer-guidelines.html
  # Install in cron with something like:
  #  47 * * * * $HOME/bin/mail_error -o $HOME/sfsnapshot.out -m tonvoon at users.sf.net sfsnapshot r1_3_0
***************
*** 28,39 ****
  	set -x
  	PATH=$PATH
! 	[[ ! -d $IN/$cvs_rel ]] && mkdir -p $IN/$cvs_rel
! 	cd $IN/$cvs_rel
! 	#rm -f $PROJECT/configure.in
  	cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/nagiosplug co -r $cvs_rel nagiosplug
  	cd $PROJECT
! 	#sed 's/^VER=.*/VER=$v$DS/;s/^REL=.*/REL=snapshot/' configure.in > configure.tmp
! 	#mv configure.tmp configure.in
  	tools/setup
  	./configure
  
--- 28,42 ----
  	set -x
  	PATH=$PATH
! 	[[ ! -d $COMPILE_DIR/$cvs_rel ]] && mkdir -p $COMPILE_DIR/$cvs_rel
! 	cd $COMPILE_DIR/$cvs_rel
! 
! 	# Cannot use cvs export due to conflicts on second run - think this is better for cvs server
  	cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/nagiosplug co -r $cvs_rel nagiosplug
+ 
  	cd $PROJECT
! 
! 	# TODO: Maybe this should only be run when necessary?
  	tools/setup
+ 
  	./configure
  
***************
*** 41,44 ****
--- 44,50 ----
  	make dist VERSION=$v$DS RELEASE=snapshot
  
+ 	# May fail if file not generated - do not trap
+ 	mv *.gz $IN
+ 
  	# End ssh
  EOF
***************
*** 47,59 ****
  # Set working variables
  PROJECT=nagiosplug
  IN=${HOME}/tmp_snapshot
  OUT_SERVER="shell.sf.net"
  OUT="/home/groups/n/na/nagiosplug/htdocs/snapshot"
! CF="usf-cf-x86-linux-2"
! CF="usf-cf-x86-linux-1"
! CF="x86-linux2"
! CF="x86-linux1"
  DS=`date -u +%Y%m%d%H%M`
  
  # Make dists for HEAD and any others in command parameters
  make_dist
--- 53,74 ----
  # Set working variables
  PROJECT=nagiosplug
+ 
+ # This is local to the compile server for faster compile
+ COMPILE_DIR=/tmp/tonvoon/tmp_snapshot
+ 
+ #  Needs to be on NFS so gz file can be read on the compile shell server
  IN=${HOME}/tmp_snapshot
+ 
+ # Where to place the generated files
  OUT_SERVER="shell.sf.net"
  OUT="/home/groups/n/na/nagiosplug/htdocs/snapshot"
! 
! # Make sure prereqs are satisfied on server!
! CF="x86-solaris1"
  DS=`date -u +%Y%m%d%H%M`
  
+ # Setup home directory area
+ [[ ! -d $IN ]] && mkdir -p $IN
+ 
  # Make dists for HEAD and any others in command parameters
  make_dist
***************
*** 64,68 ****
  # Check for *.gz files locally (expect NFS between cf shell server and $CF)
  set -x
! files=$(ls $IN/*/$PROJECT/*.gz 2>/dev/null)
  [[ -z $files ]] && die "No files created"
  ssh $OUT_SERVER "rm -f $OUT/*.gz"
--- 79,83 ----
  # Check for *.gz files locally (expect NFS between cf shell server and $CF)
  set -x
! files=$(ls $IN/*.gz 2>/dev/null)
  [[ -z $files ]] && die "No files created"
  ssh $OUT_SERVER "rm -f $OUT/*.gz"