mirror of https://github.com/apache/lucene.git
build: move license validation to only happen with test, not with compile
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1092851 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
28332fff50
commit
00e6bc2e41
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
<project name="lucene-solr" default="test" basedir=".">
|
<project name="lucene-solr" default="test" basedir=".">
|
||||||
<import file="common-build.xml"/>
|
<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>
|
<sequential>
|
||||||
<subant target="test" inheritall="false" failonerror="true">
|
<subant target="test" inheritall="false" failonerror="true">
|
||||||
<fileset dir="lucene" includes="build.xml" />
|
<fileset dir="lucene" includes="build.xml" />
|
||||||
|
@ -35,7 +35,7 @@
|
||||||
<fileset dir="solr" includes="build.xml" />
|
<fileset dir="solr" includes="build.xml" />
|
||||||
</subant></sequential>
|
</subant></sequential>
|
||||||
</target>
|
</target>
|
||||||
<target name="compile" depends="validate" description="Compile Lucene and Solr">
|
<target name="compile" description="Compile Lucene and Solr">
|
||||||
<sequential>
|
<sequential>
|
||||||
|
|
||||||
<subant target="compile" inheritall="false" failonerror="true">
|
<subant target="compile" inheritall="false" failonerror="true">
|
||||||
|
|
|
@ -308,7 +308,7 @@
|
||||||
</copy>
|
</copy>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="compile" depends="compile-core, validate-lucene">
|
<target name="compile" depends="compile-core">
|
||||||
<!-- convenience target to compile core -->
|
<!-- convenience target to compile core -->
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
@ -565,7 +565,7 @@
|
||||||
</sequential>
|
</sequential>
|
||||||
</macrodef>
|
</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">
|
<target name="junit-mkdir">
|
||||||
<mkdir dir="${junit.output.dir}"/>
|
<mkdir dir="${junit.output.dir}"/>
|
||||||
|
|
|
@ -120,7 +120,7 @@
|
||||||
<!-- Compile the project. -->
|
<!-- Compile the project. -->
|
||||||
<target name="compile"
|
<target name="compile"
|
||||||
description="Compile the source code."
|
description="Compile the source code."
|
||||||
depends="validate-solr, compile-solrj">
|
depends="compile-solrj">
|
||||||
|
|
||||||
<solr-javac destdir="${dest}/solr"
|
<solr-javac destdir="${dest}/solr"
|
||||||
classpathref="compile.classpath.solrj">
|
classpathref="compile.classpath.solrj">
|
||||||
|
@ -394,7 +394,7 @@
|
||||||
<!-- Run contrib unit tests. -->
|
<!-- Run contrib unit tests. -->
|
||||||
<target name="test"
|
<target name="test"
|
||||||
description="Runs the core unit tests."
|
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"/>
|
<target name="junit" depends="compileTests,junit-mkdir,junit-sequential,junit-parallel"/>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue