dev-java/guice/files/2.0-common.xml.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21

--- /tmp/guice-2.0-src.orig/common.xml	2012-08-23 23:28:51.056596381 +0300
+++ common.xml	2012-08-23 23:28:14.416597570 +0300
@@ -108,17 +108,7 @@
   <target name="jar.withdeps" depends="compile"
       description="Build jar with dependencies embedded.">
     <mkdir dir="${build.dir}/dist"/>
-    <dirname property="common.basedir" file="${ant.file.common}"/>
-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
-        classpath="${common.basedir}/lib/build/jarjar-1.0rc8.jar"/>
-    <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
-      <fileset dir="${build.dir}/classes"/>
-      <zipfileset src="${common.basedir}/lib/build/cglib-2.2.1-snapshot.jar"/>
-      <zipfileset src="${common.basedir}/lib/build/asm-3.1.jar"/>
-      <rule pattern="net.sf.cglib.**" result="com.google.inject.internal.cglib.@1"/>
-      <rule pattern="org.objectweb.asm.**" result="com.google.inject.internal.asm.@1"/>
-      <keep pattern="com.google.inject.**"/>
-    </jarjar>
+	<jar destfile="${build.dir}/${ant.project.name}.jar"  basedir="${build.dir}/classes" />
   </target>
 
 </project>