You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2011/03/11 17:47:19 UTC
svn commit: r1080661 - in /lucene/dev/branches/lucene_solr_3_1: ./ lucene/
solr/ solr/build.xml
Author: yonik
Date: Fri Mar 11 16:47:19 2011
New Revision: 1080661
URL: http://svn.apache.org/viewvc?rev=1080661&view=rev
Log:
build: fix javadoc targets
Modified:
lucene/dev/branches/lucene_solr_3_1/ (props changed)
lucene/dev/branches/lucene_solr_3_1/lucene/ (props changed)
lucene/dev/branches/lucene_solr_3_1/solr/ (props changed)
lucene/dev/branches/lucene_solr_3_1/solr/build.xml
Modified: lucene/dev/branches/lucene_solr_3_1/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/build.xml?rev=1080661&r1=1080660&r2=1080661&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/build.xml Fri Mar 11 16:47:19 2011
@@ -157,7 +157,13 @@
</solr-javac>
</target>
- <target name="javadoc-solrj" depends="compile-solrj" description="Generates solrj javadoc documentation.">
+ <target name="javadoc-dep">
+ <copy failonerror="false" todir="${build.docs}">
+ <fileset dir="site" />
+ </copy>
+ </target>
+
+ <target name="javadoc-solrj" depends="compile-solrj,javadoc-dep" description="Generates solrj javadoc documentation.">
<sequential>
<mkdir dir="${build.javadoc}/solrj"/>
@@ -176,7 +182,7 @@
</sequential>
</target>
- <target name="javadoc-core" depends="compile" description="Generates javadoc documentation for core.">
+ <target name="javadoc-core" depends="compile,javadoc-dep" description="Generates javadoc documentation for core.">
<sequential>
<mkdir dir="${build.javadoc}/solr"/>
@@ -199,7 +205,7 @@
</target>
- <target name="javadoc-all" description="Generate javadoc for core, client and contrib">
+ <target name="javadoc-all" depends="compile,javadoc-dep" description="Generate javadoc for core, client and contrib">
<sequential>
<mkdir dir="${build.javadoc}"/>
@@ -235,12 +241,12 @@
</sequential>
</target>
- <target name="javadoc-contrib" description="Generate javadoc for contrib classes" depends="build-contrib">
+ <target name="javadoc-contrib" description="Generate javadoc for contrib classes" depends="build-contrib,javadoc-dep">
<contrib-crawl target="javadoc"
failonerror="true"/>
</target>
- <target name="javadoc" depends="javadoc-core, javadoc-contrib, javadoc-solrj, javadoc-all">
+ <target name="javadoc" depends="javadoc-contrib, javadoc-solrj, javadoc-all">
</target>
<target name="stub-factories" depends="dist-jar"
@@ -833,10 +839,6 @@
depends="dist, example, javadoc">
<mkdir dir="${package.dir}"/>
- <copy failonerror="false" todir="${build.docs}">
- <fileset dir="site" />
- </copy>
-
<delete includeemptydirs="true">
<fileset dir="${example}/work" includes="**/*"/>
</delete>