You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/dev-java/guice/files/3.0-common.xml.patch

27 lines
1.5 KiB

diff --git a/guice-3.0-src/common.xml b/guice-3.0-src/common.xml
index a318ab3..62cadce 100644
--- a/guice-3.0-src/common.xml
+++ b/guice-3.0-src/common.xml
@@ -137,20 +137,6 @@
<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-snapshot.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="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/>
- <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/>
- <rule pattern="org.objectweb.asm.**.*" result="com.google.inject.internal.asm.@1.$@2"/>
- <rule pattern="com.google.inject.internal.util.*" result="com.google.inject.internal.util.$@1"/>
- <rule pattern="com.google.inject.internal.util.**.*" result="com.google.inject.internal.util.@1.$@2"/>
- <keep pattern="com.google.inject.**"/>
- </jarjar>
+ <jar destfile="${build.dir}/${ant.project.name}.jar" basedir="${build.dir}/classes" />
</target>
</project>