nicolaken 02/04/08 00:19:40
Modified: . build.bat build.sh build.xml layout.xml module.xml
properties.xml
tools/antipede build.xtarget
Added: tools/cents centipede-20020408.cent.jar
Log:
Update of the build system.
Gump target works ok.
All docs generate ok.
Jar task is ok.
Revision Changes Path
1.5 +1 -1 jakarta-poi/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-poi/build.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.bat 3 Apr 2002 17:04:45 -0000 1.4
+++ build.bat 8 Apr 2002 07:19:40 -0000 1.5
@@ -6,7 +6,7 @@
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%
1.5 +1 -1 jakarta-poi/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-poi/build.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.sh 3 Apr 2002 17:04:45 -0000 1.4
+++ build.sh 8 Apr 2002 07:19:40 -0000 1.5
@@ -29,7 +29,7 @@
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
1.11 +44 -8 jakarta-poi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-poi/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 6 Apr 2002 22:08:22 -0000 1.10
+++ build.xml 8 Apr 2002 07:19:40 -0000 1.11
@@ -337,6 +337,21 @@
</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 @@
<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 @@
</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>
1.4 +1 -1 jakarta-poi/layout.xml
Index: layout.xml
===================================================================
RCS file: /home/cvs/jakarta-poi/layout.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- layout.xml 6 Apr 2002 09:12:03 -0000 1.3
+++ layout.xml 8 Apr 2002 07:19:40 -0000 1.4
@@ -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"/>
1.3 +2 -0 jakarta-poi/module.xml
Index: module.xml
===================================================================
RCS file: /home/cvs/jakarta-poi/module.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- module.xml 4 Apr 2002 14:43:45 -0000 1.2
+++ module.xml 8 Apr 2002 07:19:40 -0000 1.3
@@ -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.
1.2 +14 -2 jakarta-poi/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-poi/properties.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- properties.xml 3 Apr 2002 17:04:45 -0000 1.1
+++ properties.xml 8 Apr 2002 07:19:40 -0000 1.2
@@ -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>
1.6 +25 -1 jakarta-poi/tools/antipede/build.xtarget
Index: build.xtarget
===================================================================
RCS file: /home/cvs/jakarta-poi/tools/antipede/build.xtarget,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xtarget 6 Apr 2002 17:43:02 -0000 1.5
+++ build.xtarget 8 Apr 2002 07:19:40 -0000 1.6
@@ -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>
<!-- ============================================= -->
1.1 jakarta-poi/tools/cents/centipede-20020408.cent.jar
<<Binary file>>
