mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-10-03 07:59:05 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
27 lines
1.5 KiB
Diff
27 lines
1.5 KiB
Diff
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>
|