tomdz 2005/01/15 05:51:32
Modified: . build.xml
Log:
Changed Forrest invocation to use Forrest 0.6's ant build file instead of
forrest.bat/forrest.sh
Revision Changes Path
1.161 +10 -31 db-ojb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/db-ojb/build.xml,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- build.xml 13 Jan 2005 15:08:19 -0000 1.160
+++ build.xml 15 Jan 2005 13:51:32 -0000 1.161
@@ -30,7 +30,8 @@
</description>
<!-- Allow any user specific values to override the defaults -->
- <property file="${user.home}/build.properties" />
+ <property environment="env"/>
+ <property file="${user.home}/build.properties" />
<property file="build.properties"/>
<!-- Load the profile set in build.properties -->
@@ -803,10 +804,13 @@
</not>
</and>
</condition>
- <antcall target="forrest-on-win-with-cmd"/>
- <antcall target="forrest-on-win-with-command"/>
- <antcall target="forrest-on-unix"/>
-
+ <echo>Note that you need to use Ant version 1.6+ and have
commons-resolver (can be found in ${env.FORREST_HOME}/tools/ant/lib) in your
Ant's lib folder</echo>
+ <ant antfile="${env.FORREST_HOME}/forrest.build.xml"
+ dir="${build.doc}"
+ inheritall="false"
+ target="site">
+ <property name="forrest.home" value="${env.FORREST_HOME}"/>
+ </ant>
<!-- Finally we can copy the generated documentation to its
designated place -->
<mkdir dir="${doc}"/>
<copy todir="${doc}">
@@ -814,20 +818,6 @@
</copy>
</target>
- <target name="forrest-on-win-with-cmd" if="windows.with.cmd">
- <exec dir="${build.doc}" executable="cmd">
- <arg line="/c forrest.bat"/>
- </exec>
- </target>
- <target name="forrest-on-win-with-command" if="windows.with.command">
- <exec dir="${build.doc}" executable="command">
- <arg line="/c forrest.bat"/>
- </exec>
- </target>
- <target name="forrest-on-unix" if="not.windows">
- <exec dir="${build.doc}" executable="forrest"/>
- </target>
-
<!-- ==================================================================
-->
<!-- Build the API JavaDocs
-->
<!-- ==================================================================
-->
@@ -1387,17 +1377,6 @@
<classpath refid="compilation-classpath" />
</javac>
</target>
-
- <!-- ==================================================================
-->
- <!-- jdo enhancer - enhancing Product class
-->
- <!-- ==================================================================
-->
- <target name="enhance-jdori" depends="compile-samples">
- <java fork="yes" failonerror="yes"
- classname="com.sun.jdori.enhancer.Main"
classpathref="compilation-classpath">
- <arg line="-v -f -d ${build.destsamples}
${build.srcsamples}/org/apache/ojb/tutorial5/Product.jdo
${build.destsamples}/org/apache/ojb/tutorial5/Product.class"/>
- </java>
- </target>
-
<!-- ==================================================================
-->
<!-- build OQL Parser classes from oql-ojb.g grammar
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
