You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
2.4 KiB
56 lines
2.4 KiB
11 years ago
|
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"
|