[gentoo-commits] gentoo-x86 commit in dev-java/guice/files: 2.0-common.xml.patch 2.0-build.xml.patch

[gentoo-commits] gentoo-x86 commit in dev-java/guice/files: 2.0-common.xml.patch 2.0-build.xml.patch

[Johann Schmitz (ercpe)]

ercpe       13/09/25 17:20:14

  Added:                2.0-common.xml.patch 2.0-build.xml.patch
  Log:
  Ebuild for guice:2 - lightweight dependency injection framework
  
  (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

Revision  Changes    Path
1.1                  dev-java/guice/files/2.0-common.xml.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/guice/files/2.0-common.xml.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/guice/files/2.0-common.xml.patch?rev=1.1&content-type=text/plain

Index: 2.0-common.xml.patch
===================================================================
--- /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>



1.1                  dev-java/guice/files/2.0-build.xml.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/guice/files/2.0-build.xml.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/guice/files/2.0-build.xml.patch?rev=1.1&content-type=text/plain

Index: 2.0-build.xml.patch
===================================================================
--- /tmp/guice-2.0-src.orig/build.xml	2012-08-23 23:04:55.759642915 +0300
+++ build.xml	2012-08-23 23:30:05.899593954 +0300
@@ -13,11 +13,8 @@
   </path>
 
 
-  <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
-    <jar jarfile="${build.dir}/dist/guice-${version}.jar"
-        manifest="${build.dir}/META-INF/MANIFEST.MF">
-      <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"/>
-    </jar>
+  <target name="jar" depends="jar.withdeps" description="Build jar.">
+	<echo>${build.dir}/${ant.project.name}</echo>
   </target>
 
   <target name="dist" depends="distjars, javadoc"