minor cleanups from the demo move

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1022446 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2010-10-14 09:58:48 +00:00
parent 52c2ea47ab
commit 8ee25b0f07
1 changed files with 12 additions and 2 deletions

View File

@ -209,6 +209,7 @@
<packageset dir="contrib/benchmark/src/java"/>
<packageset dir="contrib/db/bdb-je/src/java"/>
<packageset dir="contrib/db/bdb/src/java"/>
<packageset dir="contrib/demo/src/java"/>
<packageset dir="contrib/highlighter/src/java"/>
<packageset dir="contrib/instantiated/src/java"/>
<packageset dir="contrib/lucli/src/java"/>
@ -299,7 +300,6 @@
<tarfileset prefix="lucene-${version}" dir=".">
<patternset refid="binary.root.dist.patterns"/>
</tarfileset>
<tarfileset dir="${build.dir}" includes="build-demo.xml" fullpath="lucene-${version}/build.xml"/>
<tarfileset prefix="lucene-${version}" dir="${build.dir}">
<patternset refid="binary.build.dist.patterns"/>
</tarfileset>
@ -463,10 +463,13 @@
<fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
<fileset dir="contrib/demo/src/java/org/apache/lucene/demo/html" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
</delete>
</target>
<target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-contrib-queryparser"/>
<target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-contrib-queryparser,javacc-contrib-demo"/>
<target name="javacc-QueryParser" depends="init,javacc-check" if="javacc.present">
<sequential>
@ -493,6 +496,13 @@
/>
</target>
<target name="javacc-contrib-demo" depends="init,javacc-check" if="javacc.present">
<ant target="javacc"
dir="contrib/demo"
antfile="build.xml"
/>
</target>
<macrodef name="createLevAutomaton">
<attribute name="n"/>
<sequential>