morgand 2003/01/21 13:46:45
Modified: jelly build-all.xml
Log:
less strict, but more concise
Revision Changes Path
1.3 +62 -63 jakarta-commons-sandbox/jelly/build-all.xml
Index: build-all.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/build-all.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-all.xml 21 Jan 2003 20:22:07 -0000 1.2
+++ build-all.xml 21 Jan 2003 21:46:45 -0000 1.3
@@ -3,6 +3,25 @@
<project default="jar" name="commons-jelly-build-all" basedir=".">
<!--
+ Documentation:
+
+ call "clean jar" to build Jelly and each taglib from scratch.
+ If you don't call clean first, you can get a false positive;
+ if the "depends" of a jar-* task is incomplete, the build might
+ pull in an older jar.
+
+ Also, will copy all built jars into each successive build, so
+ it's possible for a tag to build successfully without declaring
+ all its dependencies, if its dependencies happen to have been built
+ first.
+
+ WRITTEN FOR SIMPLICITY, NOT ENFORCING STRICTNESS.
+
+ when adding tags to the build, add them to the "subexec" target and
+ add a jar-<tagName> target.
+ -->
+
+ <!--
target that can be used via antcall task
to call a single target on all jelly build.xml scripts
-->
@@ -19,95 +38,75 @@
</antcall>
</target>
- <target name="jar">
- <antcall target="jar-all"/>
- </target>
-
- <target name="jar-all" depends="jar-jelly,jar-ant,jar-junit,jar-util"/>
-
- <!-- don't call directly, called inside jar-* tasks -->
- <target name="prepare-taglib-deps">
- <ant dir="jelly-tags/${sub.taglib}" target="get-deps"/>
+ <target name="jar" depends="jar-jelly,jar-ant,jar-junit,jar-util"/>
- <delete>
- <fileset dir="jelly-tags/${sub.taglib}/lib" includes="commons-jelly-*"/>
- </delete>
- <copy todir="jelly-tags/${sub.taglib}/lib">
- <fileset dir="target" includes="commons-jelly-*.jar"/>
- </copy>
- </target>
-
- <!-- don't call directly, called inside jar-* tasks -->
- <target name="get-ext-taglib">
- <copy todir="jelly-tags/${sub.taglib}/lib">
- <fileset dir="jelly-tags/${sub.taglib.ext}/target"
includes="commons-jelly-*.jar"/>
- </copy>
- </target>
-
- <!-- don't call directly, called inside jar-* tasks -->
- <target name="build-taglib">
- <ant dir="jelly-tags/${sub.taglib}" target="jar">
- <property name="noget" value="true"/>
- </ant>
- </target>
-
<target name="jar-jelly">
<echo message="Building Jelly..."/>
<ant dir="." target="jar"/>
</target>
<target name="jar-ant" depends="jar-jelly,jar-util,jar-junit">
- <echo message="Building Ant taglib..."/>
-
- <antcall target="prepare-taglib-deps">
+ <antcall target="taglib-template">
<param name="sub.taglib" value="ant"/>
</antcall>
-
- <!-- copy in other Jelly taglib dependencies -->
- <antcall target="get-ext-taglib">
- <param name="sub.taglib" value="ant"/>
- <param name="sub.taglib.ext" value="util"/>
- </antcall>
- <antcall target="get-ext-taglib">
- <param name="sub.taglib" value="ant"/>
- <param name="sub.taglib.ext" value="junit"/>
- </antcall>
-
- <antcall target="build-taglib">
- <param name="sub.taglib" value="ant"/>
+ </target>
+
+ <target name="jar-junit" depends="jar-jelly">
+ <antcall target="taglib-template">
+ <param name="sub.taglib" value="junit"/>
</antcall>
</target>
<target name="jar-util" depends="jar-jelly,jar-junit">
- <echo message="Building Util taglib..."/>
+ <antcall target="taglib-template">
+ <param name="sub.taglib" value="util"/>
+ </antcall>
+ </target>
+
+ <!-- don't call directly, called inside jar-* tasks -->
+ <target name="taglib-template">
+ <echo message="Building "${sub.taglib}" taglib..."/>
<antcall target="prepare-taglib-deps">
- <param name="sub.taglib" value="util"/>
+ <param name="sub.taglib" value="${sub.taglib}"/>
</antcall>
<!-- copy in other Jelly taglib dependencies -->
- <antcall target="get-ext-taglib">
- <param name="sub.taglib" value="util"/>
- <param name="sub.taglib.ext" value="junit"/>
+ <antcall target="get-ext-taglibs">
+ <param name="sub.taglib" value="${sub.taglib}"/>
</antcall>
<antcall target="build-taglib">
- <param name="sub.taglib" value="util"/>
+ <param name="sub.taglib" value="${sub.taglib}"/>
</antcall>
</target>
- <target name="jar-junit" depends="jar-jelly">
- <echo message="Building JUnit taglib..."/>
-
- <antcall target="prepare-taglib-deps">
- <param name="sub.taglib" value="junit"/>
- </antcall>
-
- <antcall target="build-taglib">
- <param name="sub.taglib" value="junit"/>
- </antcall>
+ <!-- don't call directly, called inside jar-* tasks -->
+ <target name="prepare-taglib-deps">
+ <ant dir="jelly-tags/${sub.taglib}" target="get-deps"/>
+ <delete>
+ <fileset dir="jelly-tags/${sub.taglib}/lib" includes="commons-jelly-*"/>
+ </delete>
+ <copy todir="jelly-tags/${sub.taglib}/lib">
+ <fileset dir="target" includes="commons-jelly-*.jar"/>
+ </copy>
+ </target>
+
+ <!-- don't call directly, called inside jar-* tasks -->
+ <target name="get-ext-taglibs">
+ <copy todir="jelly-tags/${sub.taglib}/lib" flatten="true">
+ <fileset dir="." includes="jelly-tags/*/target/commons-jelly-*.jar"/>
+ </copy>
+ </target>
+
+ <!-- don't call directly, called inside jar-* tasks -->
+ <target name="build-taglib">
+ <ant dir="jelly-tags/${sub.taglib}" target="jar">
+ <property name="noget" value="true"/>
+ </ant>
</target>
+
</project>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
