[Cdk-commits] CVS: cdk build.xml,1.232,1.233 CHANGELOG,1.363,1.364

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

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

Modified Files:
	build.xml CHANGELOG 
Log Message:
Fixed building CDK with Ant 1.5.x

Index: build.xml
===================================================================
RCS file: /cvsroot/cdk/cdk/build.xml,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- build.xml	8 Dec 2004 16:08:33 -0000	1.232
+++ build.xml	13 Dec 2004 11:33:24 -0000	1.233
@@ -90,6 +90,7 @@
             <echo message="  Java ext dir: ${java.ext.dirs}" />
             <echo message="   Ant version: ${ant.version}" />
             <echo message="   ${ANT_HOME}: ${ant.home}" />
+            <echo message="      hasAnt16: ${hasAnt16}" />
             <echo message="" />
             <echo message="CDK Environment:" />
             <echo message="   CDK version: ${version}" />
@@ -185,6 +186,13 @@
                         <exclude name="jmol*.javafiles" />
                     </fileset>
                     <fileset dir="doc/javadoc" includes="MakeJavaFilesFilesDoclet.class" />
+                    <!-- remove java files generated with JavaCC -->
+                    <fileset dir="${src}/org/openscience/cdk/smiles/smarts" includes="*.java" />
+                    <fileset dir="${src}/org/openscience/cdk/iupac/parser" includes="*.java">
+                        <!-- the next are from CVS -->
+                        <exclude name="AttachedGroup.java" />
+                        <exclude name="MoleculeBuilder.java" />
+                    </fileset>
                 </delete>
 
                 <delete dir="${build}" />
@@ -382,6 +390,7 @@
                     <includesfile name="${src}/core.javafiles"/>
                     <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
                     <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
+                    <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
                 </javac>
         </target>
 
@@ -417,6 +426,7 @@
                     <includesfile name="${src}/io.javafiles"/>
                     <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
                     <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
+                    <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
                     <classpath refid="project.class.path" />
                     <classpath>
                         <fileset dir="${dist}/jar">
@@ -453,6 +463,7 @@
                     <includesfile name="${src}/qsar.javafiles"/>
                     <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
                     <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
+                    <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
                 </javac>
         </target>
 
@@ -465,11 +476,13 @@
                     <includesfile name="${src}/builder3d.javafiles"/>
                     <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
                     <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
+                    <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
                 </javac>
         </target>
 
         <!-- Convert the JavaCC .jj file to the correct .java files for the IUPAC parser -->
         <target id="javacc" name="javacc" depends="init, check" if="hasAnt16" unless="dotjjfiles.uptodate">
+          <echo message="Compiling Ant 1.6 depending classes." />
           <!-- the IUPAC name parser -->
           <delete>
               <fileset id="javacc-generated" 
@@ -495,6 +508,7 @@
                 <includesfile name="${src}/extra.javafiles"/>
                 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
                 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
+                <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
 
                 <classpath refid="project.class.path" />
                 <classpath>
@@ -517,6 +531,7 @@
                 <includesfile name="${src}/experimental.javafiles"/>
                 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
                 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
+                <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
                 <classpath refid="project.class.path" />
                 <classpath>
                     <fileset dir="${dist}/jar">
@@ -539,6 +554,7 @@
                 <includesfile name="${src}/test.javafiles"/>
                 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
                 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
+                <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
 
                 <classpath refid="project.class.path" />
                 <classpath>

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/cdk/cdk/CHANGELOG,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- CHANGELOG	6 Dec 2004 22:05:06 -0000	1.363
+++ CHANGELOG	13 Dec 2004 11:33:24 -0000	1.364
@@ -20,6 +20,7 @@
   not specific enough
 * Fixed output of molecule ID and title in Convert for CML2
 * Fixed definition of N.sp2 which has 2 (not 3) formal neighbours
+* Fixed building CDK with Ant 1.5.x
 
 API changes:
 * Moved SingleElectron to the core module