Revision: 1047e98e4081
Author: Sam Berlin <[email protected]>
Date: Sat Dec 7 18:23:58 2013 UTC
Log: Fix no_aop build (make it easier to replace the cglib tokens in
the ant build files).
http://code.google.com/p/google-guice/source/detail?r=1047e98e4081
Modified:
/build.xml
/common.xml
=======================================
--- /build.xml Sat Dec 7 17:47:34 2013 UTC
+++ /build.xml Sat Dec 7 18:23:58 2013 UTC
@@ -256,10 +256,7 @@
<replacetoken><![CDATA[<zipfileset
src="${common.basedir}/lib/build/cglib-3.1.jar"/>]]></replacetoken>
</replace>
<replace file="build/no_aop/common.xml" value="">
- <replacetoken><![CDATA[<zipfileset
src="${common.basedir}/lib/build/cglib-3.1.jar">
- <include name="LICENSE"/>
- <include name="NOTICE"/>
- </zipfileset>]]></replacetoken>
+ <replacetoken><![CDATA[<zipfileset
src="${common.basedir}/lib/build/cglib-3.1.jar"><include
name="LICENSE"/><include name="NOTICE"/></zipfileset>]]></replacetoken>
</replace>
<replace file="build/no_aop/common.xml" value='Bundle-Name"
value="$${ant.project.name} (no_aop)'>
<replacetoken><![CDATA[Bundle-Name"
value="${ant.project.name}]]></replacetoken>
=======================================
--- /common.xml Sat Dec 7 17:47:34 2013 UTC
+++ /common.xml Sat Dec 7 18:23:58 2013 UTC
@@ -171,10 +171,7 @@
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/>
<jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
- <zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar">
- <include name="LICENSE"/>
- <include name="NOTICE"/>
- </zipfileset>
+ <zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar"><include
name="LICENSE"/><include name="NOTICE"/></zipfileset>
<fileset dir="${build.dir}/classes"/>
<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"/>
--
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/google-guice-dev.
For more options, visit https://groups.google.com/groups/opt_out.
