Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-814: javacc build targets now fix line-end-style of generated 

files, and deleting all javacc generated files before calling javacc.


git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@517863 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doron Cohen 2007-03-13 20:50:56 +00:00
parent 1159f9a768
commit d4e406ad22
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.txt
View File

@ -66,6 +66,10 @@ Bug fixes
is consumed. Now a ParseException is thrown if a query contains too many is consumed. Now a ParseException is thrown if a query contains too many
closing parentheses. (Andreas Neumann via Michael Busch) 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 New features
1. LUCENE-759: Added two n-gram-producing TokenFilters. 1. LUCENE-759: Added two n-gram-producing TokenFilters.

15
build.xml
View File

@ -287,12 +287,15 @@
<target name="clean-javacc"> <target name="clean-javacc">
<delete> <delete>
<fileset dir="src"> <fileset dir="src/java/org/apache/lucene/analysis/standard" includes="*.java">
<include name="java/org/apache/lucene/analysis/standard/StandardTokenizer.java"/> <containsregexp expression="Generated.*By.*JavaCC"/>
<include name="java/org/apache/lucene/queryParser/QueryParser.java"/> <exclude name="ParseException.java"/>
<include name="java/org/apache/lucene/queryParser/CharStream.java"/> </fileset>
<include name="demo/org/apache/lucene/demo/html/HTMLParser.java"/> <fileset dir="src/java/org/apache/lucene/queryParser" includes="*.java">
<include name="demo/org/apache/lucene/demo/html/SimpleCharStream.java"/> <containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
<fileset dir="src/demo/org/apache/lucene/demo/html" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset> </fileset>
</delete> </delete>
</target> </target>

3
common-build.xml
View File

@ -307,6 +307,9 @@
debuglookahead="${javacc.debug.lookahead}" debuglookahead="${javacc.debug.lookahead}"
javacchome="${javacc.home}" javacchome="${javacc.home}"
/> />
<fixcrlf srcdir="@{outputDir}" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fixcrlf>
</sequential> </sequential>
</macrodef> </macrodef>

3
src/java/org/apache/lucene/analysis/standard/ParseException.java
View File

@ -1,6 +1,9 @@
/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 0.7pre6 */ /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 0.7pre6 */
package org.apache.lucene.analysis.standard; 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. * This exception is thrown when parse errors are encountered.
* You can explicitly create objects of this exception type by * You can explicitly create objects of this exception type by