You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/05/31 02:08:14 UTC
svn commit: r1129445 - in /lucene/dev/trunk: ./ lucene/ lucene/backwards/
modules/ modules/analysis/ modules/analysis/common/ modules/analysis/icu/
solr/ solr/client/ solr/contrib/ solr/example/ solr/lib/ solr/site/ solr/src/
Author: rmuir
Date: Tue May 31 00:08:14 2011
New Revision: 1129445
URL: http://svn.apache.org/viewvc?rev=1129445&view=rev
Log:
LUCENE-3160: lucene source build doesn't work correctly by itself
Removed:
lucene/dev/trunk/common-build.xml
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/build.xml
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/backwards/ (props changed)
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/modules/analysis/build.xml
lucene/dev/trunk/modules/analysis/common/build.xml
lucene/dev/trunk/modules/analysis/icu/build.xml
lucene/dev/trunk/modules/build.xml
lucene/dev/trunk/solr/ (props changed)
lucene/dev/trunk/solr/CHANGES.txt (props changed)
lucene/dev/trunk/solr/LICENSE.txt (props changed)
lucene/dev/trunk/solr/NOTICE.txt (props changed)
lucene/dev/trunk/solr/README.txt (props changed)
lucene/dev/trunk/solr/build.xml (props changed)
lucene/dev/trunk/solr/client/ (props changed)
lucene/dev/trunk/solr/common-build.xml (contents, props changed)
lucene/dev/trunk/solr/contrib/ (props changed)
lucene/dev/trunk/solr/example/ (props changed)
lucene/dev/trunk/solr/lib/ (props changed)
lucene/dev/trunk/solr/site/ (props changed)
lucene/dev/trunk/solr/src/ (props changed)
lucene/dev/trunk/solr/testlogging.properties (props changed)
Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1129445&r1=1129444&r2=1129445&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Tue May 31 00:08:14 2011
@@ -18,7 +18,6 @@
-->
<project name="lucene-solr" default="test" basedir=".">
- <import file="common-build.xml"/>
<target name="test" description="Test both Lucene and Solr" depends="validate">
<sequential>
<subant target="test" 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=1129445&r1=1129444&r2=1129445&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Tue May 31 00:08:14 2011
@@ -24,7 +24,6 @@
</description>
<dirname file="${ant.file.common}" property="common.dir"/>
- <import file="${common.dir}/../common-build.xml"/>
<property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
<property name="prettify.dir" value="${common.dir}/src/tools/prettify"/>
<property name="maven.build.dir" value="${common.dir}/build/maven"/>
@@ -61,6 +60,11 @@
<fileset dir="${common.dir}/lib" includes="ant-*.jar"/>
</path>
+ <path id="tools.runtime.classpath">
+ <pathelement location="${common.dir}/build/classes/tools"/>
+ </path>
+
+
<!-- default arguments to pass to JVM executing tests -->
<property name="testmethod" value=""/>
<property name="args" value=""/>
Modified: lucene/dev/trunk/modules/analysis/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/build.xml?rev=1129445&r1=1129444&r2=1129445&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/build.xml (original)
+++ lucene/dev/trunk/modules/analysis/build.xml Tue May 31 00:08:14 2011
@@ -57,6 +57,13 @@
<ant dir="smartcn" target="clean" />
<ant dir="stempel" target="clean" />
</target>
+ <target name="validate">
+ <ant dir="common" target="validate" />
+ <ant dir="icu" target="validate" />
+ <ant dir="phonetic" target="validate" />
+ <ant dir="smartcn" target="validate" />
+ <ant dir="stempel" target="validate" />
+ </target>
<target name="compile-core">
<ant dir="common" target="compile-core" />
<ant dir="icu" target="compile-core" />
Modified: lucene/dev/trunk/modules/analysis/common/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/build.xml?rev=1129445&r1=1129444&r2=1129445&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/build.xml (original)
+++ lucene/dev/trunk/modules/analysis/common/build.xml Tue May 31 00:08:14 2011
@@ -106,7 +106,7 @@
</java>
</target>
- <target name="compile-tools">
+ <target name="compile-tools" depends="common.compile-tools">
<compile
srcdir="src/tools/java"
destdir="${build.dir}/classes/tools">
Modified: lucene/dev/trunk/modules/analysis/icu/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/icu/build.xml?rev=1129445&r1=1129444&r2=1129445&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/icu/build.xml (original)
+++ lucene/dev/trunk/modules/analysis/icu/build.xml Tue May 31 00:08:14 2011
@@ -125,7 +125,7 @@ are part of the ICU4C package. See http:
</java>
</target>
- <target name="compile-tools">
+ <target name="compile-tools" depends="common.compile-tools">
<compile
srcdir="src/tools/java"
destdir="${build.dir}/classes/tools">
Modified: lucene/dev/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/build.xml?rev=1129445&r1=1129444&r2=1129445&view=diff
==============================================================================
--- lucene/dev/trunk/modules/build.xml (original)
+++ lucene/dev/trunk/modules/build.xml Tue May 31 00:08:14 2011
@@ -18,7 +18,6 @@
-->
<project name="modules" default="test" basedir=".">
- <import file="../common-build.xml"/>
<target name="test" description="Test all modules">
<sequential>
<subant target="test" inheritall="false" failonerror="true">
@@ -30,7 +29,7 @@
</sequential>
</target>
- <target name="compile" description="Compile all modules" depends="validate-modules">
+ <target name="compile" description="Compile all modules" depends="validate">
<sequential>
<subant target="compile" inheritall="false" failonerror="true">
<fileset dir="analysis" includes="build.xml" />
@@ -74,24 +73,15 @@
</subant>
</sequential>
</target>
- <target name="validate" depends="validate-modules"/>
- <target name="validate-modules" depends="check-legal-modules" unless="validated-modules"/>
- <target name="check-legal-modules" depends="compile-tools">
- <java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true">
- <classpath>
- <path refid="tools.runtime.classpath" />
- </classpath>
- <!-- 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
- -->
- <!-- Modules -->
- <arg value="-c" />
- <arg value="${basedir}/analysis/icu/lib" />
- <arg value="-c" />
- <arg value="${basedir}/analysis/phonetic/lib" />
- <arg value="-c" />
- <arg value="${basedir}/benchmark/lib" />
- </java>
+ <target name="validate">
+ <sequential>
+ <subant target="validate" inheritall="false" failonerror="true">
+ <fileset dir="analysis" includes="build.xml" />
+ <fileset dir="benchmark" includes="build.xml" />
+ <fileset dir="grouping" includes="build.xml" />
+ <fileset dir="suggest" includes="build.xml" />
+ </subant>
+ </sequential>
</target>
<target name="clean" description="Clean all modules">
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1129445&r1=1129444&r2=1129445&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Tue May 31 00:08:14 2011
@@ -22,7 +22,6 @@
</description>
<dirname file="${ant.file.common-solr}" property="common-solr.dir"/>
- <import file="${common-solr.dir}/../common-build.xml"/>
<!-- change this together with the default and test's solrconfig.xml after starting a new development branch: -->
<property name="tests.luceneMatchVersion" value="4.0"/>
@@ -636,4 +635,16 @@
</java>
</target>
+ <path id="tools.runtime.classpath">
+ <pathelement location="${common-solr.dir}/../lucene/build/classes/tools"/>
+ </path>
+ <target name="compile-tools" description="Compile the Test Framework and Validation tools">
+ <sequential>
+ <subant target="compile-tools" inheritall="false" failonerror="true">
+ <fileset dir="${common-solr.dir}/../lucene" includes="build.xml" />
+ </subant>
+ </sequential>
+ </target>
+
+
</project>