1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
Description: Fix javacc clean and generation which is broken upstream.
Author: James Page <james.page@ubuntu.com>
Forwarded: no
Index: lucene-solr/lucene/build.xml
===================================================================
--- lucene-solr.orig/lucene/build.xml 2012-05-29 17:55:56.502256746 +0100
+++ lucene-solr/lucene/build.xml 2012-05-29 17:57:46.914565976 +0100
@@ -514,7 +514,7 @@
<!-- ================================================================== -->
<target name="clean-javacc">
<delete>
- <fileset dir="src/java/org/apache/lucene/queryParser" includes="*.java">
+ <fileset dir="core/src/java/org/apache/lucene/queryParser" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
<fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser" includes="*.java">
@@ -526,19 +526,19 @@
</delete>
</target>
- <target name="javacc" depends="javacc-check,clean-javacc,javacc-QueryParser,javacc-contrib-queryparser,javacc-contrib-demo"/>
+ <target name="javacc" depends="javacc-check,clean-javacc,javacc-QueryParser,javacc-contrib-queryparser,javacc-contrib-benchmark"/>
<target name="javacc-QueryParser" depends="javacc-check" if="javacc.present">
<sequential>
- <invoke-javacc target="src/java/org/apache/lucene/queryParser/QueryParser.jj"
- outputDir="src/java/org/apache/lucene/queryParser"/>
+ <invoke-javacc target="core/src/java/org/apache/lucene/queryParser/QueryParser.jj"
+ outputDir="core/src/java/org/apache/lucene/queryParser"/>
<!-- Change the inccorrect public ctors for QueryParser to be protected instead -->
- <replaceregexp file="src/java/org/apache/lucene/queryParser/QueryParser.java"
+ <replaceregexp file="core/src/java/org/apache/lucene/queryParser/QueryParser.java"
byline="true"
match="public QueryParser\(CharStream "
replace="protected QueryParser(CharStream "/>
- <replaceregexp file="src/java/org/apache/lucene/queryParser/QueryParser.java"
+ <replaceregexp file="core/src/java/org/apache/lucene/queryParser/QueryParser.java"
byline="true"
match="public QueryParser\(QueryParserTokenManager "
replace="protected QueryParser(QueryParserTokenManager "/>
@@ -553,6 +553,13 @@
/>
</target>
+ <target name="javacc-contrib-benchmark" depends="javacc-check" if="javacc.present">
+ <ant target="javacc"
+ dir="contrib/benchmark"
+ antfile="build.xml"
+ />
+ </target>
+
<target name="javacc-contrib-demo" depends="javacc-check" if="javacc.present">
<ant target="javacc"
dir="contrib/demo"
|
