summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/guice/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
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
Diffstat (limited to 'dev-java/guice/files')
-rw-r--r--dev-java/guice/files/2.0-build.xml.patch16
-rw-r--r--dev-java/guice/files/2.0-common.xml.patch21
-rw-r--r--dev-java/guice/files/3.0-build.xml.patch55
-rw-r--r--dev-java/guice/files/3.0-common.xml.patch26
4 files changed, 118 insertions, 0 deletions
diff --git a/dev-java/guice/files/2.0-build.xml.patch b/dev-java/guice/files/2.0-build.xml.patch
new file mode 100644
index 000000000000..4b0e24d3951f
--- /dev/null
+++ b/dev-java/guice/files/2.0-build.xml.patch
@@ -0,0 +1,16 @@
+--- /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"
diff --git a/dev-java/guice/files/2.0-common.xml.patch b/dev-java/guice/files/2.0-common.xml.patch
new file mode 100644
index 000000000000..f410a6438c06
--- /dev/null
+++ b/dev-java/guice/files/2.0-common.xml.patch
@@ -0,0 +1,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>
diff --git a/dev-java/guice/files/3.0-build.xml.patch b/dev-java/guice/files/3.0-build.xml.patch
new file mode 100644
index 000000000000..cdae24107ba6
--- /dev/null
+++ b/dev-java/guice/files/3.0-build.xml.patch
@@ -0,0 +1,55 @@
+diff --git a/guice-3.0-src/build.xml b/guice-3.0-src/build.xml
+index a66a186..da1dd76 100644
+--- a/guice-3.0-src/build.xml
++++ b/guice-3.0-src/build.xml
+@@ -10,11 +10,7 @@
+ </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.">
+ </target>
+
+ <target name="dist" depends="distjars, javadoc"
+@@ -166,10 +162,7 @@
+ <target name="javadoc">
+ <javadoc packagenames="com.google.*"
+ destdir="build/docs"
+- docletpath="lib/build/doclava.jar"
+- bootclasspath="${java.home}/lib/rt.jar"
+- maxmemory="512M"
+- classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar">
++ maxmemory="512M">
+ <fileset dir="${src.dir}" defaultexcludes="yes">
+ <include name="com/google/**"/>
+ <exclude name="com/google/inject/internal/**"/>
+@@ -183,25 +176,7 @@
+ <fileset dir="${multibindings.src.dir}"/>
+ <fileset dir="${persist.src.dir}"/>
+ <fileset dir="${grapher.src.dir}"/>
+- <!-- TODO: this breaks Doclava for some reason
+- <fileset dir="${struts2.src.dir}"/> -->
+-
+- <doclet name="com.google.doclava.Doclava">
+- <param name="-hdf"/> <param name="project.name"/> <param name="Guice"/>
+- <param name="-since"/> <param name="lib/build/guice-1.0.xml"/> <param name="Guice_1.0" />
+- <param name="-since"/> <param name="lib/build/guice-2.0.xml"/> <param name="Guice_2.0" />
+- <param name="-apiversion" value="Guice_${new.api}"/>
+- <param name="-assetsdir" value="javadoc/assets"/>
+- <param name="-apixml" value="build/docs/guice-${new.api}.xml"/>
+- <!-- TODO: fix doclava federation
+- http://aopalliance.sourceforge.net/doc
+- http://www.springframework.org/docs/api/
+- <param name="-federate"/><param name="JDK"/><param name="http://download.oracle.com/javase/6/docs/api/index.html?"/>
+- <param name="-federationxml"/><param name="JDK"/><param name="http://doclava.googlecode.com/svn/static/api/openjdk-6.xml"/>
+- -->
+- </doclet>
+ </javadoc>
+- <move todir="build/docs/javadoc"><fileset dir="build/docs/reference"/></move>
+ </target>
+
+ <target name="no_aop"
diff --git a/dev-java/guice/files/3.0-common.xml.patch b/dev-java/guice/files/3.0-common.xml.patch
new file mode 100644
index 000000000000..01162c258a12
--- /dev/null
+++ b/dev-java/guice/files/3.0-common.xml.patch
@@ -0,0 +1,26 @@
+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>