nicolaken 02/04/14 23:44:21
Modified: . build.xml properties.xml
tools/cents centipede.cent.jar checkstyle.cent.jar
forrest.cent.jar jdepend.cent.jar
umldoclet.cent.jar
Log:
Last update of Centipede.
Fixed dist build, now it checks only functional tests before creating dist.
Changed path of cents' properties in properties.xml.
Centipede developement will now be decoupled from Poi, and continue on
krysalis.org.
Revision Changes Path
1.19 +30 -49 jakarta-poi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-poi/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 11 Apr 2002 18:00:20 -0000 1.18
+++ build.xml 15 Apr 2002 06:44:20 -0000 1.19
@@ -118,13 +118,13 @@
all -------------- creates the jars and the site
compile ---------- compiles the source code
+ test ------------- performs the jUnit tests
jar -------------- create the jar files
docs ------------- generates the html docs - clean not needed
+ javadocs --------- generates the API documentation
site ------------- generates the html site (docs+reports)
- javadocs --------- generates the API documentation
- test ------------- performs the jUnit tests
clean ------------ cleans the build directory
- quickdist -------- creates src and bin distributions
+ dist ------------- creates src and bin distributions
scratchpad ------- build-run scratchpad code
contrib ---------- build-run contributed code
generate-records - generate excel records
@@ -253,13 +253,13 @@
</target>
- <!-- ================================== -->
- <!-- Build distributions -->
- <!-- ================================== -->
+ <!-- ====================================== -->
+ <!-- dist target wo single build checks -->
+ <!-- ====================================== -->
+
+ <target name="dist" depends="-init, clean, test, jar, site"
+ description="Build distribution packages wo single build checks">
- <target name="dist" depends="-init"
- description="Make distributions">
-
<echo>**********************************************</echo>
<echo>*</echo>
<echo>* Build all distributions:</echo>
@@ -273,32 +273,16 @@
<echo>*</echo>
<echo>***********************************************</echo>
<echo/>
-
- <antcall target="gump"/>
-
- <antcall target="quickdist"/>
- </target>
-
- <!-- ====================================== -->
- <!-- dist target wo single build checks -->
- <!-- ====================================== -->
-
- <target name="quickdist" depends="-init"
- description="Build distribution packages wo single build checks">
<antcall target="call-cent">
- <param name="cent-name" value="junit"/>
- <param name="cent-target" value="test"/>
- </antcall>
-
- <antcall target="call-cent">
<param name="cent-name" value="centipede"/>
<param name="cent-target" value="dist"/>
</antcall>
</target>
+
<!-- ================================== -->
<!-- Clean build dir -->
<!-- ================================== -->
@@ -317,14 +301,10 @@
<!-- Run Junit tests -->
<!-- ================================== -->
- <target name="test" depends="-init"
+ <target name="test" depends="-init, compile"
description="Compile java source code">
- <antcall target="call-cent">
- <param name="cent-name" value="centipede"/>
- <param name="cent-target" value="compile"/>
- </antcall>
-
+
<antcall target="call-cent">
<param name="cent-name" value="junit"/>
<param name="cent-target" value="test"/>
@@ -341,15 +321,10 @@
<!-- Generate project metrics -->
<!-- ================================== -->
- <target name="metrics" depends="-init"
+ <target name="metrics" depends="-init, compile"
description="Generate project metrics">
<antcall target="call-cent">
- <param name="cent-name" value="centipede"/>
- <param name="cent-target" value="compile"/>
- </antcall>
-
- <antcall target="call-cent">
<param name="cent-name" value="jdepend"/>
<param name="cent-target" value="jdepend-html"/>
</antcall>
@@ -376,15 +351,12 @@
<!-- ================================== -->
<target name="site"
- description="Makes all the site doco">
+ description="Makes all the site doco"
+ depends="docs,
+ test,
+ javadocs,
+ metrics"/>
- <antcall target="docs"/>
- <antcall target="compile"/>
- <antcall target="javadocs"/>
- <antcall target="test"/>
- <antcall target="metrics"/>
-
- </target>
<!-- ================================== -->
<!-- Generates the javadocs -->
@@ -497,6 +469,18 @@
<antcall target="javadocs"/>
</target>
+
+ <!-- ================================== -->
+ <!-- Test 4 distribution -->
+ <!-- ================================== -->
+
+ <target name="testall" depends="-init"
+ description="Make big full test">
+
+ <antcall target="gump"/>
+ <antcall target="quickdist"/>
+
+ </target>
<!-- ================================== -->
<!-- Target used by Gump -->
@@ -506,11 +490,8 @@
depends="testmodule"
description="Target used by Gump">
- <antcall target="clean"/>
<antcall target="testtargets"/>
- <antcall target="clean"/>
<antcall target="testmodule"/>
- <antcall target="clean"/>
<antcall target="all"/>
</target>
1.4 +72 -52 jakarta-poi/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-poi/properties.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- properties.xml 11 Apr 2002 17:58:59 -0000 1.3
+++ properties.xml 15 Apr 2002 06:44:20 -0000 1.4
@@ -1,55 +1,75 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"
href="tools/antipede/resources/stylesheets/properties.xsl"?>
-<!-- Project properties -->
+<!-- Build properties - these override any property specified in the build -->
<properties>
- <!-- Properties for core Ant tasks-->
- <ant>
- <XmlLogger>
- <stylesheet uri="./tools/antipede/resources/stylesheets/log.xsl"/>
- </XmlLogger>
- </ant>
-
- <XmlLogger file="log.xml"/>
-
- <!-- Properties of the build -->
- <build>
- <!-- What to tell the compiler -->
- <compiler emacs="on"
- warnings="true"
- pedantic="false"
- depend="true"
- fulldepend="true"
- debug="on"
- optimize="off"
- deprecation="on"
- nowarn="off"
- type="classic"
- vm="1.2"/>
-
- </build>
- <forrest>
- <!-- available skins:
-
- basic
- jakarta-site
- avalon-site
- scarab-site
- xml-apache-site
- forrest-site (Work In Progress)
- -->
- <skin name="avalon-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
+
+<!-- Properties for core Ant tasks-->
+ <ant>
+ <XmlLogger>
+ <stylesheet
+ uri="./tools/antipede/resources/stylesheets/log.xsl" />
+ </XmlLogger>
+ </ant>
+
+ <XmlLogger
+ file="log.xml" />
+
+ <!-- Properties of the build -->
+ <build>
+ <!-- What to tell the compiler -->
+ <compiler
+ emacs="on"
+ warnings="true"
+ pedantic="false"
+ depend="true"
+ fulldepend="true"
+ debug="on"
+ optimize="off"
+ deprecation="on"
+ nowarn="off"
+ type="classic"
+ vm="1.2" />
+ </build>
+
+ <centipede>
+ <tools>
+ <cents>
+ <forrest-cent>
+ <!-- available skins:
+
+ basic
+ jakarta-site
+ avalon-site
+ scarab-site
+ xml-apache-site
+ forrest-site (Work In Progress)
+ -->
+ <skin
+ name="avalon-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-cent>
+ </cents>
+ </tools>
+ </centipede>
+</properties>
+
1.7 +20 -19 jakarta-poi/tools/cents/centipede.cent.jar
<<Binary file>>
1.2 +17 -16 jakarta-poi/tools/cents/checkstyle.cent.jar
<<Binary file>>
1.5 +375 -377 jakarta-poi/tools/cents/forrest.cent.jar
<<Binary file>>
1.3 +16 -18 jakarta-poi/tools/cents/jdepend.cent.jar
<<Binary file>>
1.2 +85 -71 jakarta-poi/tools/cents/umldoclet.cent.jar
<<Binary file>>
