You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/03/29 11:49:36 UTC
svn commit: r1306770 - in /lucene/dev/branches/lucene3930/solr: build.xml
common-build.xml test-framework/build.xml
Author: rmuir
Date: Thu Mar 29 09:49:35 2012
New Revision: 1306770
URL: http://svn.apache.org/viewvc?rev=1306770&view=rev
Log:
LUCENE-3930: fix solr javadocs (also much faster: see LUCENE-3914)
Modified:
lucene/dev/branches/lucene3930/solr/build.xml
lucene/dev/branches/lucene3930/solr/common-build.xml
lucene/dev/branches/lucene3930/solr/test-framework/build.xml
Modified: lucene/dev/branches/lucene3930/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/build.xml?rev=1306770&r1=1306769&r2=1306770&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/build.xml (original)
+++ lucene/dev/branches/lucene3930/solr/build.xml Thu Mar 29 09:49:35 2012
@@ -455,9 +455,12 @@
</target>
<target name="javadocs-all"
- depends="prep-lucene-jars,javadocs-dep,lucene-javadocs-all,define-lucene-javadoc-url"
+ depends="prep-lucene-jars,javadocs-dep,define-lucene-javadoc-url"
description="Generate javadoc for core, java client and contrib">
<sequential>
+ <!-- since we build across all contribs, we must ensure all deps
+ are resolved -->
+ <contrib-crawl target="resolve" failonerror="true"/>
<mkdir dir="${dest}/docs/api"/>
<!-- TODO: optimize this, thats stupid here: -->
Modified: lucene/dev/branches/lucene3930/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/common-build.xml?rev=1306770&r1=1306769&r2=1306770&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene3930/solr/common-build.xml Thu Mar 29 09:49:35 2012
@@ -195,11 +195,7 @@
<copy file="${build.dir}/${fullnamever}.jar" todir="${dist}"/>
</target>
- <target name="lucene-javadocs-all">
- <ant dir="${common.dir}" target="javadocs-all" inheritall="false"/>
- </target>
-
- <target name="javadocs" depends="compile-core,lucene-javadocs-all,define-lucene-javadoc-url">
+ <target name="javadocs" depends="compile-core,define-lucene-javadoc-url">
<sequential>
<mkdir dir="${javadoc.dir}"/>
<mkdir dir="${dest}/META-INF/"/>
Modified: lucene/dev/branches/lucene3930/solr/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/test-framework/build.xml?rev=1306770&r1=1306769&r2=1306770&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/test-framework/build.xml (original)
+++ lucene/dev/branches/lucene3930/solr/test-framework/build.xml Thu Mar 29 09:49:35 2012
@@ -42,7 +42,7 @@
<!-- Override common-solr.javadocs to include a JUnit javadoc link -->
<!-- and to copy the built javadocs to ${dest}/docs/api/test-framework -->
<target name="javadocs"
- depends="compile-core,lucene-javadocs-all,define-lucene-javadoc-url">
+ depends="compile-core,define-lucene-javadoc-url">
<sequential>
<mkdir dir="${javadoc.dir}"/>
<mkdir dir="${dest}/META-INF/"/>