You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/06/19 07:37:23 UTC
svn commit: rev 21442 - in avalon/trunk: central/system central/system/build planet/tutorials/hello runtime/main tools/magic/src/main/org/apache/avalon/tools/tasks
Author: mcconnell
Date: Fri Jun 18 22:37:22 2004
New Revision: 21442
Modified:
avalon/trunk/central/system/build/standard.xml
avalon/trunk/central/system/index.xml
avalon/trunk/planet/tutorials/hello/build.properties
avalon/trunk/runtime/main/build.properties
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java
Log:
getting adventorouse
Modified: avalon/trunk/central/system/build/standard.xml
==============================================================================
--- avalon/trunk/central/system/build/standard.xml (original)
+++ avalon/trunk/central/system/build/standard.xml Fri Jun 18 22:37:22 2004
@@ -23,6 +23,10 @@
<x:javac/>
</target>
+ <target name="javadoc" depends="prepare">
+ <x:javadoc/>
+ </target>
+
<target name="package" depends="build">
<x:jar/>
</target>
@@ -31,19 +35,15 @@
<x:junit/>
</target>
- <target name="site" depends="build">
- <x:xdoc theme="modern"/>
- </target>
-
<target name="install" depends="test">
<x:install/>
</target>
- <target name="dist" depends="package,site,install"/>
-
- <target name="javadoc" depends="prepare">
- <x:javadoc/>
+ <target name="site" depends="build,javadoc">
+ <x:xdoc theme="modern"/>
</target>
+
+ <target name="dist" depends="test,site,install"/>
</project>
Modified: avalon/trunk/central/system/index.xml
==============================================================================
--- avalon/trunk/central/system/index.xml (original)
+++ avalon/trunk/central/system/index.xml Fri Jun 18 22:37:22 2004
@@ -91,14 +91,13 @@
<name>site</name>
</info>
<dependencies>
- <include key="avalon-merlin-cli" runtime="false"/>
- <include key="avalon-repository-cli" runtime="false"/>
+ <include key="avalon-runtime"/>
</dependencies>
</project>
- <!--
- Avalon LogKit.
- -->
+ <!--
+ Avalon LogKit.
+ -->
<project basedir="../../runtime/logkit">
<info>
Modified: avalon/trunk/planet/tutorials/hello/build.properties
==============================================================================
--- avalon/trunk/planet/tutorials/hello/build.properties (original)
+++ avalon/trunk/planet/tutorials/hello/build.properties Fri Jun 18 22:37:22 2004
@@ -2,3 +2,4 @@
project.home = ../..
project.name = avalon-tutorial-hello
project.src.main = java
+project.javadoc.enabled = true
\ No newline at end of file
Modified: avalon/trunk/runtime/main/build.properties
==============================================================================
--- avalon/trunk/runtime/main/build.properties (original)
+++ avalon/trunk/runtime/main/build.properties Fri Jun 18 22:37:22 2004
@@ -1,2 +1,3 @@
project.name = avalon-runtime
project.home = ../../central/system
+project.javadoc.enabled = true
\ No newline at end of file
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java Fri Jun 18 22:37:22 2004
@@ -47,6 +47,8 @@
private static final Link J2SE =
new Link( "http://java.sun.com/j2se/1.4/docs/api/" );
+ public static final String JAVADOC_PRODUCTION_KEY = "project.javadoc.enabled";
+
public static class Link
{
private String m_href;
@@ -182,17 +184,21 @@
public void execute() throws BuildException
{
- Definition def = getReferenceDefinition();
- File root = getJavadocRootDirectory( def );
- Path classpath = def.getPath( getProject(), Policy.RUNTIME );
-
- File api = new File( root, "api" );
- File spi = new File( root, "spi" );
- File imp = new File( root, "impl" );
-
- setup( def, classpath, ResourceRef.API, api, false );
- setup( def, classpath, ResourceRef.SPI, spi, false );
- setup( def, classpath, ResourceRef.IMPL, imp, true );
+ String actionable = getProject().getProperty( JAVADOC_PRODUCTION_KEY );
+ if( "true".equals( actionable ) )
+ {
+ Definition def = getReferenceDefinition();
+ File root = getJavadocRootDirectory( def );
+ Path classpath = def.getPath( getProject(), Policy.RUNTIME );
+
+ File api = new File( root, "api" );
+ File spi = new File( root, "spi" );
+ File imp = new File( root, "impl" );
+
+ setup( def, classpath, ResourceRef.API, api, false );
+ setup( def, classpath, ResourceRef.SPI, spi, false );
+ setup( def, classpath, ResourceRef.IMPL, imp, true );
+ }
}
private void setup(
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org