You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/11/14 17:20:59 UTC
svn commit: r474853 - in /lenya/trunk/src: resources/build/modules2build.xsl
targets/docs-build.xml targets/modules-build.xml
Author: andreas
Date: Tue Nov 14 08:20:58 2006
New Revision: 474853
URL: http://svn.apache.org/viewvc?view=rev&rev=474853
Log:
Build module javadocs
Modified:
lenya/trunk/src/resources/build/modules2build.xsl
lenya/trunk/src/targets/docs-build.xml
lenya/trunk/src/targets/modules-build.xml
Modified: lenya/trunk/src/resources/build/modules2build.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/resources/build/modules2build.xsl?view=diff&rev=474853&r1=474852&r2=474853
==============================================================================
--- lenya/trunk/src/resources/build/modules2build.xsl (original)
+++ lenya/trunk/src/resources/build/modules2build.xsl Tue Nov 14 08:20:58 2006
@@ -30,6 +30,14 @@
<xsl:param name="module-schema"/>
<xsl:param name="copy-modules"/>
+
+ <xsl:template name="separator">
+ <xsl:if test="following-sibling::list:module">
+ <xsl:text>, </xsl:text>
+ </xsl:if>
+ </xsl:template>
+
+
<xsl:template match="list:modules">
<project name="lenya-modules">
@@ -55,9 +63,7 @@
<xsl:variable name="compileDependencyList">
<xsl:for-each select="list:module">
<xsl:apply-templates select="document(concat(@src, '/module.xml'))/mod:module" mode="call"/>
- <xsl:if test="following-sibling::list:module">
- <xsl:text>, </xsl:text>
- </xsl:if>
+ <xsl:call-template name="separator"/>
</xsl:for-each>
</xsl:variable>
<target name="compile-modules" depends="{$compileDependencyList}"/>
@@ -65,14 +71,16 @@
<xsl:variable name="testDependencyList">
<xsl:for-each select="list:module">
<xsl:apply-templates select="document(concat(@src, '/module.xml'))/mod:module" mode="patch-test"/>
- <xsl:if test="following-sibling::list:module">
- <xsl:text>, </xsl:text>
- </xsl:if>
+ <xsl:call-template name="separator"/>
</xsl:for-each>
</xsl:variable>
<target name="patch-modules-test" depends="{$testDependencyList}"/>
+ <target name="javadocs-modules">
+ <xsl:apply-templates select="list:module" mode="call-javadocs"/>
+ </target>
+
<target name="test-modules" depends="patch-modules-test">
<xsl:apply-templates select="list:module" mode="call-test"/>
</target>
@@ -97,12 +105,20 @@
<xsl:apply-templates select="document(concat(@src, '/module.xml'))/mod:module" mode="call-test"/>
</xsl:template>
-
<xsl:template match="mod:module" mode="call-test">
<antcall target="test-module-{mod:id}"/>
</xsl:template>
+ <xsl:template match="list:module" mode="call-javadocs">
+ <xsl:apply-templates select="document(concat(@src, '/module.xml'))/mod:module" mode="call-javadocs"/>
+ </xsl:template>
+
+ <xsl:template match="mod:module" mode="call-javadocs">
+ <antcall target="javadocs-module-{mod:id}"/>
+ </xsl:template>
+
+
<xsl:template match="list:module" mode="target">
<xsl:apply-templates select="document(concat(@src, '/module.xml'))/mod:module" mode="target">
<xsl:with-param name="src" select="@src"/>
@@ -113,6 +129,7 @@
<xsl:template match="mod:module" mode="target">
<xsl:param name="src"/>
<xsl:variable name="id" select="mod:id"/>
+ <xsl:variable name="shortname" select="substring(mod:id, string-length(mod:package) + 2)"/>
<target name="validate-module-{$id}">
<jing rngfile="{$module-schema}" file="{$src}/module.xml"/>
@@ -139,18 +156,18 @@
<xsl:variable name="destDir">${build.dir}/modules/<xsl:value-of select="$id"/>/java/classes</xsl:variable>
+ <path id="module.classpath.{$id}">
+ <path refid="classpath"/>
+ <fileset dir="${{build.webapp}}/WEB-INF/lib" includes="lenya-*-api.jar"/>
+ <xsl:for-each select="mod:depends">
+ <fileset dir="${{build.webapp}}/WEB-INF/lib" includes="lenya-module-{@module}.jar"/>
+ </xsl:for-each>
+ <fileset dir="{$src}" includes="java/lib/*.jar"/>
+ <fileset dir="${{lib.dir}}" includes="*.jar"/>
+ </path>
+
<target name="compile-module-{$id}" if="compile.module.{$id}">
- <path id="module.classpath.{$id}">
- <path refid="classpath"/>
- <fileset dir="${{build.webapp}}/WEB-INF/lib" includes="lenya-*-api.jar"/>
- <xsl:for-each select="mod:depends">
- <fileset dir="${{build.webapp}}/WEB-INF/lib" includes="lenya-module-{@module}.jar"/>
- </xsl:for-each>
- <fileset dir="{$src}" includes="java/lib/*.jar"/>
- <fileset dir="${{lib.dir}}" includes="*.jar"/>
- </path>
-
<mkdir dir="{$destDir}"/>
<javac
@@ -231,6 +248,42 @@
<target name="deploy-module-{$id}"
depends="dependency-warnings-{$id}, {$dependencyList} validate-module-{$id}, compile-module-{$id}, copy-module-{$id}, patch-module-{$id}"/>
+ <!-- ============================================================ -->
+ <!-- Javadocs -->
+ <!-- ============================================================ -->
+
+ <!-- Set a variable if javadoc is already up-to-date -->
+ <target name="javadocs-module-check-{$id}">
+ <uptodate property="javadocs.notrequired.module.{$id}" targetfile="${{dist.bin.javadocs}}/packages.html" >
+ <srcfiles dir="{$src}/java/src" includes="**/*.java"/>
+ </uptodate>
+ </target>
+
+ <target name="javadocs-module-{$id}"
+ if="compile.module.{$id}"
+ unless="javadocs.notrequired.module.{$id}">
+ <javadoc packagenames="${{packages}}"
+ destdir="${{dist.bin.javadocs}}/modules/{$shortname}"
+ author="true"
+ version="true"
+ use="false"
+ noindex="true"
+ breakiterator="true"
+ windowtitle="${{Name}} API - Version ${{version}}"
+ doctitle="${{Name}}"
+ bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved."
+ stylesheetfile="${{src.resource.dir}}/javadoc.css"
+ source="${{src.java.version}}">
+ <!-- sources -->
+ <sourcepath>
+ <pathelement path="{$src}/java/src"/>
+ </sourcepath>
+
+ <!-- pass ant in the classpath to avoid class not found errors -->
+ <classpath refid="module.classpath.{$id}"/>
+ </javadoc>
+ </target>
+
<!-- ============================================================ -->
<!-- Test -->
<!-- ============================================================ -->
Modified: lenya/trunk/src/targets/docs-build.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/targets/docs-build.xml?view=diff&rev=474853&r1=474852&r2=474853
==============================================================================
--- lenya/trunk/src/targets/docs-build.xml (original)
+++ lenya/trunk/src/targets/docs-build.xml Tue Nov 14 08:20:58 2006
@@ -39,30 +39,29 @@
<echo message=" ${src.java.dir}/**/*.java"/>
<echo message="-------------------------------------------------------------"/>
</target>
-
- <!-- Creates the API documentation -->
- <target name="javadocs" depends="prepare-src, javadocs_check, javadocs_done" unless="javadocs.notrequired" description="Generates the API documentation">
+
+ <target name="javadocs-api">
<mkdir dir="${dist.bin.javadocs}"/>
<javadoc packagenames="${packages}"
- destdir="${dist.bin.javadocs}"
- author="true"
- version="true"
- use="false"
- noindex="true"
- breakiterator="true"
- windowtitle="${Name} API - Version ${version}"
- doctitle="${Name}"
- bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved."
- stylesheetfile="${src.resource.dir}/javadoc.css"
- source="${src.java.version}">
+ destdir="${dist.bin.javadocs}"
+ author="true"
+ version="true"
+ use="false"
+ noindex="true"
+ breakiterator="true"
+ windowtitle="${Name} API - Version ${version}"
+ doctitle="${Name}"
+ bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved."
+ stylesheetfile="${src.resource.dir}/javadoc.css"
+ source="${src.java.version}">
<!-- sources -->
<sourcepath>
- <pathelement path="${src.java.api.dir}"/>
- <!--
- <pathelement path="${build.java.src}"/>
- -->
+ <pathelement path="${src.java.api.dir}"/>
+ <!--
+ <pathelement path="${build.java.src}"/>
+ -->
</sourcepath>
-
+
<!-- pass ant in the classpath to avoid class not found errors -->
<classpath>
<fileset dir="${lib.dir}">
@@ -80,4 +79,11 @@
</classpath>
</javadoc>
</target>
+
+ <!-- Creates the API documentation -->
+ <target name="javadocs"
+ depends="prepare-src, javadocs_check, javadocs_done, javadocs-api, javadocs-modules"
+ unless="javadocs.notrequired"
+ description="Generates the API documentation"/>
+
</project>
Modified: lenya/trunk/src/targets/modules-build.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/targets/modules-build.xml?view=diff&rev=474853&r1=474852&r2=474853
==============================================================================
--- lenya/trunk/src/targets/modules-build.xml (original)
+++ lenya/trunk/src/targets/modules-build.xml Tue Nov 14 08:20:58 2006
@@ -70,6 +70,18 @@
<!-- ================================================ -->
+ <!-- Javadocs -->
+ <!-- ================================================ -->
+
+ <target name="javadocs-modules" depends="prepare-modules">
+ <ant antfile="${build.dir}/temp/modules-build.xml"
+ inheritall="true"
+ inheritrefs="true"
+ target="javadocs-modules"/>
+ </target>
+
+
+ <!-- ================================================ -->
<!-- Module tests -->
<!-- ================================================ -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org