cglib-build_xml.patch

   1 --- build.xml.sav       2005-10-13 11:31:30.000000000 +0200
   2 +++ build.xml   2005-11-12 14:15:58.000000000 +0100
   3 @@ -41,6 +41,7 @@
   4        <pathelement location="${build.home}/classes"/>\r
   5        <fileset dir="./lib">\r
   6                 <include name="*.jar"/>\r
   7 +               <exclude name="asm2*.jar"/>\r
   8         </fileset>\r
   9      </path>\r
  10  \r
  11 @@ -123,14 +124,18 @@
  12        <exclude name="samples/**" />\r
  13      </jar> \r
  14  \r
  15 -    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>\r
  16 -    <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >\r
  17 -      <zipfileset dir="lib" includes="asm*.txt"/>\r
  18 -      <zipfileset src="lib/asm.jar" excludes="META-INF"/>\r
  19 -      <zipfileset src="lib/asm-attrs.jar" excludes="META-INF"/>\r
  20 +    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/jarjar.jar:lib/asm2_asm2.jar"/>\r
  21 +    <echo message="${dist.home}/${component.name}-nodep-${component.version}.jar" />\r
  22 +    <echo message="${build.home}/classes"/>\r
  23 +    <jarjar destfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >\r
  24 +      <fileset dir="lib" includes="asm*.txt"/>\r
  25 +      <zipfileset src="lib/asm_asm.jar" excludes="META-INF"/>\r
  26 +      <zipfileset src="lib/asm_asm-attrs.jar" excludes="META-INF"/>\r
  27        <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>\r
  28 -      <include name="**/*"/>\r
  29 -      <exclude name="samples/**"/>\r
  30 +      <fileset dir="${build.home}/classes">\r
  31 +        <include name="**/*"/>\r
  32 +        <exclude name="samples/**"/>\r
  33 +      </fileset>\r
  34      </jarjar> \r
  35    </target>\r
  36  \r
  37 @@ -259,6 +264,7 @@
  38            <pathelement path="${samples.build.home}/classes" />      \r
  39            <fileset dir="./lib">\r
  40                 <include name="*.jar"/>\r
  41 +               <exclude name="asm2*.jar"/>\r
  42            </fileset>\r
  43          </classpath>\r
  44      </java>\r