LUCENE-2952: restore src/tools and move validation there

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1084274 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Grant Ingersoll 2011-03-22 18:03:57 +00:00
parent 97909a908e
commit ed20a24d22
6 changed files with 18 additions and 10 deletions

View File

@ -19,12 +19,12 @@
xmlns:artifact="antlib:org.apache.maven.artifact.ant"> xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<dirname file="${ant.file.all-common}" property="all.common.dir"/> <dirname file="${ant.file.all-common}" property="all.common.dir"/>
<path id="validation.runtime.classpath"> <path id="tools.runtime.classpath">
<pathelement location="${all.common.dir}/lucene/build/classes/test-framework"/> <pathelement location="${all.common.dir}/lucene/build/classes/tools"/>
</path> </path>
<target name="compile-test-framework" description="Compile the Test Framework and Validation tools"> <target name="compile-tools" description="Compile the Test Framework and Validation tools">
<sequential> <sequential>
<subant target="compile-test-framework" inheritall="false" failonerror="true"> <subant target="compile-tools" inheritall="false" failonerror="true">
<fileset dir="${all.common.dir}/lucene" includes="build.xml" /> <fileset dir="${all.common.dir}/lucene" includes="build.xml" />
</subant> </subant>
</sequential> </sequential>

View File

@ -424,6 +424,14 @@
test.classpath="test.classpath"/> test.classpath="test.classpath"/>
</target> </target>
<target name="compile-tools">
<compile
srcdir="${common.dir}/src/tools/java"
destdir="${build.dir}/classes/tools">
<classpath refid="classpath"/>
</compile>
</target>
<target name="compile-test" depends="compile-test-framework"> <target name="compile-test" depends="compile-test-framework">
<compile-test-macro srcdir="${tests.src.dir}" destdir="${build.dir}/classes/test" <compile-test-macro srcdir="${tests.src.dir}" destdir="${build.dir}/classes/test"
test.classpath="test.classpath"/> test.classpath="test.classpath"/>
@ -794,10 +802,10 @@
<!-- VALIDATION work --> <!-- VALIDATION work -->
<target name="check-legal-lucene" depends="compile-test-framework"> <target name="check-legal-lucene" depends="compile-tools">
<java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true"> <java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true">
<classpath> <classpath>
<path refid="validation.runtime.classpath" /> <path refid="tools.runtime.classpath" />
</classpath> </classpath>
<!-- TODO: it might be better to just automatically find all directories that contain jar files, but that could take a <!-- TODO: it might be better to just automatically find all directories that contain jar files, but that could take a
long time. This should be faster, but we could miss a directory long time. This should be faster, but we could miss a directory

View File

@ -66,10 +66,10 @@
</target> </target>
<target name="validate" depends="validate-modules"/> <target name="validate" depends="validate-modules"/>
<target name="validate-modules" depends="check-legal-modules" unless="validated-modules"/> <target name="validate-modules" depends="check-legal-modules" unless="validated-modules"/>
<target name="check-legal-modules" depends="compile-test-framework"> <target name="check-legal-modules" depends="compile-tools">
<java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true"> <java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true">
<classpath> <classpath>
<path refid="validation.runtime.classpath" /> <path refid="tools.runtime.classpath" />
</classpath> </classpath>
<!-- TODO: it might be better to just automatically find all directories that contain jar files, but that could take a <!-- TODO: it might be better to just automatically find all directories that contain jar files, but that could take a
long time. This should be faster, but we could miss a directory long time. This should be faster, but we could miss a directory

View File

@ -577,10 +577,10 @@
<target name="validate" depends="validate-solr"/> <target name="validate" depends="validate-solr"/>
<target name="validate-solr" depends="check-legal-solr" unless="validated-solr"/> <target name="validate-solr" depends="check-legal-solr" unless="validated-solr"/>
<target name="check-legal-solr" depends="compile-test-framework"> <target name="check-legal-solr" depends="compile-tools">
<java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true"> <java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true">
<classpath> <classpath>
<path refid="validation.runtime.classpath" /> <path refid="tools.runtime.classpath" />
</classpath> </classpath>
<!-- TODO: it might be better to just automatically find all directories that contain jar files, but that could take a <!-- TODO: it might be better to just automatically find all directories that contain jar files, but that could take a
long time. This should be faster, but we could miss a directory long time. This should be faster, but we could miss a directory