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/12 19:47:35 UTC
svn commit: r1080972 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/
solr/build.xml
Author: yonik
Date: Sat Mar 12 18:47:35 2011
New Revision: 1080972
URL: http://svn.apache.org/viewvc?rev=1080972&view=rev
Log:
packaging: exclude redundant maven javadoc
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/build.xml
Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1080972&r1=1080971&r2=1080972&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Sat Mar 12 18:47:35 2011
@@ -247,7 +247,7 @@
failonerror="true"/>
</target>
- <target name="javadoc" depends="javadoc-contrib, javadoc-solrj, javadoc-all">
+ <target name="javadoc" depends="javadoc-core, javadoc-contrib, javadoc-solrj, javadoc-all">
</target>
<target name="stub-factories" depends="dist-jar"
@@ -635,7 +635,7 @@
</war>
</target>
- <target name="dist-src" description="Creates the Solr source distribution files"
+ <target name="dist-src" description="Creates the Solr source distribution files for maven"
depends="make-manifest">
<mkdir dir="${dist}" />
@@ -666,7 +666,7 @@
</solr-jar>
</target>
- <target name="dist-javadoc" description="Creates the Solr javadoc distribution files"
+ <target name="dist-javadoc" description="Creates the Solr javadoc distribution files for maven"
depends="make-manifest, javadoc">
<mkdir dir="${dist}" />
@@ -864,8 +864,11 @@
prefix="${fullnamever}"
includes="dist/*.jar dist/*.war dist/solrj-lib/*"
excludes="**/*.tgz **/*.zip **/*.md5 **/*src*.jar **/*docs*.jar" />
- <tarfileset dir="${build.docs}"
- prefix="${fullnamever}/docs/" />
+ <!-- hack: the javadocs are built twice since maven needs separate packages... exclude those -->
+ <tarfileset dir="${build.docs}"
+ prefix="${fullnamever}/docs/"
+ excludes="api/solr/** api/contrib-*/**"
+ />
</tar>
<solr-checksum file="${package.dir}/${fullnamever}.tgz"/>