You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2015/02/07 19:05:46 UTC
svn commit: r1658088 - in /lucene/dev/trunk: lucene/common-build.xml
solr/common-build.xml
Author: uschindler
Date: Sat Feb 7 18:05:45 2015
New Revision: 1658088
URL: http://svn.apache.org/r1658088
Log:
LUCENE-4797: Split doclint args in trunk, this makes it consistent with 5.x (patch not yet committed there)
Modified:
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/solr/common-build.xml
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1658088&r1=1658087&r2=1658088&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Sat Feb 7 18:05:45 2015
@@ -164,7 +164,7 @@
<property name="javac.debug" value="on"/>
<property name="javac.source" value="1.8"/>
<property name="javac.target" value="1.8"/>
- <property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial -Xlint:-options -Xdoclint:all/protected -Xdoclint:-missing"/>
+ <property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial -Xlint:-options"/>
<property name="javadoc.link" value="http://download.oracle.com/javase/8/docs/api/"/>
<property name="javadoc.link.junit" value="http://junit.sourceforge.net/javadoc/"/>
<property name="javadoc.packagelist.dir" location="${common.dir}/tools/javadoc"/>
@@ -175,6 +175,9 @@
<property name="javadoc.maxmemory" value="512m" />
<property name="javadoc.noindex" value="true"/>
+ <property name="javadoc.doclint.args" value="-Xdoclint:all -Xdoclint:-missing"/>
+ <property name="javac.doclint.args" value="-Xdoclint:all/protected -Xdoclint:-missing"/>
+
<!-- detect bootclasspath from given bootjdk path (including crazy AppleJDK special case) -->
<first id="-boot-rt.jar">
<fileset dir="${bootjdk}" erroronmissingdir="false" followsymlinks="true">
@@ -372,9 +375,6 @@
<echo level="warning" message="WARN: Linting documentation HTML is not supported on this Java version (${build.java.runtime}) / JVM (${java.vm.name}). NOTHING DONE!"/>
</target>
- <!-- for now enable only some doclint: -->
- <property name="javadoc.args" value="-Xdoclint:all -Xdoclint:-missing"/>
-
<!-- Import custom ANT tasks. -->
<import file="${common.dir}/tools/custom-tasks.xml" />
@@ -1863,6 +1863,7 @@ ${ant.project.name}.test.dependencies=${
<compilerarg line="-Xmaxerrs 10000000"/> -->
<!-- for generics in Java 1.5: -->
<compilerarg line="${javac.args}"/>
+ <compilerarg line="${javac.doclint.args}"/>
</javac>
</sequential>
</macrodef>
@@ -2026,7 +2027,7 @@ ${ant.project.name}.test.dependencies=${
<sources />
<classpath refid="javadoc.classpath"/>
- <arg line="${javadoc.args}"/>
+ <arg line="${javadoc.doclint.args}"/>
</javadoc>
<record name="@{destdir}/log_javadoc.txt" action="stop"/>
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1658088&r1=1658087&r2=1658088&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Sat Feb 7 18:05:45 2015
@@ -29,8 +29,10 @@
<property name="javac.source" value="1.8"/>
<property name="javac.target" value="1.8"/>
<property name="javac.args" value=""/>
+
<!-- for now disable doclint: -->
- <property name="javadoc.args" value="-Xdoclint:none"/>
+ <property name="javadoc.doclint.args" value="-Xdoclint:none"/>
+ <property name="javac.doclint.args" value=""/>
<property name="dest" location="${common-solr.dir}/build" />
<property name="build.dir" location="${dest}/${ant.project.name}"/>