lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dor...@apache.org
Subject svn commit: r666079 - in /lucene/java/trunk/contrib/benchmark: CHANGES.txt build.xml
Date Tue, 10 Jun 2008 11:58:01 GMT
Author: doronc
Date: Tue Jun 10 04:58:00 2008
New Revision: 666079

URL: http://svn.apache.org/viewvc?rev=666079&view=rev
Log:
LUCENE-1090: remove relative paths from benchmark's build.xml.

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?rev=666079&r1=666078&r2=666079&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/CHANGES.txt (original)
+++ lucene/java/trunk/contrib/benchmark/CHANGES.txt Tue Jun 10 04:58:00 2008
@@ -3,6 +3,12 @@
 The Benchmark contrib package contains code for benchmarking Lucene in a variety of ways.
 
 $Id:$
+
+5/10/08
+  LUCENE-1090: remove relative paths assumptions from benchmark code.
+  Only build.xml was modified: work-dir definition must remain so  
+  benchmark tests can run from both trunk-home and benchmark-home.  
+  
 3/9/08
   LUCENE-1209: Fixed DocMaker settings by round. Prior to this fix, DocMaker settings of

   first round were used in all rounds.  (E.g. term vectors.)

Modified: lucene/java/trunk/contrib/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/build.xml?rev=666079&r1=666078&r2=666079&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/build.xml (original)
+++ lucene/java/trunk/contrib/benchmark/build.xml Tue Jun 10 04:58:00 2008
@@ -6,7 +6,7 @@
     </description>
 
     <import file="../contrib-build.xml"/>
-    <property name="working.dir" value="work"/>
+    <property name="working.dir" location="work"/>
 
 
     <target name="check-files">
@@ -72,7 +72,8 @@
         <mkdir dir="${working.dir}/reuters-out"/>
         <java classname="org.apache.lucene.benchmark.utils.ExtractReuters" maxmemory="1024M"
fork="true">
             <classpath refid="run.classpath"/>
-            <arg line="${working.dir}/reuters ${working.dir}/reuters-out"/>
+            <arg file="${working.dir}/reuters"/>
+            <arg file="${working.dir}/reuters-out"/>
         </java>
     </target>
     <target name="get-20news-18828" unless="20news-18828.exists">
@@ -110,12 +111,12 @@
         <pathelement path="${common.dir}/build/classes/java"/>
         <pathelement path="${common.dir}/build/classes/demo"/>
         <pathelement path="${common.dir}/build/contrib/highlighter/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}"/>
-        <pathelement path="${basedir}/lib/${xercesImpl.jar}"/>
-        <pathelement path="${basedir}/lib/${xml-apis.jar}"/>
+        <pathelement path="lib/${digester.jar}"/>
+        <pathelement path="lib/${collections.jar}"/>
+        <pathelement path="lib/${logging.jar}"/>
+        <pathelement path="lib/${bean-utils.jar}"/>
+        <pathelement path="lib/${xercesImpl.jar}"/>
+        <pathelement path="lib/${xml-apis.jar}"/>
     </path>
     <path id="run.classpath">
         <path refid="classpath"/>
@@ -127,25 +128,28 @@
         <echo>Working Directory: ${working.dir}</echo>
         <java classname="org.apache.lucene.benchmark.Driver"  maxmemory="1024M" fork="true">
             <classpath refid="run.classpath"/>
-            <arg line="${working.dir} ${basedir}/conf/standard-config.xml"/>
+            <arg file="${working.dir}"/>
+            <arg file="conf/standard-config.xml"/>
         </java>
     </target>
     <target name="run-micro-standard" depends="compile,check-files,get-files" description="Run
the standard baseline">
         <echo>Working Directory: ${working.dir}</echo>
         <java classname="org.apache.lucene.benchmark.Driver" maxmemory="1024M" fork="true">
             <classpath refid="run.classpath"/>
-            <arg line="${working.dir} ${basedir}/conf/micro-standard-config.xml"/>
+            <arg file="${working.dir}"/>
+            <arg file="conf/micro-standard-config.xml"/>
         </java>
     </target>
 
-    <property name="task.alg" value="${basedir}/conf/micro-standard.alg"/>
+    <property name="task.alg" location="conf/micro-standard.alg"/>
     <property name="task.mem" value="140M"/>
 
-    <target name="run-task" depends="compile,check-files,get-files" description="Run compound
penalty perf test">
+    <target name="run-task" depends="compile,check-files,get-files" 
+     description="Run compound penalty perf test (optional: -Dtask.alg=your-algorithm-file
-Dtask.mem=java-max-mem)">
         <echo>Working Directory: ${working.dir}</echo>
         <java classname="org.apache.lucene.benchmark.byTask.Benchmark" maxmemory="${task.mem}"
fork="true">
             <classpath refid="run.classpath"/>
-            <arg line="${task.alg}"/>
+            <arg file="${task.alg}"/>
         </java>
     </target>
 
@@ -156,7 +160,7 @@
               <enable/>
             </assertions>
             <classpath refid="run.classpath"/>
-            <arg line="conf/extractWikipedia.alg"/>
+            <arg file="conf/extractWikipedia.alg"/>
         </java>
     </target>
 



Mime
View raw message