completely revamped ant-based build

build.xml

@@ -2,20 +2,19 @@
   <property name="etc"       location="etc"       />
   <property name="bin"       location="bin"       />
   <property name="lib"       location="lib"       />
-  <property name="src"       location="src"       />
-  <property name="java"      location="java"      />
-  <property name="classes"   location="classes"   />
-  <property name="dist"      location="dist"      />
+  <property name="src"       location="src"      />
+  <property name="java"      location="src/java"      />
+  <property name="flex"      location="src/jflex"      />
+  <property name="cup"       location="src/cup"       />
+  <property name="classes"   location="target/classes"   />
+  <property name="dist"      location="target/dist"      />
   <!--property name="test"      location="test"      /-->
-  <property name="flex"      location="flex"      />
-  <property name="cup"       location="cup"       />
 
   <!-- initialize the workspace -->
   <target name="init">
     <tstamp />
     <available file="version.txt" property="version.present" />
     <touch unless:set="version.present" file="version.txt" />
-    <mkdir dir="${src}" />
     <mkdir dir="${java}" />
     <mkdir dir="${classes}" />
     <mkdir dir="${dist}" />
@@ -46,7 +45,6 @@
   <property environment="env" />
 
   <path id="libraries">
-     <pathelement location="${src}" />
      <fileset dir="${lib}">
 	<include name="**/*.jar" />
      </fileset>
@@ -59,7 +57,9 @@
   </path>
 
   <target name="clean">
-    <delete dir="${java}" />
+    <delete file="${java}/java_cup/parser.java" />
+    <delete file="${java}/java_cup/sym.java" />
+    <delete file="${java}/java_cup/Lexer.java" />
     <delete dir="${classes}" />
     <delete dir="${dist}" />
   </target>
@@ -76,7 +76,6 @@
   </target>
 
   <target name="compile" depends="jflex">
-    <copy todir="${java}"><fileset dir="${src}"></fileset></copy>
     <replace file="${java}/java_cup/version.java"
        token="+ version_str"
        value='+ "v0.11b ${cupversion} (GIT ${svnversion})"'>
@@ -105,13 +104,7 @@
 
  <target name="src-dist" depends="dist">
    <tar longfile="gnu"  destfile="${dist}/java-cup-src-11b-${cupversion}.tar.gz" compression="gzip">
-     <tarfileset dir="${src}" username="ant" group="ant" prefix="src/">
-       <include name="**"/>
-     </tarfileset>
-     <tarfileset dir="${cup}" username="ant" group="ant" prefix="cup/">
-       <include name="**"/>
-     </tarfileset>
-     <tarfileset dir="${flex}" username="ant" group="ant" prefix="flex/">
+     <tarfileset dir="${src}" username="ant" group="ant" prefix="src">
        <include name="**"/>
      </tarfileset>
      <tarfileset dir="${bin}" username="ant" group="ant" prefix="bin/">
@@ -127,13 +120,6 @@
    </tar>
   </target>
 
-  <target name="test" depends="dist">
-    <java jar="${dist}/java-cup-11b.jar" fork="true">
-        <arg value="-interface" />
-        <arg value="${cup}/parser.cup" />
-    </java>  
-  </target>
-
   <target name="versionbump" depends="init">
     <echo message="${DSTAMP}" file="version.txt" />
   </target>  
@@ -154,5 +140,4 @@
     <echo message="  scp            to deploy relase to homepage" />
     <echo message="  versionbump    to inc release" />
   </target>
-
 </project>

src/java_cup/version.java → src/java/java_cup/version.java

@@ -40,7 +40,7 @@ public class version {
   /*. . . . . . . . . . . . . . . . . . . . . . . . . . . . . .*/
 
   /** Full title of the system */
-  public static final String title_str = "CUP " + version_str;
+  public static final String title_str = "CUP " + "v0.11b 20160615 (GIT 3d0ae71)";
 
   /*. . . . . . . . . . . . . . . . . . . . . . . . . . . . . .*/