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/04/16 02:50:56 UTC

svn commit: r1092851 - in /lucene/dev/trunk: build.xml lucene/common-build.xml solr/build.xml

Author: yonik
Date: Sat Apr 16 00:50:56 2011
New Revision: 1092851

URL: http://svn.apache.org/viewvc?rev=1092851&view=rev
Log:
build: move license validation to only happen with test, not with compile

Modified:
    lucene/dev/trunk/build.xml
    lucene/dev/trunk/lucene/common-build.xml
    lucene/dev/trunk/solr/build.xml

Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1092851&r1=1092850&r2=1092851&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Sat Apr 16 00:50:56 2011
@@ -19,7 +19,7 @@
 
 <project name="lucene-solr" default="test" basedir=".">
   <import file="common-build.xml"/>
-  <target name="test" description="Test both Lucene and Solr">
+  <target name="test" description="Test both Lucene and Solr" depends="validate">
     <sequential>
       <subant target="test" inheritall="false" failonerror="true">
         <fileset dir="lucene" includes="build.xml" />
@@ -35,7 +35,7 @@
         <fileset dir="solr" includes="build.xml" />
       </subant></sequential>
   </target>
-  <target name="compile" depends="validate" description="Compile Lucene and Solr">
+  <target name="compile" description="Compile Lucene and Solr">
     <sequential>
 
       <subant target="compile" inheritall="false" failonerror="true">

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1092851&r1=1092850&r2=1092851&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Sat Apr 16 00:50:56 2011
@@ -308,7 +308,7 @@
     </copy>
   </target>
 
-  <target name="compile" depends="compile-core, validate-lucene">
+  <target name="compile" depends="compile-core">
     <!-- convenience target to compile core -->
   </target>
 
@@ -565,7 +565,7 @@
   	</sequential>
   </macrodef>
 	
-  <target name="test" depends="compile-test,junit-mkdir,junit-sequential,junit-parallel" description="Runs unit tests"/>
+  <target name="test" depends="compile-test,validate-lucene,junit-mkdir,junit-sequential,junit-parallel" description="Runs unit tests"/>
 
   <target name="junit-mkdir">
   	<mkdir dir="${junit.output.dir}"/>

Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1092851&r1=1092850&r2=1092851&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Sat Apr 16 00:50:56 2011
@@ -120,7 +120,7 @@
   <!-- Compile the project. -->
   <target name="compile"
           description="Compile the source code."
-          depends="validate-solr, compile-solrj">
+          depends="compile-solrj">
 
     <solr-javac destdir="${dest}/solr"
                 classpathref="compile.classpath.solrj">
@@ -394,7 +394,7 @@
   <!-- Run contrib unit tests. -->
   <target name="test"
         description="Runs the core unit tests."
-        depends="test-core, test-contrib, test-jsp" />
+        depends="validate-solr, test-core, test-contrib, test-jsp" />
 
   <target name="junit" depends="compileTests,junit-mkdir,junit-sequential,junit-parallel"/>