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/09/20 18:15:11 UTC
svn commit: r1388094 - in /lucene/dev/branches/solr3733/solr: build.xml
common-build.xml core/build.xml solrj/build.xml
Author: rmuir
Date: Thu Sep 20 16:15:10 2012
New Revision: 1388094
URL: http://svn.apache.org/viewvc?rev=1388094&view=rev
Log:
SOLR-3733: add links (some broken ones in documentation-lint still, but in general working)
Modified:
lucene/dev/branches/solr3733/solr/build.xml
lucene/dev/branches/solr3733/solr/common-build.xml
lucene/dev/branches/solr3733/solr/core/build.xml
lucene/dev/branches/solr3733/solr/solrj/build.xml
Modified: lucene/dev/branches/solr3733/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr3733/solr/build.xml?rev=1388094&r1=1388093&r2=1388094&view=diff
==============================================================================
--- lucene/dev/branches/solr3733/solr/build.xml (original)
+++ lucene/dev/branches/solr3733/solr/build.xml Thu Sep 20 16:15:10 2012
@@ -177,11 +177,6 @@
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
</target>
- <target name="javadocs-solr-core">
- <ant dir="core" target="javadocs" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- </target>
<!-- Solrj targets -->
<target name="test-solrj" description="Test java client">
@@ -189,11 +184,6 @@
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
</target>
- <target name="javadocs-solrj">
- <ant dir="solrj" target="javadocs" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- </target>
<!-- Solr contrib targets -->
<target name="test-contrib" description="Run contrib unit tests.">
Modified: lucene/dev/branches/solr3733/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr3733/solr/common-build.xml?rev=1388094&r1=1388093&r2=1388094&view=diff
==============================================================================
--- lucene/dev/branches/solr3733/solr/common-build.xml (original)
+++ lucene/dev/branches/solr3733/solr/common-build.xml Thu Sep 20 16:15:10 2012
@@ -200,21 +200,52 @@
<target name="lucene-javadocs" depends="javadocs-lucene-core,javadocs-analyzers-common,javadocs-analyzers-icu,javadocs-analyzers-kuromoji,javadocs-analyzers-phonetic,javadocs-analyzers-smartcn,javadocs-analyzers-morfologik,javadocs-analyzers-stempel,javadocs-analyzers-uima,javadocs-suggest,javadocs-grouping,javadocs-queries,javadocs-queryparser,javadocs-highlighter,javadocs-memory,javadocs-misc,javadocs-spatial,javadocs-test-framework"/>
<!-- create javadocs for the current module -->
- <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs">
+ <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solr-core">
<sequential>
<mkdir dir="${javadoc.dir}/${name}"/>
<solr-invoke-javadoc>
<solrsources>
<packageset dir="${src.dir}"/>
</solrsources>
+ <links>
+ <link href="../solr-solrj"/>
+ <link href="../solr-core"/>
+ </links>
</solr-invoke-javadoc>
<solr-jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
</sequential>
</target>
+ <target name="check-solr-core-javadocs-uptodate" unless="solr-core-javadocs.uptodate">
+ <uptodate property="solr-core-javadocs.uptodate" targetfile="${build.dir}/solr-core/apache-solr-core-${version}-javadoc.jar">
+ <srcfiles dir="${common-solr.dir}/core/src/java" includes="**/*.java"/>
+ </uptodate>
+ </target>
+
+ <target name="check-solrj-javadocs-uptodate" unless="solrj-javadocs.uptodate">
+ <uptodate property="solrj-javadocs.uptodate" targetfile="${build.dir}/solr-solrj/apache-solr-solrj-${version}-javadoc.jar">
+ <srcfiles dir="${common-solr.dir}/solrj/src/java" includes="**/*.java"/>
+ </uptodate>
+ </target>
+
+ <target name="javadocs-solr-core" depends="check-solr-core-javadocs-uptodate" unless="solr-core-javadocs.uptodate">
+ <ant dir="${common-solr.dir}/core" target="javadocs" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="solr-core-javadocs.uptodate" value="true"/>
+ </target>
+
+ <target name="javadocs-solrj" depends="check-solrj-javadocs-uptodate" unless="solrj-javadocs.uptodate">
+ <ant dir="${common-solr.dir}/solrj" target="javadocs" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="solrj-javadocs.uptodate" value="true"/>
+ </target>
+
<!-- macro to create solr javadocs with links to lucene. make sure calling task depends on lucene-javadocs -->
<macrodef name="solr-invoke-javadoc">
<element name="solrsources" optional="yes"/>
+ <element name="links" optional="yes"/>
<attribute name="destdir" default="${javadoc.dir}/${name}"/>
<attribute name="title" default="${Name} ${version} ${name} API"/>
<attribute name="overview" default="${src.dir}/overview.html"/>
@@ -240,6 +271,7 @@
<link offline="true" href="${lucene.javadoc.url}memory" packagelistloc="${lucenedocs}/memory"/>
<link offline="true" href="${lucene.javadoc.url}misc" packagelistloc="${lucenedocs}/misc"/>
<link offline="true" href="${lucene.javadoc.url}spatial" packagelistloc="${lucenedocs}/spatial"/>
+ <links/>
<link href=""/>
</sources>
</invoke-javadoc>
Modified: lucene/dev/branches/solr3733/solr/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr3733/solr/core/build.xml?rev=1388094&r1=1388093&r2=1388094&view=diff
==============================================================================
--- lucene/dev/branches/solr3733/solr/core/build.xml (original)
+++ lucene/dev/branches/solr3733/solr/core/build.xml Thu Sep 20 16:15:10 2012
@@ -25,5 +25,21 @@
<target name="compile-core" depends="compile-solrj,common-solr.compile-core"/>
+ <!-- specialized to ONLY depend on solrj -->
+ <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solrj">
+ <sequential>
+ <mkdir dir="${javadoc.dir}/${name}"/>
+ <solr-invoke-javadoc>
+ <solrsources>
+ <packageset dir="${src.dir}"/>
+ </solrsources>
+ <links>
+ <link href="../solr-solrj"/>
+ </links>
+ </solr-invoke-javadoc>
+ <solr-jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
+ </sequential>
+ </target>
+
<target name="dist-maven" depends="dist-maven-src-java"/>
</project>
Modified: lucene/dev/branches/solr3733/solr/solrj/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr3733/solr/solrj/build.xml?rev=1388094&r1=1388093&r2=1388094&view=diff
==============================================================================
--- lucene/dev/branches/solr3733/solr/solrj/build.xml (original)
+++ lucene/dev/branches/solr3733/solr/solrj/build.xml Thu Sep 20 16:15:10 2012
@@ -33,6 +33,19 @@
<path refid="solr.base.classpath"/>
</path>
+ <!-- Specialized to depend on nothing -->
+ <target name="javadocs" depends="compile-core">
+ <sequential>
+ <mkdir dir="${javadoc.dir}/${name}"/>
+ <solr-invoke-javadoc>
+ <solrsources>
+ <packageset dir="${src.dir}"/>
+ </solrsources>
+ </solr-invoke-javadoc>
+ <solr-jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
+ </sequential>
+ </target>
+
<target name="dist" depends="common-solr.dist">
<mkdir dir="${dist}/solrj-lib" />
<copy todir="${dist}/solrj-lib">