Remove files relating to JavaCUP.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@513 c6a108a4-781c-0410-a6c6-c2d559e19af0

README.txt

@@ -80,7 +80,6 @@ Dependencies
 olap4j requires the following libraries at run time:
 
 * lib/olap4j.jar (or lib/olap4j-jdk14.jar if you are running JDK 1.4)
-* lib/javacup.jar
 
 If you use the JDK 1.4 compatible jar, you will also need:
 

build.xml

@@ -30,16 +30,22 @@
 
  <property name="dist.doc.file" value="${dist.dir}/doc.tar.gz" />
 
- <property name="generated.java.files"
+ <!-- Files that used to be generated. We continue to remove them, just in
+ case someone is running on an old sandbox. -->
+ <property name="old.generated.java.files"
  value="
 ${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParser.java,
-${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParserSym.java,
+${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParserSym.java" />
+
+ <property name="generated.java.files"
+ value="
 ${src.dir}/org/olap4j/mdx/parser/impl/MdxParserImpl.java,
 ${src.dir}/org/olap4j/mdx/parser/impl/MdxParserImplTokenManager.java,
 ${src.dir}/org/olap4j/mdx/parser/impl/ParseException.java,
 ${src.dir}/org/olap4j/mdx/parser/impl/SimpleCharStream.java,
 ${src.dir}/org/olap4j/mdx/parser/impl/Token.java,
-${src.dir}/org/olap4j/mdx/parser/impl/TokenMgrError.java" />
+${src.dir}/org/olap4j/mdx/parser/impl/TokenMgrError.java,
+${src.dir}/org/olap4j/driver/xmla/XmlaOlap4jDriverVersion.java" />
 
  <target name="checkIsJdk15" if="jdk15.not.present">
  <fail message="The 'jar' target (and dependent targets 'release', 'binzip') must be run under JDK 1.5." />
@@ -84,6 +90,14 @@ ${src.dir}/org/olap4j/mdx/parser/impl/TokenMgrError.java" />
  <target name="hudson-notest" depends="clean-all,clean-tests,version-properties,jar,source.jar,tck-jar,xmla-jar,jar-jdk14"
  description="Sugar goal to build olap4j from hudson." />
 
+ <target name="clean" depends="subfloor.clean, clean-generated"/>
+
+ <target name="clean-generated">
+ <delete includeemptydirs="true" quiet="true">
+ <fileset dir="." includes="${generated.java.files},${old.generated.java.files},VERSION.txt"/>
+ </delete>
+ </target>
+
  <!-- Override to create a proper release. -->
  <target name="dist"
  depends="clean,version-properties,jar,tck-jar,xmla-jar,javadoc,javadoc-pdf,jar-jdk14,source.zip"
@@ -260,18 +274,9 @@ class XmlaOlap4jDriverVersion {
 // End XmlaOlap4jDriverVersion.java</echo>
  </target>
 
- <target name="define-tasks">
- <taskdef name="javacup" classname="java_cup.JavaCUPTask">
- <classpath refid="classpath"/>
- </taskdef>
- </target>
+ <target name="define-tasks"/>
 
  <target name="parser" depends="resolve,define-tasks">
- <!-- Old parser. -->
- <javacup srcdir="${src.dir}"
- input="${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup"
- expect="61" interface="true" />
- <!-- New parser. -->
  <javacc
  target="${src.dir}/org/olap4j/mdx/parser/impl/MdxParser.jj"
  javacchome="${lib.dir}"/>

checkFile.sh

@@ -135,8 +135,8 @@ doCheck() {
  fi
  ;;
 
- # Only validate .java and .cup files at present.
- *.java|*.cup|*.h|*.cpp)
+ # Only validate .java and .jj files at present.
+ *.java|*.jj|*.h|*.cpp)
  ;;
 
  *)

ivy-jdk14.xml

@@ -47,7 +47,7 @@
 
  <dependencies defaultconf="default->default">
 
- <dependency org="javacup" name="javacup" rev="10k"/>
+ <dependency org="net.java.dev.javacc" name="javacc" rev="5.0"/>
  <dependency org="asm" name="asm" rev="2.2.3"/>
  <dependency org="asm" name="asm-commons" rev="2.2.3"/>
  <dependency org="retroweaver" name="retroweaver" rev="1.2.4"/>

ivy.xml

@@ -49,9 +49,6 @@
 
  <dependencies defaultconf="default->default">
 
- <dependency org="javacup" name="javacup" rev="10k"
- conf="default->default"/>
-
  <dependency org="net.sf" name="pdfdoclet" rev="1.0.2"
  conf="codegen->default" />