[patch] patch for already existing build.xml patch

7.0.12-build-xml.patch (text/plain), 5.65 KB, created by Marc Arens on 2011-04-17 15:34:13 UTC

--- /usr/portage/www-servers/tomcat/files/7/7.0.12-build-xml.patch 
+++ /home/marenz/tomcat/7.0.12-build-xml_examples.patch 
@@ -1,5 +1,5 @@
---- build.xml.orig	2011-03-05 14:11:01.000000000 +0100
-+++ build.xml	2011-03-08 17:39:53.752257789 +0100
+--- /tmp/apache-tomcat-7.0.12-src/build.xml 
++++ /tmp/build.xml 
 @@ -147,6 +147,7 @@
    
    <!-- Classpaths -->
@@ -34,7 +34,15 @@
  
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
-@@ -525,7 +527,7 @@
+@@ -518,14 +520,14 @@
+ 
+   </target>
+ 
+-  <target name="package" depends="compile,build-manifests" >
++  <target name="package" depends="compile,build-examples,build-manifests" >
+     <!-- Common Annotations 1.0 JAR File -->
+     <jarIt jarfile="${annotations-api.jar}"
+       filesDir="${tomcat.classes}"
        filesId="files.annotations-api"
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  
@@ -76,9 +84,12 @@
  
      <copy todir="${tomcat.build}/webapps">
        <fileset dir="webapps">
-@@ -745,14 +747,14 @@
- 
-   <target name="deploy" depends="package,build-docs"
+@@ -743,16 +745,16 @@
+     </xslt>
+   </target>
+ 
+-  <target name="deploy" depends="package,build-docs"
++  <target name="deploy" depends="package, build-examples, build-docs"
            description="Default. Builds a working Tomcat instance">
 -
 +<!--
@@ -93,26 +104,43 @@
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -809,7 +811,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
+@@ -786,7 +788,6 @@
+       <fileset dir="webapps">
+         <include name="ROOT/**"/>
+         <exclude name="ROOT/index.jsp"/>
+-        <include name="examples/**"/>
+         <include name="manager/**"/>
+         <include name="host-manager/**"/>
+       </fileset>
+@@ -802,38 +803,13 @@
+       <filterset refid="version.filters"/>
+     </copy>
+ 
+-    <!-- Build classes for examples webapp -->
+-    <javac   srcdir="webapps/examples/WEB-INF/classes"
+-             destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
+-             debug="${compile.debug}" deprecation="${compile.deprecation}"
+-             source="${compile.source}"
+-             target="${compile.target}"
+-             optimize="${compile.optimize}"
 -             classpath="${tomcat.classes}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -821,7 +823,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
+-             excludes="**/CVS/**,**/.svn/**"
+-             encoding="ISO-8859-1"
+-             includeantruntime="false">
+-    </javac>
+-
+-    <javac   srcdir="webapps/examples/jsp/plugin/applet"
+-             destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"
+-             debug="${compile.debug}" deprecation="${compile.deprecation}"
+-             source="${compile.source}"
+-             target="${compile.target}"
+-             optimize="${compile.optimize}"
 -             classpath="$tomcat.lcasses}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -829,11 +831,11 @@
- 
+-             excludes="**/CVS/**,**/.svn/**"
+-             encoding="ISO-8859-1"
+-             includeantruntime="false">
+-    </javac>
+-
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
 -
@@ -125,7 +153,7 @@
    </target>
  
    <target name="examples-sources" description="Create examples sources"
-@@ -1008,7 +1010,7 @@
+@@ -1008,7 +984,7 @@
  
    </target>
  
@@ -134,3 +162,46 @@
      <mkdir dir="${test.classes}"/>
      <!-- Compile -->
      <javac srcdir="test" destdir="${test.classes}"
+@@ -2431,4 +2407,42 @@
+     <echo file="${file}.md5" message="${value}${md5sum.binary-prefix}${filename}" />
+   </target>
+ 
++  <!-- Additional target to built the examples -->
++  <target name="build-examples" unless="nobuild.examples" description="Compiles the examples">
++    <!-- Copy other regular webapps -->
++    <copy todir="${tomcat.build}/webapps">
++      <fileset dir="webapps">
++        <include name="examples/**"/>
++      </fileset>
++    </copy>
++
++    <!-- Build classes for examples webapp -->
++    <javac   srcdir="webapps/examples/WEB-INF/classes"
++             destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
++             debug="${compile.debug}" deprecation="${compile.deprecation}"
++             source="${compile.source}"
++             target="${compile.target}"
++             optimize="${compile.optimize}"
++             classpath="${tomcat.classes}:${jsp-api.jar}"
++             excludes="**/CVS/**,**/.svn/**"
++             encoding="ISO-8859-1"
++             includeantruntime="false">
++    </javac>
++
++    <javac   srcdir="webapps/examples/jsp/plugin/applet"
++             destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"
++             debug="${compile.debug}" deprecation="${compile.deprecation}"
++             source="${compile.source}"
++             target="${compile.target}"
++             optimize="${compile.optimize}"
++             classpath="${tomcat.classes}:${jsp-api.jar}"
++             excludes="**/CVS/**,**/.svn/**"
++             encoding="ISO-8859-1"
++             includeantruntime="false">
++    </javac>
++
++    <!-- Add sources for examples -->
++    <antcall target="examples-sources" />
++  </target>
++
+ </project>