[Cdk-commits] CVS: cdk build.xml,1.200,1.201

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15811

Modified Files:
	build.xml 
Log Message:
Forgot to upload the updated build.xml

Index: build.xml
===================================================================
RCS file: /cvsroot/cdk/cdk/build.xml,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- build.xml	24 Mar 2004 10:08:03 -0000	1.200
+++ build.xml	31 Mar 2004 08:44:19 -0000	1.201
@@ -110,10 +110,18 @@
               targetfile="${src}/core.javafiles">
               <srcfiles dir="${src}" includes="**/*.java" />
           </uptodate>
-          <uptodate property="dotjjfiles.uptodate" 
-              targetfile="${src}/org/openscience/cdk/iupac/parser/NomParser.java">
-              <srcfiles dir="${src}" includes="org/openscience/cdk/iupac/parser/NomParser.jj" />
-          </uptodate>
+          <condition property="dotjjfiles.uptodate">
+            <and>
+              <uptodate property="NomParserJavafiles.uptodate" 
+                  targetfile="${src}/org/openscience/cdk/iupac/parser/NomParser.java">
+                  <srcfiles dir="${src}" includes="org/openscience/cdk/iupac/parser/NomParser.jj" />
+              </uptodate>
+              <uptodate property="SMARTSParserJavafiles.uptodate" 
+                  targetfile="${src}/org/openscience/cdk/smiles/smarts/SMARTSParser.java">
+                  <srcfiles dir="${src}" includes="org/openscience/cdk/smiles/smarts/SMARTSParser.jj" />
+              </uptodate>
+            </and>
+          </condition>
         </target>
 
         <target id="init" name="init" depends="check, setupBuildDir"/>
@@ -343,6 +351,14 @@
           <javacc target="${src}/org/openscience/cdk/iupac/parser/NomParser.jj" 
             outputdirectory="${src}/org/openscience/cdk/iupac/parser/" 
             javacchome="${lib}"/>
+          <delete>
+              <fileset id="javacc-generated" 
+              dir="${src}/org/openscience/cdk/smiles/smarts/" 
+              includes="*.java"/>
+          </delete>
+          <javacc target="${src}/org/openscience/cdk/smiles/smarts/SMARTSParser.jj" 
+            outputdirectory="${src}/org/openscience/cdk/smiles/smarts/" 
+            javacchome="${lib}"/>
         </target>
 
         <target id="compile-extra" name="compile-extra" depends="dist-standard, dist-io, dist-render">