svn commit: r1371746 - in /lucene/dev/branches/branch_4x: ./ build.xml

[us...@apache.org]

Author: uschindler
Date: Fri Aug 10 15:38:25 2012
New Revision: 1371746

URL: http://svn.apache.org/viewvc?rev=1371746&view=rev
Log:
Merged revision(s) 1371745 from lucene/dev/trunk:
LUCENE-4187: Allow disabling validation tasks and javadocs-linting from jenkins

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/build.xml

Modified: lucene/dev/branches/branch_4x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/build.xml?rev=1371746&r1=1371745&r2=1371746&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/build.xml (original)
+++ lucene/dev/branches/branch_4x/build.xml Fri Aug 10 15:38:25 2012
@@ -51,7 +51,14 @@
     </sequential>
   </target>
 
-  <target name="validate" description="Validate dependencies, licenses, etc.">
+  <target name="validate" description="Validate dependencies, licenses, etc." depends="-validate-source-patterns">
+    <subant target="validate" inheritall="false" failonerror="true">
+      <fileset dir="lucene" includes="build.xml" />
+      <fileset dir="solr" includes="build.xml" />
+    </subant>
+  </target>
+  
+  <target name="-validate-source-patterns" unless="disable.source-patterns">
     <!-- check that there are no nocommits or @author javadoc tags: -->
     <property name="validate.currDir" location="."/>
     <pathconvert pathsep="${line.separator}" dirsep="/" property="validate.patternsFound" setonempty="false">
@@ -66,11 +73,6 @@
       <map from="${validate.currDir}${file.separator}" to="* "/>
     </pathconvert>
     <fail if="validate.patternsFound">The following files contain @author tags or nocommits:${line.separator}${validate.patternsFound}</fail>
-    <!-- run validate for both lucene and solr: -->
-    <subant target="validate" inheritall="false" failonerror="true">
-      <fileset dir="lucene" includes="build.xml" />
-      <fileset dir="solr" includes="build.xml" />
-    </subant>
   </target>
 
   <target name="rat-sources" description="Runs rat across all sources and tests">
@@ -247,8 +249,17 @@
   </target>
   
   <!-- Jenkins tasks -->
-  <target name="jenkins-hourly" depends="clean,test,validate,javadocs-lint,-svn-status"/>
+  <target name="jenkins-hourly" depends="clean,test,validate,-jenkins-javadocs-lint,-svn-status"/>
   
+  <!-- we need this extra condition, as we want to match only on "true", not solely if property is set: -->
+  <property name="disable.javadocs-lint" value="false" />
+  <condition property="-disable.javadocs-lint">
+    <equals arg1="${disable.javadocs-lint}" arg2="true"/>
+  </condition>
+  <target name="-jenkins-javadocs-lint" unless="-disable.javadocs-lint">
+    <antcall target="javadocs-lint"/> 
+  </target>
+
   <!-- define here, as common-build is not included! -->
   <property name="svn.exe" value="svn" />