blob: cdae24107ba65bdfe6892e9539c673a51d0c8bad (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
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"
|
