diff options
| -rwxr-xr-x | build.bat | 2 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | build.xml | 52 | ||||
| -rw-r--r-- | layout.xml | 2 | ||||
| -rw-r--r-- | module.xml | 2 | ||||
| -rw-r--r-- | properties.xml | 16 | ||||
| -rw-r--r-- | tools/antipede/build.xtarget | 26 | ||||
| -rw-r--r-- | tools/cents/centipede-20020408.cent.jar (renamed from tools/cents/centipede-20020406.cent.jar) | bin | 35630 -> 35859 bytes | |||
| -rw-r--r-- | tools/cents/forrest-20020405.cent.jar | bin | 3267043 -> 0 bytes | |||
| -rw-r--r-- | tools/cents/jdepend-20020408.cent.jar (renamed from tools/cents/jdepend-20020406.cent.jar) | bin | 48364 -> 48371 bytes | |||
| -rw-r--r-- | tools/cents/junit-20020408.cent.jar (renamed from tools/cents/junit-20020406.cent.jar) | bin | 165092 -> 165125 bytes |
11 files changed, 88 insertions, 14 deletions
@@ -6,7 +6,7 @@ set ANT_HOME=tools\antipede set OLD_CLASSPATH=%CLASSPATH% for %%i in (.\lib\endorsed\*.jar) do call appendcp.bat %%i -call %ANT_HOME%\bin\ant -listener org.apache.tools.ant.XmlLogger %1 %2 %3 %4 %5 %6 %7 %8 %9 +call %ANT_HOME%\bin\ant -emacs -listener org.apache.tools.ant.XmlLogger %1 %2 %3 %4 %5 %6 %7 %8 %9 set ANT_HOME=%OLD_ANT_HOME% set CLASSPATH=%OLD_CLASSPATH%
\ No newline at end of file @@ -29,7 +29,7 @@ unset CLASSPATH CLASSPATH="`echo ./lib/endorsed/*.jar | tr ' ' $S`" export CLASSPATH -$PWD/./tools/antipede/bin/ant -listener org.apache.tools.ant.XmlLogger $@ +$PWD/./tools/antipede/bin/ant -emacs -listener org.apache.tools.ant.XmlLogger $@ unset CLASSPATH @@ -337,6 +337,21 @@ printed. </target> <!-- ================================== --> + <!-- Generates the XML javadocs --> + <!-- ================================== --> + + <target name="xjavadocs" depends="-init" + description="Compile java source code"> + + <antcall target="call-cent"> + <param name="cent-name" value="centipede"/> + <param name="cent-target" value="xjavadocs"/> + </antcall> + + </target> + + + <!-- ================================== --> <!-- Generate UML -WIP- --> <!-- ================================== --> @@ -345,11 +360,17 @@ printed. <javadoc packagenames="${xgump.module.project.package}.*" sourcepath="${xlayout.build.java.dir}" - destdir="${xlayout.build.documentation.javadocs.dir}" + destdir="${xlayout.build.documentation.metrics.dir}" failonerror="true"> - +<!-- <classpath> - <path> + <path> + <fileset dir="."> + <patternset> + <include name="${cents.dir}/uml.${cent.dir.suffix}/*/*.jar"/> + <include name="${cents.dir}/uml.${cent.dir.suffix}/*/*.zip"/> + </patternset> + </fileset> <fileset dir="${xlayout.library.dir}" casesensitive="yes"> <patternset> <include name="*/*.jar"/> @@ -358,12 +379,27 @@ printed. </fileset> </path> </classpath> - - <doclet name="JP.co.esm.caddies.doclets.UMLDoclet" - path="./tools/antipede/lib/UMLDoclet.jar"> - <param name="-d" value="docs/metrics"/> + <bootclasspath> + <path> + <fileset dir="." casesensitive="yes"> + <patternset> + <include name="${cents.dir}/uml.${cent.dir.suffix}/*/*.jar"/> + <include name="${cents.dir}/uml.${cent.dir.suffix}/*/*.zip"/> + </patternset> + </fileset> + <fileset dir="${xlayout.library.dir}" casesensitive="yes"> + <patternset> + <include name="*/*.jar"/> + <include name="*/*.zip"/> + </patternset> + </fileset> + </path> + </bootclasspath> +--> + + <doclet name="JP.co.esm.caddies.doclets.UMLDoclet"> </doclet> - + </javadoc> </target> diff --git a/layout.xml b/layout.xml index 358df4ef57..6d6689b944 100644 --- a/layout.xml +++ b/layout.xml @@ -38,12 +38,12 @@ <java dir="./build/java"/> <classes dir="./build/classes"/> <test dir="./build/testcases"/> + <work dir="./build/work"/> <documentation dir="./build/documentation"> <javadocs dir="./build/docs/javadocs"/> <test dir="./build/docs/test"/> <metrics dir="./build/docs/metrics"/> </documentation> - <work dir="./build/work"/> <scratchpad dir="./build/scratchpad"> <java dir="./build/scratchpad/java"/> <classes dir="./build/scratchpad/classes"/> diff --git a/module.xml b/module.xml index d4a097397e..93f2081c0a 100644 --- a/module.xml +++ b/module.xml @@ -42,6 +42,8 @@ Why not? </why> + <vendor>Apache Software Foundation</vendor> + <licence>This software is released under the Apache Public License 1.1. For detailed legal and licensing issues, please read the LICENSE.* files in the /legal directory. diff --git a/properties.xml b/properties.xml index 402169420f..e8d1eb0258 100644 --- a/properties.xml +++ b/properties.xml @@ -32,8 +32,20 @@ jakarta-site scarab-site xml-apache-site - cocoon-printer --> - <skin name="jakarta-site"/> + basic --> + <skin name="jakarta-site"> + <navlinks> + <link1 href="http://www.apache.org/">apache.org</link1> + <link2 href="http://jakarta.apache.org/">jakarta.apache.org</link2> + <link3 href="http://jakarta.apache.org/poi/">jakarta.apache.org/poi</link3> + </navlinks> + <logo> + <group src="images/group-logo.gif" href="http://jakarta.apache.org"/> + <project src="images/project-logo.gif" href="http://jakarta.apache.org/poi/"/> + </logo> + + </skin> + </forrest> </properties>
\ No newline at end of file diff --git a/tools/antipede/build.xtarget b/tools/antipede/build.xtarget index 077f4e832a..be9f7f3386 100644 --- a/tools/antipede/build.xtarget +++ b/tools/antipede/build.xtarget @@ -87,7 +87,31 @@ <!-- Used only by the -init target --> <!-- =================================--> <target name="-cent-unjar"> - <unjar src="${current.cent.jar}" dest="${cents.dir}"/> + + <basename property="current.cent.jar.name" file="${current.cent.jar}" suffix=".jar"/> + + <condition property="cent-unjar.not.required"> + <and> + <uptodate targetfile="${current.cent.jar}"> + <srcfiles dir= "." includes="${cents.dir}/*.${cent.dir.suffix}/${task.properties.name}"/> + </uptodate> + <available type="dir" file="${cents.dir}/${current.cent.jar.name}"/> + </and> + </condition> + + <antipede-if> + <equals arg1="cent-unjar.not.required" arg2="true" /> + <then> + <echo message="${current.cent.jar} is uptodate with respect to ${current.cent.jar.name}." /> + <echo message="No need to expand it." /> + </then> + <else> + <echo message="Expanding ${current.cent.jar}..." /> + <unjar src="${current.cent.jar}" dest="${cents.dir}"/> + <echo message="... ${current.cent.jar} expanded in ${current.cent.jar.name}." /> + </else> + </antipede-if> + </target> <!-- ============================================= --> diff --git a/tools/cents/centipede-20020406.cent.jar b/tools/cents/centipede-20020408.cent.jar Binary files differindex 05d868a7dd..a6e3f06ace 100644 --- a/tools/cents/centipede-20020406.cent.jar +++ b/tools/cents/centipede-20020408.cent.jar diff --git a/tools/cents/forrest-20020405.cent.jar b/tools/cents/forrest-20020405.cent.jar Binary files differdeleted file mode 100644 index 5daa29ffca..0000000000 --- a/tools/cents/forrest-20020405.cent.jar +++ /dev/null diff --git a/tools/cents/jdepend-20020406.cent.jar b/tools/cents/jdepend-20020408.cent.jar Binary files differindex 65d94825fb..fb5a51758a 100644 --- a/tools/cents/jdepend-20020406.cent.jar +++ b/tools/cents/jdepend-20020408.cent.jar diff --git a/tools/cents/junit-20020406.cent.jar b/tools/cents/junit-20020408.cent.jar Binary files differindex c8e0e211f9..070066ac02 100644 --- a/tools/cents/junit-20020406.cent.jar +++ b/tools/cents/junit-20020408.cent.jar |