costin 2003/03/12 12:07:21
Modified: el build.xml
Log:
Few small changes to simplify building in some cases.
The user's build.properties really need to be first - they are supposed to override
default settings.
The jar location can be customized completely - i.e. it can be set to
tomcat.home/common/lib/commons-el.jar. This avoids some copy and keeps things in sync
( default remains unchanged, of course )
The jar only target can be used to just build.
Let me know if any of those are not ok and I'll revert promptly.
Revision Changes Path
1.4 +23 -5 jakarta-commons/el/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/el/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 26 Feb 2003 16:59:09 -0000 1.3
+++ build.xml 12 Mar 2003 20:07:21 -0000 1.4
@@ -10,9 +10,9 @@
<!-- ========== Initialize Properties ===================================== -->
+ <property file="${user.home}/build.properties"/> <!-- User local -->
<property file="build.properties"/> <!-- Component local -->
<property file="../build.properties"/> <!-- Commons local -->
- <property file="${user.home}/build.properties"/> <!-- User local -->
<!-- ========== External Dependencies ===================================== -->
@@ -70,6 +70,7 @@
<!-- The base directory for unit test sources -->
<property name="test.home" value="src/test"/>
+ <property name="commons-el.jar"
value="${dist.home}/commons-${component.name}.jar" />
<!-- ========== Compiler Defaults ========================================= -->
@@ -163,8 +164,10 @@
</target>
- <target name="compile" depends="static,build-servletapi,build-jspapi"
- description="Compile shareable components">
+ <target name="compile" depends="static,build-servletapi,build-jspapi,compile-only"
+ description="Compile shareable components"/>
+
+ <target name="compile-only" >
<javac srcdir="${source.home}"
destdir="${build.home}/classes"
debug="${compile.debug}"
@@ -243,11 +246,26 @@
<mkdir dir="${build.home}/classes/META-INF"/>
<copy file="../LICENSE"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <jar jarfile="${dist.home}/commons-${component.name}.jar"
+ <jar jarfile="${commons-el.jar}"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF"/>
</target>
+ <target name="jar-only" depends="init,compile-only" >
+ <mkdir dir="${build.home}/classes/META-INF"/>
+ <tstamp/>
+ <copy todir="${build.home}/classes/META-INF" filtering="on">
+ <fileset dir="${conf.home}" includes="*.MF"/>
+ </copy>
+ <copy file="../LICENSE"
+ tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+ <jar jarfile="${commons-el.jar}"
+ manifest="${build.home}/classes/META-INF/MANIFEST.MF">
+ <fileset dir="${build.home}/classes" includes="org/apache/commons/el/**" />
+ <fileset dir="${build.home}/classes" includes="META-INF/LICENSE.txt" />
+ </jar>
+
+ </target>
<target name="install-jar" depends="jar"
description="--> Installs jar file in ${lib.repo}">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
