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/12/28 17:43:51 UTC
cvs commit: xml-forrest/scratchpad/forrestbot2/core build.xml getsrc.xml
brondsem 2003/12/28 08:43:51
Modified: scratchpad/forrestbot2/core build.xml getsrc.xml
Log:
getsrc.local doesn't copy; fixes FOR-100; patch from Marshall Roch
Revision Changes Path
1.3 +6 -1 xml-forrest/scratchpad/forrestbot2/core/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-forrest/scratchpad/forrestbot2/core/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 28 Dec 2003 16:37:22 -0000 1.2
+++ build.xml 28 Dec 2003 16:43:51 -0000 1.3
@@ -12,6 +12,11 @@
<property name="build.logfile-stored" location="${build.log-dir}/${ant.project.name}-${logtime}.log"/>
<target name="build.forrest" depends="getsrc">
+
+ <!-- defining this inside the target instead of at the top of the file
+ so that getsrc.local can override -->
+ <property name="build.home-dir" location="${build.work-dir}" />
+
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
<classpath>
<pathelement location="${bot.home}/lib/ant-contrib-0.5.jar"/>
@@ -26,7 +31,7 @@
... Rendering docs in ${build.work-dir}
</echo>
<antcall target="site" inheritAll="false">
- <param name="project.home" value="${build.work-dir}"/>
+ <param name="project.home" value="${build.home-dir}"/>
<param name="project.build-dir" value="${build.work-dir}"/>
<param name="project.site-dir" value="${build.site-dir}"/>
</antcall>
1.3 +1 -24 xml-forrest/scratchpad/forrestbot2/core/getsrc.xml
Index: getsrc.xml
===================================================================
RCS file: /home/cvs/xml-forrest/scratchpad/forrestbot2/core/getsrc.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- getsrc.xml 16 Dec 2003 17:06:12 -0000 1.2
+++ getsrc.xml 28 Dec 2003 16:43:51 -0000 1.3
@@ -4,30 +4,7 @@
<property name="getsrc.local.root-dir" value=""/>
<target name="getsrc.local">
- <echo>
- ....... getsrc.local START
- Copying source from ${getsrc.local.root-dir}
- </echo>
- <mkdir dir="${build.work-dir}"/>
- <copy todir="${build.work-dir}">
- <fileset dir="${getsrc.local.root-dir}">
- <include name="forrest.properties"/>
- <include name="status.xml"/>
- <include name="module.xml"/>
- </fileset>
- </copy>
- <echo>Loading ${build.work-dir}/forrest.properties..</echo>
- <loadproperties srcFile="${build.work-dir}/forrest.properties"/>
- <loadproperties srcFile="${bot.home}/core/default-forrest.properties"/>
- <echo>
- Copying source from ${project.root-dir}/${project.content-dir}
- </echo>
- <copy todir="${build.work-dir}/${project.content-dir}">
- <fileset dir="${getsrc.local.root-dir}/${project.content-dir}"/>
- </copy>
- <echo>
- ....... getsrc.local END
- </echo>
+ <property name="build.home-dir" value="${getsrc.local.root-dir}" />
</target>