lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gsing...@apache.org
Subject svn commit: r507260 - in /lucene/java/trunk/contrib/benchmark: CHANGES.txt build.xml
Date Tue, 13 Feb 2007 22:17:25 GMT
Author: gsingers
Date: Tue Feb 13 14:17:24 2007
New Revision: 507260

URL: http://svn.apache.org/viewvc?view=rev&rev=507260
Log:
LUCENE-801: build lucene core and demo first, change classpath to use the build classes instead
of the jar

Modified:
    lucene/java/trunk/contrib/benchmark/CHANGES.txt
    lucene/java/trunk/contrib/benchmark/build.xml

Modified: lucene/java/trunk/contrib/benchmark/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/CHANGES.txt?view=diff&rev=507260&r1=507259&r2=507260
==============================================================================
--- lucene/java/trunk/contrib/benchmark/CHANGES.txt (original)
+++ lucene/java/trunk/contrib/benchmark/CHANGES.txt Tue Feb 13 14:17:24 2007
@@ -11,4 +11,6 @@
 2. Added this file.
 
 3. 2/11/07: LUCENE-790 and 788:  Fixed Locale issue with date formatter. Fixed some minor
issues with benchmarking by task.  Added a dependency
- on the Lucene demo to the build classpath.  (Doron Cohen, Grant Ingersoll)
\ No newline at end of file
+ on the Lucene demo to the build classpath.  (Doron Cohen, Grant Ingersoll)
+
+4. 2/13/07: LUCENE-801: build.xml now builds Lucene core and Demo first and has classpath
dependencies on the output of that build.  (Doron Cohen, Grant Ingersoll)
\ No newline at end of file

Modified: lucene/java/trunk/contrib/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/build.xml?view=diff&rev=507260&r1=507259&r2=507260
==============================================================================
--- lucene/java/trunk/contrib/benchmark/build.xml (original)
+++ lucene/java/trunk/contrib/benchmark/build.xml Tue Feb 13 14:17:24 2007
@@ -85,11 +85,10 @@
     <property name="collections.jar" value="commons-collections-3.1.jar"/>
     <property name="logging.jar" value="commons-logging-1.0.4.jar"/>
     <property name="bean-utils.jar" value="commons-beanutils-1.7.0.jar"/>
-    <property name="lucene-demos.jar" location="${common.dir}/build/lucene-demos-${version}.jar"/>
 
     <path id="classpath">
-        <pathelement path="${lucene.jar}"/>
-        <pathelement path="${lucene-demos.jar}"/>
+        <pathelement path="${common.dir}/build/classes/java"/>
+        <pathelement path="${common.dir}/build/classes/demo"/>
         <pathelement path="${basedir}/lib/${digester.jar}"/>
         <pathelement path="${basedir}/lib/${collections.jar}"/>
         <pathelement path="${basedir}/lib/${logging.jar}"/>
@@ -98,10 +97,6 @@
     <path id="run.classpath">
         <path refid="classpath"/>
         <pathelement location="${build.dir}/classes/java"/>
-        <pathelement path="${basedir}/lib/${digester.jar}"/>
-        <pathelement path="${basedir}/lib/${collections.jar}"/>
-        <pathelement path="${basedir}/lib/${logging.jar}"/>
-        <pathelement path="${basedir}/lib/${bean-utils.jar}"/>
     </path>
 
     <target name="run-standard" depends="compile,check-files,get-files" description="Run
the standard baseline">
@@ -130,5 +125,12 @@
         </java>
     </target>
 
-    <target name="init" depends="common.init,check-files"/>
+    <target name="compile-demo">
+      <subant target="compile-demo">
+         <fileset dir="${common.dir}" includes="build.xml"/>
+      </subant>
+    </target> 
+
+    <target name="init" depends="common.init,compile-demo,check-files"/>
+
 </project>



Mime
View raw message