nicolaken 02/04/08 10:32:31
Modified: . .cvsignore build.xml
tools/antipede build.xtarget tasks.properties
Log:
Updated build for running dist and distlight targets.
Added uptodate checks before unjarring the cents.
Revision Changes Path
1.6 +4 -16 jakarta-poi/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-poi/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 6 Apr 2002 09:41:47 -0000 1.5
+++ .cvsignore 8 Apr 2002 17:32:31 -0000 1.6
@@ -1,19 +1,7 @@
-.ant.properties
+*.properties
dist
-build
-distributions
-prj.el
-emacs-jprj.el
-docs
-todo
-hdf.log
-hpsf.log
-hssf.log
-poifs.log
-util.log
-poi.ipr
-release-bin
-POILogger.log
-jakarta-poi.ipr
+*.el
+*.ipr
build.number
log*.*
+*.log
\ No newline at end of file
1.13 +34 -4 jakarta-poi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-poi/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 8 Apr 2002 13:45:07 -0000 1.12
+++ build.xml 8 Apr 2002 17:32:31 -0000 1.13
@@ -145,7 +145,7 @@
<!-- =================================================================== -->
<!-- Interactive scratchpad builds -->
<!-- =================================================================== -->
- <target name="scratchpad" depends="-init" description="Interactive Scratchpad
Build">
+ <target name="scratchpad" depends="compile" description="Interactive Scratchpad
Build">
<echo message="--------------------------------------------------------------"/>
<echo message=" "/>
<echo message=" ${xgump.module.project.name}
${xgump.module.project.version.major}.${xgump.module.project.version.minor} SCRATCHPAD
"/>
@@ -176,7 +176,7 @@
<!-- =================================================================== -->
<!-- Interactive contrib builds -->
<!-- =================================================================== -->
- <target name="contrib" depends="-init" description="Interactive Contributors'
Build">
+ <target name="contrib" depends="compile" description="Interactive Contributors'
Build">
<echo message="--------------------------------------------------------------"/>
<echo message=" "/>
<echo message=" ${xgump.module.project.name}
${xgump.module.project.version.major}.${xgump.module.project.version.minor} CONTRIB"/>
@@ -250,9 +250,25 @@
<!-- Build distributions -->
<!-- ================================== -->
- <target name="dist" depends="-init"
- description="Compile java source code">
+ <target name="dist"
+ description="Make distributions">
+
+ <echo>**********************************************</echo>
+ <echo>*</echo>
+ <echo>* Build all distributions:</echo>
+ <echo>* - source distribution for windows/unix.</echo>
+ <echo>* - binary distribution for windows/unix.</echo>
+ <echo>*</echo>
+ <echo>* Since *all* main targets are tested, </echo>
+ <echo>* first indipendently and then together to </echo>
+ <echo>* check that everything is ok,</echo>
+ <echo>* this may take a while...</echo>
+ <echo>*</echo>
+ <echo>***********************************************</echo>
+ <echo/>
+ <antcall target="gump"/>
+
<antcall target="call-cent">
<param name="cent-name" value="centipede"/>
<param name="cent-target" value="dist"/>
@@ -260,6 +276,20 @@
</target>
+ <!-- ====================================== -->
+ <!-- dist target wo single build checks -->
+ <!-- ====================================== -->
+
+ <target name="quickdist" depends="testmodule"
+ description="Build distribution packages wo single build checks">
+
+ <antcall target="call-cent">
+ <param name="cent-name" value="centipede"/>
+ <param name="cent-target" value="dist"/>
+ </antcall>
+
+ </target>
+
<!-- ================================== -->
<!-- Clean build dir -->
<!-- ================================== -->
1.7 +36 -18 jakarta-poi/tools/antipede/build.xtarget
Index: build.xtarget
===================================================================
RCS file: /home/cvs/jakarta-poi/tools/antipede/build.xtarget,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xtarget 8 Apr 2002 07:19:40 -0000 1.6
+++ build.xtarget 8 Apr 2002 17:32:31 -0000 1.7
@@ -51,11 +51,14 @@
</antipede-foreach>
<delete dir="${cents.dir}/META-INF"/>
-
+
<mkdir dir="${temp.dir}"/>
<delete file="${temp.dir}/${task.properties.name}"/>
-
+
+
<!-- put all ant task definitions in cents in a single file -->
+ <antipede-trycatch><try>
+
<concat destfile="${temp.dir}/${task.properties.name}" append="no">
<fileset dir=".">
<patternset>
@@ -63,7 +66,7 @@
</patternset>
</fileset>
</concat>
-
+
<!-- define the tasks found in cents -->
<taskdef file="${temp.dir}/${task.properties.name}">
<classpath>
@@ -73,6 +76,10 @@
</classpath>
</taskdef>
+ </try>
+ <catch><echo message="Unable to load tasks... could be already loaded."
/></catch>
+ </antipede-trycatch>
+
<!--
Load project information
-->
@@ -80,40 +87,51 @@
<centipede-xml-property file="status.xml" prefix="xstatus"
keeproot="false" />
<centipede-xml-property file="layout.xml" prefix="xlayout"
keeproot="false" />
<centipede-xml-property file="properties.xml"
keeproot="false" />
-
+
</target>
<!-- ================================ -->
<!-- Used only by the -init target -->
<!-- =================================-->
- <target name="-cent-unjar">
+ <target name="-cent-unjar" depends="-cent-unjar-expand,-cent-unjar-keep"/>
+
+ <!-- ================================ -->
+ <!-- Used only by the -init target -->
+ <!-- =================================-->
+ <target name="-cent-unjar-check">
<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}"/>
+ <srcfiles dir= "."
includes="${cents.dir}/${current.cent.jar.name}.${cent.dir.suffix}/${task.properties.name}"/>
</uptodate>
- <available type="dir" file="${cents.dir}/${current.cent.jar.name}"/>
+ <available type="dir"
file="${cents.dir}/${current.cent.jar.name}.${cent.dir.suffix}"/>
</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>
+ </target>
+
+ <!-- ====================================== -->
+ <!-- Used only by the -cent-unjar target -->
+ <!-- ====================================== -->
+ <target name="-cent-unjar-expand" unless="cent-unjar.not.required"
+ depends="-cent-unjar-check">
<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>
- </target>
-
+ <!-- ====================================== -->
+ <!-- Used only by the -cent-unjar target -->
+ <!-- =======================================-->
+ <target name="-cent-unjar-keep" if="cent-unjar.not.required"
+ depends="-cent-unjar-check">
+ <echo message="${current.cent.jar} is uptodate with respect to
${current.cent.jar.name}." />
+ <echo message="No need to expand it." />
+ </target>
+
<!-- ============================================= -->
<!-- Simple utility target to call a cent target -->
<!-- ==============================================-->
1.2 +4 -1 jakarta-poi/tools/antipede/tasks.properties
Index: tasks.properties
===================================================================
RCS file: /home/cvs/jakarta-poi/tools/antipede/tasks.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tasks.properties 3 Apr 2002 17:51:49 -0000 1.1
+++ tasks.properties 8 Apr 2002 17:32:31 -0000 1.2
@@ -1,5 +1,8 @@
+
+#Antipede tasks
antipede-foreach=net.sf.antcontrib.logic.ForEach
antipede-if=net.sf.antcontrib.logic.IfTask
antipede-propertycopy=net.sf.antcontrib.property.PropertyCopy
antipede-switch=net.sf.antcontrib.logic.Switch
-antipede-trycatch=net.sf.antcontrib.logic.TryCatchTask
\ No newline at end of file
+antipede-trycatch=net.sf.antcontrib.logic.TryCatchTask
+
