[fant commit] r91 - trunk/etc/ant-inc

[codesite...@google.com]

Author: maomaode
Date: Fri May 30 03:45:36 2008
New Revision: 91

Modified:
trunk/etc/ant-inc/compile.xml
trunk/etc/ant-inc/javadoc.xml
trunk/etc/ant-inc/package.xml

Log:
* Generate and package the javadoc

Modified: trunk/etc/ant-inc/compile.xml
==============================================================================
--- trunk/etc/ant-inc/compile.xml (original)
+++ trunk/etc/ant-inc/compile.xml Fri May 30 03:45:36 2008
@@ -42,16 +42,19 @@
<target name="code.gen" depends="code.gen.xsd, code.gen.wsdl"
description="--> Generate code from .xsd or .wsdl"/>

<target name="code.gen.xsd" if="src.schemas.dir.present">
+ <property name="code.gen.present" value="true"/>
<xsd2java dest.dir="${build.main.generated.dir}"
src.dir="${src.main.schemas.dir}"/>
</target>

<target name="code.gen.wsdl" if="src.wsdl.dir.present">
+ <echo message="Code Generation for the wsdl files under ${src.main.wsdl.dir}"/>
+ <property name="code.gen.present" value="true"/>
<wsdl2java dest.dir="${build.main.generated.dir}"
src.dir="${src.main.wsdl.dir}"/>
</target>

- <target name="compile.generated.src">
+ <target name="compile.generated.src" if="code.gen.present">
<antcall target="compile.src">
<param name="src.main.java.dir" value="${build.main.generated.dir}"/>
</antcall>

Modified: trunk/etc/ant-inc/javadoc.xml
==============================================================================
--- trunk/etc/ant-inc/javadoc.xml (original)
+++ trunk/etc/ant-inc/javadoc.xml Fri May 30 03:45:36 2008
@@ -21,10 +21,18 @@
description="Nested element:" scope="types"/>
</javadoc>

+ <available file="${build.main.generated.dir}"
+ type="dir"
+ property="generated.dir.present"/>
+ <antcall target="javadoc.gen"/>
+ </target>
+
+ <target name="javadoc.gen" if="generated.dir.present">
<javadoc sourcepath="${build.main.generated.dir}"
destdir="${generated.api.dir}"
packagenames="*"
author="true"
+ failonerror="false"
version="true"
windowtitle="${ant.project.name}">
<tag name="ant.task" enabled="false" description="Task:" scope="types"/>
@@ -37,7 +45,6 @@
<tag name="ant.element" enabled="false"
description="Nested element:" scope="types"/>
</javadoc>
-
</target>

</project>

Modified: trunk/etc/ant-inc/package.xml
==============================================================================
--- trunk/etc/ant-inc/package.xml (original)
+++ trunk/etc/ant-inc/package.xml Fri May 30 03:45:36 2008
@@ -4,13 +4,16 @@
<property name="dist.src" value="${dist.dir}/src"/>
<property name="dist.lib" value="${dist.dir}/lib"/>
<property name="dist.etc" value="${dist.dir}/etc"/>
+ <property name="dist.samples" value="${dist.dir}/samples"/>
<property name="dist.doc" value="${dist.dir}/docs"/>
<property name="dist.doc.api" value="${dist.doc}/api"/>
<!--<property name="dist.doc.manual" value="${dist.doc}/manual"/>-->
<property name="dist.testcases" value="${dist.dir}/testcases"/>
<property name="dist.name" value="${project.artifact.id}-${project.version}"/>

- <target name="prepackage.binary" depends="jar">
+ <target name="package" depends="package.binary, package.source"
description="--> Package the bin/src balls"/>
+
+ <target name="prepackage.binary" depends="jar, javadoc">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.bin}"/>
<mkdir dir="${dist.lib}"/>
@@ -34,6 +37,10 @@
</fileset>
</copy>

+ <copy todir="${dist.samples}" failonerror="false">
+ <fileset dir="${basedir}/samples"/>
+ </copy>
+
<copy todir="${dist.doc.api}" failonerror="false">
<fileset dir="${core.api.dir}"/>
</copy>
@@ -88,7 +95,7 @@
</target>

- <target name="prepackage.source">
+ <target name="prepackage.source" depends="javadoc">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.etc}"/>
<mkdir dir="${dist.src}"/>
@@ -106,6 +113,10 @@
<fileset dir="${basedir}/bin"/>
</copy>

+ <copy todir="${dist.samples}" failonerror="false">
+ <fileset dir="${basedir}/samples"/>
+ </copy>
+
<copy todir="${dist.dir}">
<fileset dir=".">
<include name="README.txt"/>
@@ -119,7 +130,7 @@
<fileset dir="${src.dir}"/>
</copy>

- <copy todir="${dist.etc}">
+ <copy todir="${dist.etc}" failonerror="false">
<fileset dir="${etc.dir}">
<exclude name="**/dev.xml"/>
<exclude name="**/iona.jalopy.xml"/>