lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r932747 - in /lucene/dev/trunk/lucene: common-build.xml contrib/queryparser/build.xml
Date Sat, 10 Apr 2010 15:30:06 GMT
Author: uschindler
Date: Sat Apr 10 15:30:05 2010
New Revision: 932747

URL: http://svn.apache.org/viewvc?rev=932747&view=rev
Log:
some minor cleanups and faster jflex classpath :-)

Modified:
    lucene/dev/trunk/lucene/common-build.xml
    lucene/dev/trunk/lucene/contrib/queryparser/build.xml

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=932747&r1=932746&r2=932747&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Sat Apr 10 15:30:05 2010
@@ -92,13 +92,21 @@
   <property name="javacc.home" location="${common.dir}"/>
   <property name="jflex.home" location="${common.dir}"/>
 
-	<path id="jflex.classpath">
+  <path id="jflex.classpath">
     <fileset dir="${jflex.home}/">
-      <include name="**/target/*.jar"/>
-      <include name="**/lib/*.jar"/>
+      <!-- for a JFlex trunk checkout: -->
+      <include name="jflex/target/*.jar"/>
+      <!-- for a JFlex distribution (not yet available): -->
+      <include name="lib/*.jar"/>
     </fileset>
-	</path>
-	
+  </path>
+
+  <path id="javacc.classpath">
+    <fileset dir="${javacc.home}/">
+      <include name="bin/lib/*.jar"/>
+    </fileset>
+  </path>
+
   <property name="backwards.dir" location="backwards"/>
   <property name="build.dir.backwards" location="${build.dir}/backwards"/>
 
@@ -200,16 +208,13 @@
   </target>
 
   <target name="javacc-check">
-    <available
-      property="javacc.present"
-      classname="org.javacc.parser.Main"
-      classpath="${javacc.home}/bin/lib/javacc.jar"
-      />
+    <available property="javacc.present" classname="org.javacc.parser.Main">
+      <classpath refid="javacc.classpath"/>
+    </available>
     <fail unless="javacc.present">
       ##################################################################
       JavaCC not found.
       JavaCC Home: ${javacc.home}
-      JavaCC JAR: ${javacc.jar}
 
       Please download and install JavaCC 4.1 from:
 

Modified: lucene/dev/trunk/lucene/contrib/queryparser/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/build.xml?rev=932747&r1=932746&r2=932747&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/build.xml Sat Apr 10 15:30:05 2010
@@ -25,6 +25,8 @@
 
   <import file="../contrib-build.xml"/>
  
+  <target name="compile-core" depends="javacc-notice, common.compile-core"/>
+
   <!--
     NOTE: see the README.javacc for details on how to fully regenerate the parser
   -->



Mime
View raw message