dims 01/09/10 07:50:57
Modified: . Tag: cocoon_20_branch build.xml
Log:
Patch for "Build Failed on MacOS X" reported by Jeremy Quinn
<[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.8.2.35 +9 -2 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.8.2.34
retrieving revision 1.8.2.35
diff -u -r1.8.2.34 -r1.8.2.35
--- build.xml 2001/09/08 11:46:00 1.8.2.34
+++ build.xml 2001/09/10 14:50:57 1.8.2.35
@@ -214,6 +214,7 @@
The location of tools.jar, relative to the JAVA_HOME home.
-->
<property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
+ <available file="${tools.jar}" property="tools.jar.present"/>
<filter token="Name" value="${fullname}"/>
<filter token="name" value="${fullname}"/>
@@ -586,7 +587,7 @@
<!-- =================================================================== -->
<!-- Prepares the libraries for the war package -->
<!-- =================================================================== -->
- <target name="prepare-webapp-libs" depends="package" if="include.webapp.libs">
+ <target name="prepare-webapp-libs" depends="package,prepare-tools-lib"
if="include.webapp.libs">
<copy todir="${build.war}/WEB-INF/lib">
<fileset dir="${lib.dir}">
<include name="*.jar"/>
@@ -604,9 +605,15 @@
</fileset>
</move>
+ <copy file="${build.dir}/${name}.jar"
tofile="${build.war}/WEB-INF/lib/${name}-${version}.jar"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Copies the tools.jar to jaavc.jar in web-inf/lib -->
+ <!-- =================================================================== -->
+ <target name="prepare-tools-lib" depends="package" if="tools.jar.present">
<!-- NOTE: java.home is normally set by the JVM to the /jre directory -->
<copy file="${tools.jar}" tofile="${build.war}/WEB-INF/lib/javac.jar"/>
- <copy file="${build.dir}/${name}.jar"
tofile="${build.war}/WEB-INF/lib/${name}-${version}.jar"/>
</target>
<!-- =================================================================== -->
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
