mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-10-23 01:57:05 -07:00
Robin H. Johnson
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
56 lines
2.4 KiB
Diff
56 lines
2.4 KiB
Diff
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"
|