lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dor...@apache.org
Subject svn commit: r517863 - in /lucene/java/trunk: CHANGES.txt build.xml common-build.xml src/java/org/apache/lucene/analysis/standard/ParseException.java
Date Tue, 13 Mar 2007 20:50:58 GMT
Author: doronc
Date: Tue Mar 13 13:50:56 2007
New Revision: 517863

URL: http://svn.apache.org/viewvc?view=rev&rev=517863
Log:
LUCENE-814: javacc build targets now fix line-end-style of generated
files, and deleting all javacc generated files before calling javacc.

Modified:
    lucene/java/trunk/CHANGES.txt
    lucene/java/trunk/build.xml
    lucene/java/trunk/common-build.xml
    lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/ParseException.java

Modified: lucene/java/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?view=diff&rev=517863&r1=517862&r2=517863
==============================================================================
--- lucene/java/trunk/CHANGES.txt (original)
+++ lucene/java/trunk/CHANGES.txt Tue Mar 13 13:50:56 2007
@@ -66,6 +66,10 @@
     is consumed. Now a ParseException is thrown if a query contains too many
     closing parentheses. (Andreas Neumann via Michael Busch)
 
+ 9. LUCENE-814: javacc build targets now fix line-end-style of generated files.
+    Now also deleting all javacc generated files before calling javacc.
+    (Steven Parkes, Doron Cohen)
+
 New features
 
  1. LUCENE-759: Added two n-gram-producing TokenFilters.

Modified: lucene/java/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/build.xml?view=diff&rev=517863&r1=517862&r2=517863
==============================================================================
--- lucene/java/trunk/build.xml (original)
+++ lucene/java/trunk/build.xml Tue Mar 13 13:50:56 2007
@@ -287,12 +287,15 @@
 
   <target name="clean-javacc">
     <delete>
-      <fileset dir="src">
-        <include name="java/org/apache/lucene/analysis/standard/StandardTokenizer.java"/>
-        <include name="java/org/apache/lucene/queryParser/QueryParser.java"/>
-        <include name="java/org/apache/lucene/queryParser/CharStream.java"/>
-        <include name="demo/org/apache/lucene/demo/html/HTMLParser.java"/>
-        <include name="demo/org/apache/lucene/demo/html/SimpleCharStream.java"/>
+      <fileset dir="src/java/org/apache/lucene/analysis/standard" includes="*.java">
+        <containsregexp expression="Generated.*By.*JavaCC"/>
+        <exclude name="ParseException.java"/>
+      </fileset>
+      <fileset dir="src/java/org/apache/lucene/queryParser" includes="*.java">
+        <containsregexp expression="Generated.*By.*JavaCC"/>
+      </fileset>
+      <fileset dir="src/demo/org/apache/lucene/demo/html" includes="*.java">
+        <containsregexp expression="Generated.*By.*JavaCC"/>
       </fileset>
     </delete>
   </target>

Modified: lucene/java/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/common-build.xml?view=diff&rev=517863&r1=517862&r2=517863
==============================================================================
--- lucene/java/trunk/common-build.xml (original)
+++ lucene/java/trunk/common-build.xml Tue Mar 13 13:50:56 2007
@@ -307,6 +307,9 @@
           debuglookahead="${javacc.debug.lookahead}"
           javacchome="${javacc.home}"
       />
+      <fixcrlf srcdir="@{outputDir}" includes="*.java">
+        <containsregexp expression="Generated.*By.*JavaCC"/>
+      </fixcrlf>
     </sequential>
   </macrodef>
 

Modified: lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/ParseException.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/ParseException.java?view=diff&rev=517863&r1=517862&r2=517863
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/ParseException.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/ParseException.java Tue
Mar 13 13:50:56 2007
@@ -1,6 +1,9 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 0.7pre6 */
 package org.apache.lucene.analysis.standard;
 
+/* Note: This file was also manually modified. 
+ * Regenerating it by JavaCC might undo these changes!. */  
+
 /**
  * This exception is thrown when parse errors are encountered.
  * You can explicitly create objects of this exception type by



Mime
View raw message