Author: linus
Date: 2008-03-01 10:19:31-0800
New Revision: 14169
Added:
trunk/src/infra/lib/javadocs/
trunk/src/infra/lib/javadocs/log4j/
- copied from r14168, /trunk/src/app/lib/javadocs/log4j/
trunk/src/model-mdr/lib/javadocs/
trunk/src/model-mdr/lib/javadocs/jmi/
- copied from r14168, /trunk/src/app/lib/javadocs/jmi/
Removed:
trunk/src/app/lib/javadocs/jmi/
trunk/src/app/lib/javadocs/log4j/
Modified:
trunk/src/build.xml
trunk/src/default.properties
Log:
Moved some of the javadoc properties into the build.xml file => less magic.
Adjusted the paths to make the javadoc references work again.
Moved the javadoc references to the correct subsystem, i.e. the subsystem
that takes in the library.
Modified: trunk/src/build.xml
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/build.xml?view=diff&rev=14169&p1=trunk/src/build.xml&p2=trunk/src/build.xml&r1=14168&r2=14169
==============================================================================
--- trunk/src/build.xml (original)
+++ trunk/src/build.xml 2008-03-01 10:19:31-0800
@@ -350,11 +350,19 @@
<!-- =================================================================== -->
<!-- Prepares the Javadoc -->
<!-- =================================================================== -->
- <target name="prepare-docs" depends="init, javadocs, javadocs-api"
+ <target name="prepare-docs" depends="javadocs, javadocs-api"
description="Build javadocs.">
</target>
- <target name="javadocs" depends="init">
+ <target name="init-javadoc">
+ <!-- javadoc properties -->
+ <property name="javadoc.use" value="true"/>
+ <property name="javadoc.splitindex" value="true"/>
+ <property name="javadoc.author" value="false"/>
+ </target>
+
+ <target name="javadocs" depends="init-javadoc, init, package">
+ <property name="argo.javadocs.dir" value="${argo.build.dir}/javadocs/"/>
<mkdir dir="${argo.javadocs.dir}"/>
<javadoc author="${javadoc.author}"
@@ -380,6 +388,11 @@
<!-- Links allow reference to external classes from within
Argo javadocs
-->
+ <link href="${log4j.javadoc.link}" offline="true"
+ packagelistLoc="${log4j.javadoc.packagelist}"/>
+
+ <link href="${jmi.javadoc.link}" offline="true"
+ packagelistLoc="${jmi.javadoc.packagelist}"/>
<link href="${gef.javadoc.link}" offline="true"
packagelistLoc="${gef.javadoc.packagelist}"/>
@@ -387,12 +400,6 @@
<link href="${jdk.javadoc.link}" offline="true"
packagelistLoc="${jdk.javadoc.packagelist}"/>
- <link href="${log4j.javadoc.link}" offline="true"
- packagelistLoc="${log4j.javadoc.packagelist}"/>
-
- <link href="${jmi.javadoc.link}" offline="true"
- packagelistLoc="${jmi.javadoc.packagelist}"/>
-
<!-- Rest of the packages -->
</javadoc>
@@ -406,7 +413,8 @@
</target>
- <target name="javadocs-api" depends="init">
+ <target name="javadocs-api" depends="init-javadoc, init, package">
+ <property name="argo.api.dir" value="${argo.build.dir}/api/"/>
<mkdir dir="${argo.api.dir}"/>
<!-- The package name list shall be the list of all the main packages for
@@ -436,18 +444,18 @@
Argo javadocs
-->
- <link href="${gef.javadoc.link}" offline="true"
- packagelistLoc="${gef.javadoc.packagelist}"/>
-
- <link href="${jdk.javadoc.link}" offline="true"
- packagelistLoc="${jdk.javadoc.packagelist}"/>
-
<link href="${log4j.javadoc.link}" offline="true"
packagelistLoc="${log4j.javadoc.packagelist}"/>
<link href="${jmi.javadoc.link}" offline="true"
packagelistLoc="${jmi.javadoc.packagelist}"/>
+ <link href="${gef.javadoc.link}" offline="true"
+ packagelistLoc="${gef.javadoc.packagelist}"/>
+
+ <link href="${jdk.javadoc.link}" offline="true"
+ packagelistLoc="${jdk.javadoc.packagelist}"/>
+
<!-- Rest of the packages -->
</javadoc>
Modified: trunk/src/default.properties
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/default.properties?view=diff&rev=14169&p1=trunk/src/default.properties&p2=trunk/src/default.properties&r1=14168&r2=14169
==============================================================================
--- trunk/src/default.properties (original)
+++ trunk/src/default.properties 2008-03-01 10:19:31-0800
@@ -52,8 +52,6 @@
#
argo.build.classes=${argo.build.dir}/classes
argo.bin.dir=${argo.build.dir}/bin
-argo.javadocs.dir=${argo.build.dir}/javadocs/
-argo.api.dir=${argo.build.dir}/api/
#
# TODO: Move this back into the build.xml file
#
@@ -62,28 +60,23 @@
# Docbook directory locations
#
argo.docbook.dir=${argo.root.dir}/documentation/docbook-setup
-#
-# javadoc properties
-#
-javadoc.use=true
-javadoc.splitindex=true
-javadoc.author=false
+
#
# javadoc link properties
# The defaults point to known on-line locations
#
jdk.javadoc.link=http://java.sun.com/j2se/1.5.0/docs/api
-jdk.javadoc.packagelist=../lib/javadocs/j2se150
+jdk.javadoc.packagelist=app/lib/javadocs/j2se150
+
log4j.javadoc.link=http://jakarta.apache.org/log4j/docs/api
-log4j.javadoc.packagelist=../lib/javadocs/log4j
-xerces.javadoc.link=http://xml.apache.org/xerces-j/apiDocs
-xerces.javadoc.packagelist=../lib/javadocs/xerces
-xalan.javadoc.link=http://xml.apache.org/xalan-j/apiDocs
-xalan.javadoc.packagelist=../lib/javadocs/xalan
+log4j.javadoc.packagelist=infra/lib/javadocs/log4j
+
jmi.javadoc.link=http://java.sun.com/products/jmi/jmi-1_0-fr-doc/
-jmi.javadoc.packagelist=../lib/javadocs/jmi
+jmi.javadoc.packagelist=model-mdr/lib/javadocs/jmi
+
gef.javadoc.link=http://gef.tigris.org/nonav/api/current
-gef.javadoc.packagelist=../lib/javadocs/gef
+gef.javadoc.packagelist=app/lib/javadocs/gef
+
#
# JARs from tools directory
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
