Conditionally compile DADML depending classes.

git-svn-id: https://cdk.svn.sourceforge.net/svnroot/cdk/trunk/cdk@5705 eb4e18e3-b210-0410-a6ab-dec725e4b171
cdk · Feb 11, 2006 · 5370376 · 5370376
1 parent ec3ced2
commit 5370376
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/build.xml b/build.xml
@@ -455,6 +455,7 @@
                     <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
                     <excludesfile name="${src}/r-project.javafiles" unless="rispresent"/>
                 	<excludesfile name="${src}/jai.javafiles" unless="jai.present"/>
+                	<excludesfile name="${src}/dadml.javafiles" unless="dadml.present"/>
 
                     <includesfile name="${src}/${module}.javafiles"/>
                 </fileset>
@@ -483,6 +484,8 @@
             	<excludesfile name="${src}/java1.5.javafiles" unless="isJava15"/>
                 <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
                 <excludesfile name="${src}/r-project.javafiles" unless="rispresent"/>
+            	<excludesfile name="${src}/jai.javafiles" unless="jai.present"/>
+            	<excludesfile name="${src}/dadml.javafiles" unless="dadml.present"/>
 
                 <includesfile name="${src}/${module}.javafiles"/>
             </javac>
@@ -495,6 +498,9 @@
                     <!-- excludesfile name="${src}/java1.4.classes" unless="isJava14"/ -->
                 	<excludesfile name="${src}/java1.5.classes" unless="isJava15"/>
                     <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
+                	<excludesfile name="${src}/r-project.javafiles" unless="rispresent"/>
+	                <excludesfile name="${src}/jai.javafiles" unless="jai.present"/>
+                	<excludesfile name="${src}/dadml.javafiles" unless="dadml.present"/>
                </fileset>
                <fileset dir="${src}">
                     <include name="${module}.javafiles" />

diff --git a/src/org/openscience/cdk/internet/DADMLReader.java b/src/org/openscience/cdk/internet/DADMLReader.java
@@ -66,12 +66,13 @@
  * application that makes it possible to define how databases can be accessed
  * via URLs.
  *
- * @author     Egon Willighagen <egonw@sci.kun.nl>
- * @cdk.created    2001-12-18
+ * @author           Egon Willighagen <egonw@sci.kun.nl>
+ * @cdk.created      2001-12-18
  *
- * @cdk.keyword    internet
- * @cdk.keyword    database
+ * @cdk.keyword      internet
+ * @cdk.keyword      database
  * @cdk.builddepends dadml.jar
+ * @cdk.require      dadml
  */
 public class DADMLReader {
 

diff --git a/src/org/openscience/cdk/internet/DADMLResult.java b/src/org/openscience/cdk/internet/DADMLResult.java
@@ -34,6 +34,7 @@
 
 /**
  * @cdk.builddepends dadml.jar
+ * @cdk.require      dadml
  */
 public class DADMLResult {
 

diff --git a/src/org/openscience/cdk/test/internet/DADMLTest.java b/src/org/openscience/cdk/test/internet/DADMLTest.java
@@ -31,7 +31,8 @@
 import org.openscience.cdk.tools.LoggingTool;
 
 /**
- * @cdk.module test
+ * @cdk.module  test
+ * @cdk.require dadml
  */
 public class DADMLTest {