markt 2004/07/09 12:08:02
Modified: jasper2 Tag: tomcat_4_branch build.xml
Log:
Fix bug 27253. Copy ant-launcher.jar if necessary for ant .16+
Revision Changes Path
No revision
No revision
1.7.2.3 +8 -3 jakarta-tomcat-jasper/jasper2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/build.xml,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- build.xml 4 Mar 2003 14:47:41 -0000 1.7.2.2
+++ build.xml 9 Jul 2004 19:08:02 -0000 1.7.2.3
@@ -18,6 +18,7 @@
<property name="test.runner" value="junit.textui.TestRunner"/>
<property name="tools.jar" value="${java.home}/lib/tools.jar"/>
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
+ <property name="ant-launcher.jar" value="${ant.home}/lib/ant-launcher.jar"/>
<!-- Construct Jasper classpath -->
<path id="jasper.classpath">
@@ -47,6 +48,7 @@
<target name="build-prepare">
<available classname="junit.framework.TestCase" property="junit.present" />
+ <available file="${ant-launcher.jar}" property="ant-launcher.present" />
<mkdir dir="${jasper.build}"/>
<mkdir dir="${jasper.build}/bin"/>
@@ -193,7 +195,7 @@
<!-- ====================== DEPLOY: Create Jasper JARs ================== -->
- <target name="deploy" depends="deploy-static,build-main"
+ <target name="deploy" depends="deploy-static,build-main,-copyLauncher"
description="Build and deploy Jasper component">
<echo message="Deploy to ${jasper.deploy}/common/lib" />
<!-- Jasper Compiler JAR File -->
@@ -205,9 +207,12 @@
<!-- Copy Ant JAR -->
<copy todir="${jasper.deploy}/common/lib" file="${ant.jar}"/>
-
</target>
-
+ <target name="-copyLauncher" if="ant-launcher.present" >
+ <!-- From 1.6 onwards, launcher classes are in separate jar -->
+ <!-- If it is present, copy it -->
+ <copy todir="${jasper.deploy}/common/lib" file="${ant-launcher.jar}"/>
+ </target>
<!-- ================ DIST: Create Distribution ========================= -->
<target name="dist" depends="build-main"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
