? X.diff
Index: apt/build.xml
===================================================================
RCS file: /cvs/cnd/apt/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- apt/build.xml	12 Jun 2007 17:26:54 -0000	1.5
+++ apt/build.xml	10 Jul 2007 08:18:05 -0000
@@ -41,14 +41,31 @@
     
     <target name="antlr" depends="init-antlr" unless="up-to-date">
         <mkdir dir="${antlr.apt.output.dir}"/>
+        <!--
         <antlr  target="${antlr.apt.grammar.dir}/aptlexer.g"
                 outputdirectory="${antlr.apt.output.dir}">
                 <classpath path="${antlr.jar}"/>
-        </antlr>  
+        </antlr>
+        -->
+        <java classname="antlr.Tool">
+            <arg value="-o"/>
+            <arg value="${antlr.apt.output.dir}"/>
+            <arg value="${antlr.apt.grammar.dir}/aptlexer.g"/>
+            <classpath path="${antlr.jar}"/>
+        </java>
+        <!--
         <antlr  target="${antlr.apt.grammar.dir}/aptexpr.g"
                 outputdirectory="${antlr.apt.output.dir}">
                 <classpath path="${antlr.jar}"/>
-        </antlr> 	
+        </antlr>
+        -->
+        <java classname="antlr.Tool">
+            <arg value="-o"/>
+            <arg value="${antlr.apt.output.dir}"/>
+            <arg value="${antlr.apt.grammar.dir}/aptexpr.g"/>
+            <classpath path="${antlr.jar}"/>
+        </java>
+        
         <copy file="${antlr.apt.output.dir}/APTGeneratedTokenTypes.txt" 
                 tofile="${antlr.apt.output.dir}/APTTokenTypes.txt"
                 overwrite="true"/>
Index: modelimpl/build.xml
===================================================================
RCS file: /cvs/cnd/modelimpl/build.xml,v
retrieving revision 1.9
diff -u -r1.9 build.xml
--- modelimpl/build.xml	12 Jun 2007 17:28:34 -0000	1.9
+++ modelimpl/build.xml	10 Jul 2007 08:18:12 -0000
@@ -86,10 +86,18 @@
                 <classpath path="${antlr.jar}"/>
         </antlr>      
 		-->
+        <!--
         <antlr target="${antlr.grammar.dir}/cppparser.g"
             outputdirectory="${antlr.output.dir}" traceParser="no">
                 <classpath path="${antlr.jar}"/>
-        </antlr>         
+        </antlr>
+        -->
+        <java classname="antlr.Tool">
+            <arg value="-o"/>
+            <arg value="${antlr.output.dir}"/>
+            <arg value="${antlr.grammar.dir}/cppparser.g"/>
+            <classpath path="${antlr.jar}"/>
+        </java>
     </target>
     
     <target name="do-test-build" depends="-build-cnd-tests,projectized-common.do-test-build">