You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by br...@apache.org on 2003/11/25 21:50:12 UTC
cvs commit: xml-forrest/scratchpad/forrestbot2/core cvs.xml email.xml forrestbot.xml local.xml
brondsem 2003/11/25 12:50:12
Modified: scratchpad/forrestbot2/core cvs.xml email.xml forrestbot.xml
local.xml
Log:
change paths so that this forrestbot can be used while still in the scratchpad
Revision Changes Path
1.3 +1 -1 xml-forrest/scratchpad/forrestbot2/core/cvs.xml
Index: cvs.xml
===================================================================
RCS file: /home/cvs/xml-forrest/scratchpad/forrestbot2/core/cvs.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cvs.xml 20 Nov 2003 19:42:29 -0000 1.2
+++ cvs.xml 25 Nov 2003 20:50:12 -0000 1.3
@@ -36,7 +36,7 @@
<echo>Loading ${build.cvsmodule-dir}/${module}${root-dir}/forrest.properties..</echo>
<loadproperties srcFile="${build.cvsmodule-dir}/${module}${root-dir}/forrest.properties"/>
- <loadproperties srcFile="${bot.home}/default-forrest.properties"/>
+ <loadproperties srcFile="${bot.home}/core/default-forrest.properties"/>
<echo><![CDATA[<cvs cvsRoot=":pserver:${user}@${host}:${root}"
package="${module}${root-dir}/${project.content-dir}"
1.2 +1 -1 xml-forrest/scratchpad/forrestbot2/core/email.xml
Index: email.xml
===================================================================
RCS file: /home/cvs/xml-forrest/scratchpad/forrestbot2/core/email.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- email.xml 20 Oct 2003 11:43:59 -0000 1.1
+++ email.xml 25 Nov 2003 20:50:12 -0000 1.2
@@ -10,7 +10,7 @@
subject="ForrestBot build for ${ant.project.name} ${completion-status}"
failonerror="false"
files="${build.logfile}"
- messagefile="${bot.home}/emailtemplate.txt">
+ messagefile="${bot.home}/core/emailtemplate.txt">
</mail>
</target>
1.4 +6 -5 xml-forrest/scratchpad/forrestbot2/core/forrestbot.xml
Index: forrestbot.xml
===================================================================
RCS file: /home/cvs/xml-forrest/scratchpad/forrestbot2/core/forrestbot.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- forrestbot.xml 20 Nov 2003 20:39:05 -0000 1.3
+++ forrestbot.xml 25 Nov 2003 20:50:12 -0000 1.4
@@ -4,13 +4,14 @@
<property environment="ENV"/>
<property name="forrest.home" location="${ENV.FORREST_HOME}"/>
- <property name="bot.home" location="${forrest.home}/forrestbot2/core"/>
+ <property name="bot.home" location="${forrest.home}/../../../scratchpad/forrestbot2"/>
+ <!--<property name="bot.home" location="${forrest.home}/forrestbot2"/>-->
<import file="${forrest.home}/forrest.build.xml"/>
<!--<import file="${bot.home}/rebuild-forrest.xml"/>-->
- <import file="${bot.home}/cvs.xml"/>
- <import file="${bot.home}/local.xml"/>
- <import file="${bot.home}/email.xml"/>
+ <import file="${bot.home}/core/cvs.xml"/>
+ <import file="${bot.home}/core/local.xml"/>
+ <import file="${bot.home}/core/email.xml"/>
<property name="administrator" value="jefft@apache.org"/>
<property name="build.work-dir" location="work/${ant.project.name}"/>
@@ -35,7 +36,7 @@
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
<classpath>
- <pathelement location="${forrest.home}/forrestbot/lib/ant-contrib-0.1.jar"/>
+ <pathelement location="${bot.home}/lib/ant-contrib-0.5.jar"/>
</classpath>
</taskdef>
1.3 +1 -1 xml-forrest/scratchpad/forrestbot2/core/local.xml
Index: local.xml
===================================================================
RCS file: /home/cvs/xml-forrest/scratchpad/forrestbot2/core/local.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- local.xml 20 Nov 2003 19:42:29 -0000 1.2
+++ local.xml 25 Nov 2003 20:50:12 -0000 1.3
@@ -15,7 +15,7 @@
</copy>
<echo>Loading ${build.work-dir}/forrest.properties..</echo>
<loadproperties srcFile="${build.work-dir}/forrest.properties"/>
- <loadproperties srcFile="${bot.home}/default-forrest.properties"/>
+ <loadproperties srcFile="${bot.home}/core/default-forrest.properties"/>
<echo>
Copying source from ${project.root-dir}/${project.content-dir}
</echo>