You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by je...@apache.org on 2003/10/05 13:00:54 UTC
cvs commit: xml-forrest/src/resources/forrestbot2/core cvs.xml local.xml
jefft 2003/10/05 04:00:54
Modified: src/resources/forrestbot2 xml-fop.xml
src/resources/forrestbot2/core cvs.xml local.xml
Added: src/resources/forrestbot2 avalon-phoenix.xml avalon-site.xml
incubator-site.xml sf-struts.xml xml-site.xml
xml-xindice.xml
Log:
Add a few more projects, and fix CVS support
Revision Changes Path
1.2 +4 -2 xml-forrest/src/resources/forrestbot2/xml-fop.xml
Index: xml-fop.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/forrestbot2/xml-fop.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml-fop.xml 4 Oct 2003 14:07:09 -0000 1.1
+++ xml-fop.xml 5 Oct 2003 11:00:54 -0000 1.2
@@ -1,9 +1,11 @@
<?xml version="1.0"?>
<project name="xml-fop" default="main">
- <property name="project.root-dir" value="/home/jeff/apache/xml/xml-fop"/>
- <import file="core/forrestbot.xml"/>
+ <!--
+ <property name="project.root-dir" value="${user.home}/apache/xml/xml-fop"/>
<target name="getsrc" depends="local.getsrc"/>
+ -->
+ <import file="core/forrestbot.xml"/>
</project>
1.1 xml-forrest/src/resources/forrestbot2/avalon-phoenix.xml
Index: avalon-phoenix.xml
===================================================================
<?xml version="1.0"?>
<project name="avalon-phoenix" default="main">
<!--
<property name="project.root-dir" value="${user.home}/apache/avalon/avalon-phoenix"/>
<target name="getsrc" depends="local.getsrc"/>
-->
<import file="core/forrestbot.xml"/>
</project>
1.1 xml-forrest/src/resources/forrestbot2/avalon-site.xml
Index: avalon-site.xml
===================================================================
<?xml version="1.0"?>
<project name="avalon-site" default="main">
<!--
<property name="project.root-dir" value="${user.home}/apache/avalon/avalon-site"/>
<target name="getsrc" depends="local.getsrc"/>
-->
<import file="core/forrestbot.xml"/>
</project>
1.1 xml-forrest/src/resources/forrestbot2/incubator-site.xml
Index: incubator-site.xml
===================================================================
<?xml version="1.0"?>
<project name="incubator-site" default="main">
<!--
<property name="project.root-dir" value="${user.home}/apache/incubator/incubator-site"/>
<target name="getsrc" depends="local.getsrc"/>
-->
<import file="core/forrestbot.xml"/>
</project>
1.1 xml-forrest/src/resources/forrestbot2/sf-struts.xml
Index: sf-struts.xml
===================================================================
<?xml version="1.0"?>
<project name="struts-site" default="main">
<property name="user" value="anonymous"/>
<property name="password" value=""/>
<property name="root" value="/cvsroot/struts"/>
<property name="host" value="cvs.sourceforge.net"/>
<property name="module" value="${ant.project.name}"/>
<import file="core/forrestbot.xml"/>
<target name="getsrc" depends="cvs.getsrc"/>
<!-- <target name="notify" depends="email.notify-onfail"/> -->
<target name="notify" depends="local.notify"/>
</project>
1.1 xml-forrest/src/resources/forrestbot2/xml-site.xml
Index: xml-site.xml
===================================================================
<?xml version="1.0"?>
<project name="xml-site" default="main">
<!--
<property name="project.root-dir" value="${user.home}/apache/xml/xml-site"/>
<target name="getsrc" depends="local.getsrc"/>
-->
<import file="core/forrestbot.xml"/>
</project>
1.1 xml-forrest/src/resources/forrestbot2/xml-xindice.xml
Index: xml-xindice.xml
===================================================================
<?xml version="1.0"?>
<project name="xml-xindice" default="main">
<!--
<property name="project.root-dir" value="${user.home}/apache/xml/xml-xindice"/>
<target name="getsrc" depends="local.getsrc"/>
-->
<import file="core/forrestbot.xml"/>
</project>
1.3 +24 -7 xml-forrest/src/resources/forrestbot2/core/cvs.xml
Index: cvs.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/forrestbot2/core/cvs.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cvs.xml 4 Oct 2003 14:07:09 -0000 1.2
+++ cvs.xml 5 Oct 2003 11:00:54 -0000 1.3
@@ -9,30 +9,47 @@
<property name="build.cvsmodule-dir" value="work/cvsmodules"/>
<property name="build.work-dir" value="work/${ant.project.name}"/>
- <property name="project.root-dir" value="."/>
+ <condition property="root-dir" value="/${project.root-dir}">
+ <isset property="project.root-dir"/>
+ </condition>
+ <property name="root-dir" value=""/>
<target name="getsrc">
<cvspass cvsroot=":pserver:${user}@${host}:${root}" password="${password}"/>
- <cvs cvsRoot=":pserver:${user}@${host}:${root}"
- package="${module}/${project.root-dir}"
+ <echo><![CDATA[<cvs cvsRoot=":pserver:${user}@${host}:${root}"
+ package="${module}${root-dir}"
dest="${build.cvsmodule-dir}"
quiet="false"
command="checkout -l"
+ />]]></echo>
+
+ <cvs cvsRoot=":pserver:${user}@${host}:${root}"
+ package="${module}${root-dir}"
+ dest="${build.cvsmodule-dir}"
+ quiet="true"
+ command="checkout -l"
/>
- <loadproperties srcFile="${build.cvsmodule-dir}/${module}/${project.root-dir}/forrest.properties"/>
+ <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"/>
- <cvs cvsRoot=":pserver:${user}@${host}:${root}"
- package="${module}/${project.root-dir}/${project.content-dir}"
+ <echo><![CDATA[<cvs cvsRoot=":pserver:${user}@${host}:${root}"
+ package="${module}${root-dir}/${project.content-dir}"
dest="${build.cvsmodule-dir}"
quiet="false"
+ />]]></echo>
+
+ <cvs cvsRoot=":pserver:${user}@${host}:${root}"
+ package="${module}${root-dir}/${project.content-dir}"
+ dest="${build.cvsmodule-dir}"
+ quiet="true"
/>
<copy todir="${build.work-dir}">
- <fileset dir="${build.cvsmodule-dir}/${module}/${project.root-dir}"/>
+ <fileset dir="${build.cvsmodule-dir}/${module}${root-dir}"/>
</copy>
</target>
1.4 +1 -3 xml-forrest/src/resources/forrestbot2/core/local.xml
Index: local.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/forrestbot2/core/local.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- local.xml 4 Oct 2003 14:07:09 -0000 1.3
+++ local.xml 5 Oct 2003 11:00:54 -0000 1.4
@@ -15,9 +15,7 @@
<include name="module.xml"/>
</fileset>
</copy>
- <echo>
- Loading ${build.work-dir}/forrest.properties..
- </echo>
+ <echo>Loading ${build.work-dir}/forrest.properties..</echo>
<loadproperties srcFile="${build.work-dir}/forrest.properties"/>
<loadproperties srcFile="${bot.home}/default-forrest.properties"/>
<echo>