From: Chris K. <ki...@us...> - 2004-04-20 21:48:32
|
User: kimptoc Date: 04/04/20 14:48:24 Modified: etc/cruisecontrol/scripts config.xml.template gen_configs.sh Added: etc/cruisecontrol/scripts generate.conf Log: more params for build config Revision Changes Path 1.2 +9 -9 tools/etc/cruisecontrol/scripts/config.xml.template Index: config.xml.template =================================================================== RCS file: /cvsroot/jboss/tools/etc/cruisecontrol/scripts/config.xml.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.xml.template 20 Apr 2004 19:57:30 -0000 1.1 +++ config.xml.template 20 Apr 2004 21:48:14 -0000 1.2 @@ -33,23 +33,23 @@ <!-- TODO it would be good to parameterize these changing bits --> <!-- CHANGE TO LOCALHOST and jboss-dev when live --> <!-- - <email mailhost="smtp.metronet.co.uk" - returnaddress="kim...@ya..." + <email mailhost="MAILSERVER" + returnaddress="EMAILFROM" skipusers="true" - buildresultsurl="http://tck2.jboss.com/cc"> - <always address="ch...@ki..."/> + buildresultsurl="http://WEBHOST/cc"> + <always address="EMAILTO"/> </email> --> <!-- CHANGE TO cruisecontrol install dir and reporting host--> <htmlemail mailhost="smtp.metronet.co.uk" - css="C:/installed/cruisecontrol-2.1.5/reporting/jsp/css/cruisecontrol.css" - xsldir="C:/installed/cruisecontrol-2.1.5/reporting/jsp/xsl" + css="CCDIR/reporting/jsp/css/cruisecontrol.css" + xsldir="CCDIR/reporting/jsp/xsl" logdir="logs/PROJECTNAME" - returnaddress="ch...@ki..." - buildresultsurl="http://localhost/cc/buildresults/PROJECTNAME" + returnaddress="EMAILFROM" + buildresultsurl="http://WEBHOST/cc/buildresults/PROJECTNAME" skipusers="true"> <!-- CHANGE TO jboss-dev WHEN LIVE --> - <always address="ch...@ki..."/> + <always address="EMAILTO"/> </htmlemail> </publishers> 1.2 +21 -3 tools/etc/cruisecontrol/scripts/gen_configs.sh Index: gen_configs.sh =================================================================== RCS file: /cvsroot/jboss/tools/etc/cruisecontrol/scripts/gen_configs.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gen_configs.sh 20 Apr 2004 20:12:22 -0000 1.1 +++ gen_configs.sh 20 Apr 2004 21:48:23 -0000 1.2 @@ -1,13 +1,31 @@ # this script generates the cruise control config.xml files from the template +. generate.conf + +edit_file() +{ +sedcmd=$1 +sedfile=$2 +sedtofile=${3:-$sedfile} + +echo sed $sedcmd $sedfile $sedtofile + +sed $sedcmd $sedfile >$sedtofile.tmp +mv $sedtofile.tmp $sedtofile +} + merge_template() { . $1 -sed s/PROJECTNAME/$PROJECTNAME/g config.xml.template >$PROJECTCC.1 -sed s/BUILDTARGET/$BUILDTARGET/g $PROJECTCC.1 >$PROJECTCC +edit_file s/PROJECTNAME/$PROJECTNAME/g config.xml.template $PROJECTCC +edit_file s/BUILDTARGET/$BUILDTARGET/g $PROJECTCC +edit_file s/EMAILTO/$EMAILTO/g $PROJECTCC +edit_file s/EMAILFROM/$EMAILFROM/g $PROJECTCC +edit_file s/WEBHOST/$WEBHOST/g $PROJECTCC +edit_file s*CCDIR*$CCDIR*g $PROJECTCC +edit_file s/MAILSERVER/$MAILSERVER/g $PROJECTCC -rm $PROJECTCC.1 } merge_template build-head.conf 1.1 tools/etc/cruisecontrol/scripts/generate.conf Index: generate.conf =================================================================== EMAILTO=ch...@ki... EMAILFROM=ch...@ki... WEBHOST=nog CCDIR=\/home\/jbossci\/cruisecontrol-2.1.5 MAILSERVER=smtp.metronet.co.uk |