[Jpackage-commits] dist/tomcat5/JPP-6 tomcat5-5.5-jt5-build.patch, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Fri Oct 14 23:42:47 CEST 2011


Update of /home/projects/jpackage/cvs/dist/tomcat5/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv22333

Modified Files:
	tomcat5-5.5-jt5-build.patch 
Log Message:
bring in tomcat5-5.5-jt5-build.patch

Index: tomcat5-5.5-jt5-build.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/tomcat5/JPP-6/tomcat5-5.5-jt5-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** tomcat5-5.5-jt5-build.patch	9 Sep 2010 18:34:26 -0000	1.1
--- tomcat5-5.5-jt5-build.patch	14 Oct 2011 21:42:45 -0000	1.2
***************
*** 1,4 ****
! --- build/build.xml.orig	2010-06-08 11:30:52.037688299 +0200
! +++ build/build.xml	2010-06-08 11:33:08.619682451 +0200
  @@ -84,12 +84,14 @@
     <property name="tomcat.release"   value="${basedir}/release"/>
--- 1,4 ----
! --- build/build.xml.orig	2011-10-13 14:58:50.000000000 +0200
! +++ build/build.xml	2011-10-13 15:03:52.000000000 +0200
  @@ -84,12 +84,14 @@
     <property name="tomcat.release"   value="${basedir}/release"/>
***************
*** 18,28 ****
     <!-- Some compilers will disable debugging if true. And it doesn't do anything
          in most cases -->
! @@ -227,11 +229,17 @@
!              failonerror="false" />
   
       <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
  -            file="${tomcat-native.tar.gz}" />
! +            file="${tomcat-native.tar.gz}"
! +            failonerror="false" />
   
       <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
--- 18,32 ----
     <!-- Some compilers will disable debugging if true. And it doesn't do anything
          in most cases -->
! @@ -226,15 +228,19 @@
!      <copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" />
   
       <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
  -            file="${tomcat-native.tar.gz}" />
! +            file="${tomcat-native.tar.gz}" failonerror="false" />
!      <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
! -            file="${commons-daemon.native.src.tgz}" />
! +            file="${commons-daemon.native.src.tgz}" failonerror="false" />
!  
!      <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
   
       <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
***************
*** 31,35 ****
       <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
  +-->
- +<!-- these should be links -->
  +       <copy todir="${tomcat.build}/common/lib" file="${base.path}/jdtcore.jar" failonerror="false"/>
  +
--- 35,38 ----
***************
*** 37,41 ****
   
     <!-- ====================== Build all components =================== -->
! @@ -1016,7 +1024,9 @@
       <copy todir="${tomcat.embed}/lib">
         <fileset dir="${tomcat.build}/common/lib">
--- 40,44 ----
   
     <!-- ====================== Build all components =================== -->
! @@ -1011,7 +1017,9 @@
       <copy todir="${tomcat.embed}/lib">
         <fileset dir="${tomcat.build}/common/lib">




More information about the JPackage-commits mailing list