cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: xml-cocoon2 build.xml
Date Mon, 10 Sep 2001 12:39:38 GMT
dims        01/09/10 05:39:38

  Modified:    .        build.xml
  Log:
  Patch for "Build Failed on MacOS X" reported by Jeremy Quinn <jermq@media.demon.co.uk>
  
  Revision  Changes    Path
  1.59      +9 -2      xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- build.xml	2001/09/08 11:45:49	1.58
  +++ build.xml	2001/09/10 12:39:38	1.59
  @@ -222,6 +222,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}"/>
  @@ -683,7 +684,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"/>
  @@ -701,9 +702,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:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message