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/04 10:41:15 UTC
cvs commit: xml-forrest/src/resources/forrestbot2/core forrestbot.xml local.xml
jefft 2003/10/04 01:41:15
Modified: . build.xml
src/resources/forrestbot2 xml-forrest.xml xml-xmlbeans.xml
src/resources/forrestbot2/core forrestbot.xml local.xml
Log:
Get new forrestbot minimally working
Revision Changes Path
1.78 +6 -0 xml-forrest/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-forrest/build.xml,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- build.xml 3 Oct 2003 14:56:27 -0000 1.77
+++ build.xml 4 Oct 2003 08:41:15 -0000 1.78
@@ -389,6 +389,12 @@
<fileset dir="src/resources/forrestbot/bin"/>
</copy>
+ <!-- Copy forrestbot2 -->
+ <mkdir dir="${dist-shbat.dir}/forrestbot2" />
+ <copy todir="${dist-shbat.dir}/forrestbot2">
+ <fileset dir="src/resources/forrestbot2"/>
+ </copy>
+
<!-- Fix bin/ permissions -->
<fixcrlf eol="crlf" srcdir="${dist-shbat.dir}/bin" includes="*.bat"/>
<fixcrlf eol="lf" srcdir="${dist-shbat.dir}/bin" excludes="*.bat"/>
1.2 +2 -2 xml-forrest/src/resources/forrestbot2/xml-forrest.xml
Index: xml-forrest.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/forrestbot2/xml-forrest.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml-forrest.xml 1 Oct 2003 12:16:54 -0000 1.1
+++ xml-forrest.xml 4 Oct 2003 08:41:15 -0000 1.2
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
-<project name="xml-forrest" basedir="." default="main">
+<project name="xml-forrest" default="main">
<import file="core/forrestbot.xml"/>
- <target name="getsrc" depends="getsrc.local"/>
+ <target name="getsrc" depends="local.getsrc"/>
</project>
1.2 +2 -3 xml-forrest/src/resources/forrestbot2/xml-xmlbeans.xml
Index: xml-xmlbeans.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/forrestbot2/xml-xmlbeans.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml-xmlbeans.xml 1 Oct 2003 12:16:54 -0000 1.1
+++ xml-xmlbeans.xml 4 Oct 2003 08:41:15 -0000 1.2
@@ -1,9 +1,8 @@
<?xml version="1.0"?>
-<project name="xml-xmlbeans" basedir="." default="main">
-
- <import file="core/forrestbot.xml"/>
+<project name="xml-xmlbeans" default="main">
<property name="project.root-dir" value="website"/>
+ <import file="core/forrestbot.xml"/>
<target name="getsrc" depends="local.getsrc"/>
1.2 +8 -5 xml-forrest/src/resources/forrestbot2/core/forrestbot.xml
Index: forrestbot.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/forrestbot2/core/forrestbot.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forrestbot.xml 1 Oct 2003 12:16:54 -0000 1.1
+++ forrestbot.xml 4 Oct 2003 08:41:15 -0000 1.2
@@ -3,16 +3,17 @@
<project basedir="." default="main">
<property name="forrest.home" value="${user.home}/apache/xml/xml-forrest/build/dist/shbat"/>
- <property name="bot.home" value="${forrest.home}/forrestbot2"/>
+ <property name="bot.home" value="${forrest.home}/forrestbot2/core"/>
<import file="${forrest.home}/forrest.build.xml"/>
- <import file="${bot.home}/rebuild-forrest.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"/>
<property name="administrator" value="jefft@apache.org"/>
<property name="build.work-dir" value="work/${ant.project.name}"/>
+ <property name="build.site-dir" value="work/${ant.project.name}/site"/>
<property name="build.deploy-dir" value="sites/${ant.project.name}"/>
<mkdir dir="logs"/>
<tstamp>
@@ -39,9 +40,11 @@
<try>
<record name="${build.logfile}" action="start"/>
<antcall target="forrest.site" inheritAll="false">
- <param name="basedir" value="${build.work-dir}"/>
+ <param name="project.home" value="${build.work-dir}"/>
+ <param name="project.build-dir" value="${build.work-dir}"/>
+ <param name="project.site-dir" value="${build.site-dir}"/>
</antcall>
- <record name="forrest.log" action="stop"/>
+ <record name="${build.logfile}" action="stop"/>
<property name="completion-status" value="succeeded" />
</try>
<catch>
@@ -58,6 +61,6 @@
<target name="notify" depends="email.notify"/>
- <target name="main" depends="deploy, notify"/>
+ <target name="main" depends="getsrc, site, deploy, notify"/>
</project>
1.2 +3 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- local.xml 1 Oct 2003 12:16:54 -0000 1.1
+++ local.xml 4 Oct 2003 08:41:15 -0000 1.2
@@ -13,17 +13,17 @@
</fileset>
</copy>
<loadproperties srcFile="${build.work-dir}/forrest.properties"/>
- <loadproperties srcFile="default-forrest.properties"/>
+ <loadproperties srcFile="${bot.home}/default-forrest.properties"/>
<copy todir="${build.work-dir}/${project.content-dir}">
<fileset dir="${local.root-dir}/${project.content-dir}"/>
</copy>
</target>
- <target name="deploy" depends="site" unless="build-failed">
+ <target name="deploy">
<mkdir dir="${build.deploy-dir}"/>
<copy todir="${build.deploy-dir}">
- <fileset dir="${build.work-dir}/${project.site-dir}"/>
+ <fileset dir="${build.site-dir}"/>
</copy>
</target>