Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100755 876 lines (776 sloc) 43.997 kb
0ef4af6 Added cdk-experimental package
egonw authored
1 <project name="CDK" default="dist-default" basedir=".">
3d221c1 Added additional PDBReader tests.
yeldar authored
2
3a26de3 Made compilation with debug=on customizable.
egonw authored
3 <!-- compile options -->
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
4 <property name="build.sysclasspath" value="ignore" />
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
5 <property name="build.compiler" value="modern" />
3a26de3 Made compilation with debug=on customizable.
egonw authored
6 <property name="debug" value="on" />
460ea79 Detect deprecated methods
egonw authored
7 <property name="deprecation" value="on" />
3a26de3 Made compilation with debug=on customizable.
egonw authored
8 <property name="optimization" value="off" />
9
10 <!-- where to find Java3D -->
11 <property name="pathtojava3d" value="" />
12 <property name="pathtojoelib" value="../../JoeLib/joelib/" />
13
14 <!-- directories -->
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
15 <property name="build" value="build" />
16 <property name="sourcedist" value="sourcedist" />
17 <property name="dist" value="dist" />
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
18 <property name="doc" value="doc" />
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
19 <property name="src" value="src" />
20 <property name="lib" value="jar" />
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
21 <property name="src.tests" value="${src}/org/openscience/cdk/test" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
22 <property name="reports.tests" value="reports" />
943daec Location of Java3D classes is now settable. If Java3D is not installed i...
egonw authored
23
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar which ...
egonw authored
24 <!-- dirs for dist-core-debug task -->
25 <property name="build.src" value="${build}/${src}" />
26 <property name="build.core-debug.src" value="${build}/core-debug/${src}" />
27
28 <!-- class to run for testing-->
29 <property name="testclass" value="CDKTests" />
30 <property name="runclass" value="applications.Viewer" />
31 <property name="arg1" value="" />
32 <property name="arg2" value="" />
33 <property name="arg3" value="" />
34 <property name="arg4" value="" />
58425b9 Added use of properties to run target
steinbeck authored
35
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar which ...
egonw authored
36 <!-- CLASSPATH -->
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
37 <path id="project.class.path">
38 <pathelement
39 location="/usr/lib/j2sdk1.3/jre/lib/rt.jar" />
40
41 <pathelement location="." />
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
42 <fileset dir="${lib}">
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
43 <include name="batik-awt-util.jar" />
44 <include name="batik-dom.jar" />
9bcb948 Updated Xerces and Batik libraries to current versions
egonw authored
45 <include name="batik-svggen.jar" />
327694a Uploaded two required batik libs, and new version of castor
egonw authored
46 <include name="batik-util.jar" />
47 <include name="batik-xml.jar" />
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
48 <include name="baysmith-io.jar" />
49 <include name="dadml.jar" />
50 <include name="gnujaxp.jar" />
51 <include name="junit.jar" />
52 <include name="log4j-core.jar" />
53 <include name="log4j.jar" />
54 <include name="mysql-2.0.4.jar" />
55 <include name="postgresql7.0-1.2.jar" />
56 <include name="printf.jar" />
57 <include name="vecmath1.2-1.14.jar" />
9bcb948 Updated Xerces and Batik libraries to current versions
egonw authored
58 <include name="xerces-2.5.0.jar" />
8658001 Added libraries for XindiceReader
yz237 authored
59 <include name="xindice.jar" />
60 <include name="xmldb.jar" />
4ac3d10 Add patches to sourcedist
egonw authored
61 <include name="stmml.jar" />
327694a Uploaded two required batik libs, and new version of castor
egonw authored
62 <include name="castor-0.9.5-xml.jar" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
63 </fileset>
943daec Location of Java3D classes is now settable. If Java3D is not installed i...
egonw authored
64 <fileset dir="${pathtojava3d}">
65 <include name="*.jar" />
66 </fileset>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
67 </path>
68
cc7da6f Report on found 'requirements'
egonw authored
69 <target id="info" name="info" depends="check"
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
70 description="Gives information about the building process.">
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
71 <echo message="Environment:" />
72 <echo message=" Ant version: ${ant.version}" />
73 <echo message=" Java version: ${java.version}" />
cc7da6f Report on found 'requirements'
egonw authored
74 <echo message=" Jmol found: ${jmol.present}" />
75 <echo message=" JOELib found: ${joelib.present}" />
f3efa88 Add string resources for IUPAC name generator to jar
egonw authored
76 <echo message=" Java3D found: ${java3D.present}" />
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
77 <echo message="Compiling:" />
78 <echo message=" for: ${build.compiler}" />
79 <echo message=" debug: ${debug}" />
80 <echo message=" deprecation: ${deprecation}" />
81 <echo message=" optimization: ${optimization}" />
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
82 </target>
83
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
84 <target id="check" name="check"
85 description="Checks which parts of CDK can be build.">
c8a7380 Fixed class to look for in jmol.jar
egonw authored
86 <available classname="org.openscience.jmol.app.Jmol"
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
87 classpath="${lib}/libio/jmol.jar"
88 property="jmol.present"/>
bd7054c Don't try to build libio if lib jars are not available
egonw authored
89 <available classname="joelib.molecule.JOEAtom"
90 classpath="${lib}/libio/joelib.jar"
91 property="joelib.present"/>
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
92 <available classname="javax.media.j3d.Canvas3D"
93 classpathref="project.class.path"
94 property="java3D.present"/>
1dca8cc Optionalized IUPAC parser compilation depending on Ant 1.6 availability
egonw authored
95 <condition property="hasAnt16">
96 <contains string="${ant.version}" substring="1.6"/>
97 </condition>
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
98 <condition property="isJava13">
99 <contains string="${java.version}" substring="1.3"/>
100 </condition>
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
101 </target>
102
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
103 <target id="init" name="init" depends="check, setupBuildDir, patchForJava13"/>
104
105 <target id="setupBuildDir" name="setupBuildDir">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
106 <tstamp />
107 <mkdir dir="${build}" />
3a96397 Changed build procedure to allow for patches. Patches are applied
egonw authored
108 <mkdir dir="${build.src}" />
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar which ...
egonw authored
109 <mkdir dir="${build}/core-debug" />
110 <mkdir dir="${build.core-debug.src}" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
111 <mkdir dir="${sourcedist}" />
112 <mkdir dir="${dist}" />
113 <mkdir dir="${reports.tests}" />
3a96397 Changed build procedure to allow for patches. Patches are applied
egonw authored
114
115 <!-- make a copy of the source tree. Patches are
116 applied to this copy, not the original -->
117 <copy todir="${build.src}/org">
118 <fileset dir="${src}/org"/>
119 </copy>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
120 </target>
121
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
122 <target id="patchForJava13" name="patchForJava13" if="isJava13">
123 <echo message="Deleting files that require Java 1.4 or higher"/>
124 <delete>
125 <fileset dir="${build.src}" includesfile="${src}/java14.javafiles" />
126 </delete>
127
128 <echo message="Patching for Java 1.3"/>
129 <patch dir="${build.src}" strip="1"
130 patchfile="${src}/patches/org.openscience.cdk.controller.Controller2D.java.Java1.3"/>
131 <patch dir="${build.src}" strip="1"
132 patchfile="${src}/patches/org.openscience.cdk.io.ReaderFactory.java.Java1.3"/>
133 <patch dir="${build.src}" strip="1"
134 patchfile="${src}/patches/org.openscience.cdk.layout.StructureDiagramGenerator.java.Java1.3"/>
135 <patch dir="${build.src}" strip="1"
136 patchfile="${src}/patches/org.openscience.cdk.test.tools.ToolsTests.java.Java1.3"/>
137 <patch dir="${build.src}" strip="1"
138 patchfile="${src}/patches/org.openscience.cdk.test.CDKTests.java.Java1.3"/>
139 <patch dir="${build.src}" strip="1"
140 patchfile="${src}/patches/org.openscience.cdk.tools.LoggingTool.java.Java1.3"/>
141 </target>
142
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar which ...
egonw authored
143 <target id="init-core-debug" name="init-core-debug" depends="init">
144 <mkdir dir="${build}/core-debug" />
145 <mkdir dir="${build.core-debug.src}" />
146
147 <!-- even make a copy of the copy before the patches
148 are applied to make the core classes spit debug
149 info -->
150 <copy todir="${build.core-debug.src}">
151 <fileset dir="${build.src}" includesfile="${src}/core.javafiles" />
152 </copy>
153
154 <patch dir="${build.src}" strip="1"
155 patchfile="${src}/patches/org.openscience.cdk.applications.Viewer-NoJmol"/>
156 </target>
157
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
158 <target id="clean" name="clean" description="Removes autogenerated files.">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
159 <delete>
160 <fileset dir="." includes="**/*~" />
161 <fileset dir="." includes="*.tar.gz" />
162 <fileset dir="." includes="*.zip" />
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
163 <fileset dir="${src}" includes="*.classes" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
164 </delete>
165
166 <delete dir="${build}" />
167 <delete dir="${sourcedist}" />
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
168 <delete dir="${dist}" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
169 <delete dir="${reports.tests}" />
170 </target>
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
171
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
172 <target id="compile" name="compile" description="Compiles all parts of the CDK">
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
173 <antcall target="compile-all"/>
174 </target>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
175
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
176 <target name="compile-all"
177 depends="init, info, compile-core, compile-standard, compile-extra, compile-io,
a2e5e7d Added apps jar to dist-all
egonw authored
178 compile-render, compile-render-with-java3d, compile-libio,
179 compile-apps">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
180 </target>
8713d91 Finished work on basic JOELib <-> CDK convertor.
egonw authored
181
afc68e1 Applications can now be build without having Jmol or Java3D
egonw authored
182 <target name="compile-libio" depends="dist-standard, dont-compile-libio-joelib,
183 compile-libio-joelib" />
bd7054c Don't try to build libio if lib jars are not available
egonw authored
184
185 <target name="dont-compile-libio-joelib" unless="joelib.present">
186 <echo message="Not compiling libio for JOELib, jar/libio/joelib.jar is not present" />
187 </target>
188
189 <target name="compile-libio-joelib" if="joelib.present">
190 <!-- Task to build the libio classes for JOELib. -->
191 <echo message="Compiling libio for JOELib" />
7ce93c7 Added cdk.Atom <-> joelib.molecule.JOEAtom Convertor procedure.
egonw authored
192
bd7054c Don't try to build libio if lib jars are not available
egonw authored
193 <javac destdir="${build}" optimize="${optimization}"
194 debug="${debug}" deprecation="${deprecation}">
195 <src path="${build.src}/org/openscience/cdk/libio/joelib" />
196 <src path="${build.src}/org/openscience/cdk/test/libio/joelib" />
197
198 <classpath refid="project.class.path" />
199 <classpath>
200 <fileset dir="${lib}/libio">
201 <include name="*.jar" />
202 </fileset>
203 </classpath>
204 </javac>
205 </target>
7ce93c7 Added cdk.Atom <-> joelib.molecule.JOEAtom Convertor procedure.
egonw authored
206
afc68e1 Applications can now be build without having Jmol or Java3D
egonw authored
207 <target name="patch-viewer-for-no-jmol" unless="jmol.present">
208 <!-- remove Jmol compile dependency from Viewer.java -->
209 <patch dir="${build.src}" strip="1"
210 patchfile="${src}/patches/org.openscience.cdk.applications.Viewer-NoJmol"/>
bd7054c Don't try to build libio if lib jars are not available
egonw authored
211 </target>
212
4b8b4e6 Added shell variant of test.bat
egonw authored
213 <target id="compile-apps" name="compile-apps"
214 depends="dist-extra, dist-libio, dist-render,
afc68e1 Applications can now be build without having Jmol or Java3D
egonw authored
215 dist-render-with-java3d, patch-viewer-for-no-jmol">
38401bd Put applications in separate jar.
egonw authored
216 <!-- Task to build the applications classes. Some require extra
217 jars, like those in ${lib}/libio -->
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
218 <echo message="Compiling classes defined in ${src}/applications.javafiles." />
38401bd Put applications in separate jar.
egonw authored
219
3a26de3 Made compilation with debug=on customizable.
egonw authored
220 <javac srcdir="${build.src}" destdir="${build}" optimize="${optimization}"
221 debug="${debug}" deprecation="${deprecation}"
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
222 includesfile="${src}/applications.javafiles">
38401bd Put applications in separate jar.
egonw authored
223 <classpath refid="project.class.path" />
b60a5af Include jar/libio in classpath for compiling applications
egonw authored
224 <classpath>
225 <fileset dir="${lib}/libio">
226 <include name="*.jar" />
227 </fileset>
228 </classpath>
38401bd Put applications in separate jar.
egonw authored
229 </javac>
230 </target>
231
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
232 <target id="compile-core" name="compile-core" depends="init">
36b733d Adding cdk-standard module.
egonw authored
233 <echo message="Compiling classes for cdk-core module." />
20ba54a Simplifying the build proces.
egonw authored
234
3a26de3 Made compilation with debug=on customizable.
egonw authored
235 <javac srcdir="${build.src}" destdir="${build}" optimize="${optimization}"
236 debug="${debug}" deprecation="${deprecation}"
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
237 includesfile="${src}/core.javafiles">
20ba54a Simplifying the build proces.
egonw authored
238 <classpath refid="project.class.path" />
239 </javac>
9f4ce4f Added patch for RFC #20
egonw authored
240
241 <!-- apply RFC 20 -->
242 <patch dir="${build.src}" strip="1"
243 patchfile="${src}/patches/org.openscience.cdk.ChemObject.RFC20"/>
20ba54a Simplifying the build proces.
egonw authored
244 </target>
245
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar which ...
egonw authored
246 <target id="compile-core-debug" name="compile-core-debug" depends="init-core-debug">
247 <echo message="Compiling debug classes for cdk-core module." />
248
249 <javac srcdir="${build.core-debug.src}" destdir="${build}/core-debug" optimize="${optimization}"
250 debug="${debug}" deprecation="${deprecation}"
251 includesfile="${src}/core.javafiles">
252 <classpath refid="project.class.path" />
253 </javac>
254 </target>
255
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
256 <target id="compile-standard" name="compile-standard" depends="dist-core">
36b733d Adding cdk-standard module.
egonw authored
257 <echo message="Compiling classes for cdk-standard module." />
258
3a26de3 Made compilation with debug=on customizable.
egonw authored
259 <javac srcdir="${build.src}" destdir="${build}" optimize="${optimization}"
260 debug="${debug}" deprecation="${deprecation}"
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
261 includesfile="${src}/standard.javafiles">
36b733d Adding cdk-standard module.
egonw authored
262 <classpath>
263 <fileset dir="${lib}">
db10183 Moving general code out of ShelX reader.
egonw authored
264 <include name="vecmath1.2-1.14.jar" />
015e9b3 Fixed bug #649013.
egonw authored
265 <include name="log4j-core.jar" />
266 <include name="log4j.jar" />
4c55e18 Added missing jar files required for cdk-standard
egonw authored
267 <include name="gnujaxp.jar" />
9bcb948 Updated Xerces and Batik libraries to current versions
egonw authored
268 <include name="xerces-2.5.0.jar" />
36b733d Adding cdk-standard module.
egonw authored
269 </fileset>
270 <fileset dir="${dist}/jar">
271 <include name="cdk-core.jar" />
272 </fileset>
273 </classpath>
274 </javac>
275 </target>
276
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
277 <target id="compile-io" name="compile-io" depends="init, dist-core, dist-standard">
36b733d Adding cdk-standard module.
egonw authored
278 <echo message="Compiling classes for cdk-io module." />
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
279
3a26de3 Made compilation with debug=on customizable.
egonw authored
280 <javac srcdir="${build.src}" destdir="${build}" optimize="${optimization}"
281 debug="${debug}" deprecation="${deprecation}">
fbd2c58 Fixed problem in compiling io module.
egonw authored
282 <include name="org/openscience/cdk/io/**/*"/>
283 <include name="org/openscience/cdk/ChemFile.java"/>
284 <include name="org/openscience/cdk/exception/UnsupportedChemObjectException.java"/>
285
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
286 <classpath refid="project.class.path" />
287 <classpath>
288 <fileset dir="${dist}/jar">
289 <include name="cdk-core.jar" />
36b733d Adding cdk-standard module.
egonw authored
290 <include name="cdk-standard.jar" />
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
291 </fileset>
292 </classpath>
293 </javac>
294 </target>
295
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
296 <target id="compile-render" name="compile-render" depends="init, dist-core, dist-standard">
8095921 Added rendering of wedged bonds.
egonw authored
297 <echo message="Compiling classes for cdk-render module." />
298
3a26de3 Made compilation with debug=on customizable.
egonw authored
299 <javac srcdir="${build.src}" destdir="${build}" optimize="${optimization}"
300 debug="${debug}" deprecation="${deprecation}">
8095921 Added rendering of wedged bonds.
egonw authored
301 <include name="org/openscience/cdk/renderer/**/*"/>
302 <include name="org/openscience/cdk/controller/**/*"/>
5aa532f Add editor classes to compile and dist targets if appropriate
egonw authored
303 <include name="org/openscience/cdk/editor/**/*"/>
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
304 <excludesfile name="${src}/java3d.javafiles"/>
8095921 Added rendering of wedged bonds.
egonw authored
305
306 <classpath refid="project.class.path" />
307 <classpath>
308 <fileset dir="${dist}/jar">
309 <include name="cdk-core.jar" />
310 <include name="cdk-standard.jar" />
311 </fileset>
312 </classpath>
313 </javac>
314 </target>
1dd9647 Added IUPAC name parser
stomkinson authored
315
316 <!-- Convert the JavaCC .jj file to the correct .java files for the IUPAC parser -->
1dca8cc Optionalized IUPAC parser compilation depending on Ant 1.6 availability
egonw authored
317 <target name="javacc" depends="nojavacc, dojavacc"/>
318 <target name="dojavacc" depends="init" if="hasAnt16">
1dd9647 Added IUPAC name parser
stomkinson authored
319 <delete>
320 <fileset id="javacc-generated"
321 dir="${build.src}/org/openscience/cdk/iupac/parser/"
322 includes="NomParser*.java,ParseException.java,SimpleCharStream.java,Token.java,TokenMgrError.java"/>
323 </delete>
324 <javacc target="${src}/org/openscience/cdk/iupac/parser/NomParser.jj"
325 outputdirectory="${build.src}/org/openscience/cdk/iupac/parser/"
326 javacchome="${lib}"/>
327 </target>
1dca8cc Optionalized IUPAC parser compilation depending on Ant 1.6 availability
egonw authored
328 <target name="nojavacc" depends="init" unless="hasAnt16">
329 <echo message="No Ant 1.6. Not compiling IUPAC parser"/>
330 <delete>
331 <fileset id="javacc-generated"
332 dir="${build.src}/org/openscience/cdk/iupac/parser/"
333 includes="**/*"/>
334 <fileset id="javacc-test"
335 dir="${build.src}/org/openscience/cdk/test/iupac/"
336 includes="**/*"/>
337 </delete>
338 <patch dir="${build.src}" strip="1"
339 patchfile="${src}/patches/org.openscience.cdk.test.CDKTests.noAnt16"/>
340 </target>
8095921 Added rendering of wedged bonds.
egonw authored
341
1dd9647 Added IUPAC name parser
stomkinson authored
342 <target id="compile-extra" name="compile-extra" depends="dist-standard, javacc">
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
343 <javac srcdir="${build.src}" destdir="${build}" optimize="${optimization}"
e566bf2 Modified to make 'ant dist' run from a fresh CVS checkout.
egonw authored
344 debug="${debug}" deprecation="${deprecation}">
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
345 <classpath refid="project.class.path" />
346
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
347 <excludesfile name="${src}/java3d.javafiles" />
0ef4af6 Added cdk-experimental package
egonw authored
348 <excludesfile name="${src}/experimental.javafiles" />
aa49e00 Correctly exclude applications
egonw authored
349 <excludesfile name="${src}/applications.javafiles" />
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
350 <exclude name="org/openscience/cdk/libio/**/*.java" />
e566bf2 Modified to make 'ant dist' run from a fresh CVS checkout.
egonw authored
351 <exclude name="org/openscience/cdk/test/**/*.java" />
9f4ce4f Added patch for RFC #20
egonw authored
352 </javac>
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
353 </target>
f095e4e Fixed dist.extra target. Not all classes were added to the jar: it did
egonw authored
354
0ef4af6 Added cdk-experimental package
egonw authored
355 <target id="compile-experimental" name="compile-experimental" depends="compile-extra">
356 <echo message="Compiling classes for cdk-experimental module." />
357
358 <javac srcdir="${build.src}" destdir="${build}" optimize="${optimization}"
359 debug="${debug}" deprecation="${deprecation}"
360 includesfile="${src}/experimental.javafiles">
361 <classpath refid="project.class.path" />
362 </javac>
363 </target>
364
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
365 <target id="compile-test" name="compile-test" depends="compile">
5caa95f Introduced more targets and more consistent (??) ladder of dependence.
steinbeck authored
366 <!-- Task to build the test classes. -->
8d7368e Fixed some minor things.
egonw authored
367 <javac srcdir="${build.src}/org/openscience/cdk/test"
3a26de3 Made compilation with debug=on customizable.
egonw authored
368 destdir="${build}" optimize="${optimization}"
369 debug="${debug}" deprecation="${deprecation}">
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
370 <exclude name="renderer/Accel*.java" />
371 <exclude name="renderer/Orbitals*.java" />
372 <exclude name="libio/**/*.java" />
373 <exclude name="math/qm/VisualGaussiansCalculationTest.java" />
374 <exclude name="io/ZMatrixReaderTest.java" />
375
5caa95f Introduced more targets and more consistent (??) ladder of dependence.
steinbeck authored
376 <classpath refid="project.class.path" />
377 </javac>
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
378 </target>
379
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
380
381 <target name="compile-render-with-java3d"
382 depends="dont-compile-render-with-java3d, do-compile-render-with-java3d"/>
383
384 <target name="dont-compile-render-with-java3d" depends="compile-render"
385 unless="java3D.present">
386 <echo message="Cannot compile Java3D based viewer classes. Java3D is not present" />
afc68e1 Applications can now be build without having Jmol or Java3D
egonw authored
387
388 <!-- remove Java3D compile dependency from Viewer.java -->
389 <patch dir="${build.src}" strip="1"
390 patchfile="${src}/patches/org.openscience.cdk.applications.Viewer-NoJava3D"/>
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
391 </target>
392
393 <target name="do-compile-render-with-java3d" depends="compile-render"
394 if="java3D.present">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
395 <mkdir dir="${build}" />
396
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
397 <javac srcdir="${build.src}"
398 destdir="${build}" optimize="${optimization}"
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
399 debug="${debug}" deprecation="${deprecation}"
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
400 includesfile="${src}/java3d.javafiles">
aa6535c Don't compile java source files in ${sourcedist} with java3D too.
egonw authored
401
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
402 <classpath refid="project.class.path" />
403 </javac>
404 </target>
405
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
406 <target id="dist.init" name="dist.init">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
407 <mkdir dir="${dist}/jar" />
408
f3efa88 Add string resources for IUPAC name generator to jar
egonw authored
409 <!-- copy data files -->
410
411 <mkdir dir="${build}/org/openscience/cdk/config" />
412 <mkdir dir="${build}/org/openscience/cdk/io/cml/data" />
0ac9cc0 Include dictionaries in jar
egonw authored
413 <mkdir dir="${build}/org/openscience/cdk/dict/data" />
f3efa88 Add string resources for IUPAC name generator to jar
egonw authored
414 <mkdir dir="${build}/org/openscience/cdk/iupac/generator/data" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
415
416 <copy
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
417 file="${src}/org/openscience/cdk/config/isotopes.xml"
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
418 tofile="${build}/org/openscience/cdk/config/isotopes.xml" />
419 <copy
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
420 file="${src}/org/openscience/cdk/config/structgen_atomtypes.xml"
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
421 tofile="${build}/org/openscience/cdk/config/structgen_atomtypes.xml" />
c3ba50b Added Log4J configuration file.
egonw authored
422 <copy
d525829 Also copy jmol_atomtypes.txt into jars.
egonw authored
423 file="${src}/org/openscience/cdk/config/jmol_atomtypes.txt"
424 tofile="${build}/org/openscience/cdk/config/jmol_atomtypes.txt" />
425 <copy
4bf2cf9 Copy new atom type list
egonw authored
426 file="${src}/org/openscience/cdk/config/mol2_atomtypes.txt"
427 tofile="${build}/org/openscience/cdk/config/mol2_atomtypes.txt" />
428 <copy
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
429 file="${src}/org/openscience/cdk/config/log4j.properties"
c3ba50b Added Log4J configuration file.
egonw authored
430 tofile="${build}/org/openscience/cdk/config/log4j.properties" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
431
432 <copy
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
433 file="${src}/org/openscience/cdk/io/cml/data/cml1_0.dtd"
f8fea66 Put new CML DTDs in the distribution.
egonw authored
434 tofile="${build}/org/openscience/cdk/io/cml/data/cml1_0.dtd" />
435 <copy
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
436 file="${src}/org/openscience/cdk/io/cml/data/cml1_0_1.dtd"
f8fea66 Put new CML DTDs in the distribution.
egonw authored
437 tofile="${build}/org/openscience/cdk/io/cml/data/cml1_0_1.dtd" />
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
438
0ac9cc0 Include dictionaries in jar
egonw authored
439 <copy
f3efa88 Add string resources for IUPAC name generator to jar
egonw authored
440 file="${src}/org/openscience/cdk/iupac/generator/data/IUPACNames.properties"
441 tofile="${build}/org/openscience/cdk/iupac/generator/data/IUPACNames.properties" />
442
0ac9cc0 Include dictionaries in jar
egonw authored
443 <copy
444 file="${src}/org/openscience/cdk/dict/data/chemical.xml"
445 tofile="${build}/org/openscience/cdk/dict/data/chemical.xml" />
446 <copy
447 file="${src}/org/openscience/cdk/dict/data/elements.xml"
448 tofile="${build}/org/openscience/cdk/dict/data/elements.xml" />
449
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
450 <!-- generate lists of class files that should end up in
451 the jars for the modules -->
452 <copy file="${src}/core.javafiles" tofile="${src}/core.classes"/>
453 <replace file="${src}/core.classes" token=".java" value=".class"/>
454
455 <copy file="${src}/java3d.javafiles" tofile="${src}/java3d.classes"/>
456 <replace file="${src}/java3d.classes" token=".java" value=".class"/>
457
458 <copy file="${src}/standard.javafiles" tofile="${src}/standard.classes"/>
459 <replace file="${src}/standard.classes" token=".java" value=".class"/>
460
461 <copy file="${src}/applications.javafiles" tofile="${src}/applications.classes"/>
462 <replace file="${src}/applications.classes" token=".java" value=".class"/>
463
0ef4af6 Added cdk-experimental package
egonw authored
464 <copy file="${src}/experimental.javafiles" tofile="${src}/experimental.classes"/>
465 <replace file="${src}/experimental.classes" token=".java" value=".class"/>
466
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
467 </target>
d313d03 Also include cml.dtd in normal jar.
egonw authored
468
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
469 <target id="dist-core" name="dist-core" depends="compile-core, dist.init">
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
470 <jar jarfile="${dist}/jar/cdk-core.jar">
471 <fileset dir="${build}">
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
472 <includesfile name="${src}/core.classes" />
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
473 </fileset>
474 </jar>
475 </target>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
476
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar which ...
egonw authored
477 <target id="dist-core-debug" name="dist-core-debug" depends="compile-core-debug, dist.init">
478 <jar jarfile="${dist}/jar/cdk-core-debug.jar">
479 <fileset dir="${build}/core-debug">
480 <includesfile name="${src}/core.classes" />
481 </fileset>
482 </jar>
483 </target>
484
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
485 <target id="dist-extra" name="dist-extra" depends="dist-core, compile-extra">
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
486 <jar jarfile="${dist}/jar/cdk-extra.jar">
487 <fileset dir="${build}">
f095e4e Fixed dist.extra target. Not all classes were added to the jar: it did
egonw authored
488 <include name="org/openscience/cdk/**/**" />
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
489 <!-- Exclude core classes -->
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
490 <excludesfile name="${src}/core.classes" />
0ef4af6 Added cdk-experimental package
egonw authored
491 <!-- Exclude classes in cdk-io module -->
8095921 Added rendering of wedged bonds.
egonw authored
492 <exclude name="org/openscience/cdk/io/**" />
495e7da Removed classes in cdk-extra module that belong elsewhere
egonw authored
493 <exclude name="org/openscience/cdk/ChemFile.class" />
0ef4af6 Added cdk-experimental package
egonw authored
494 <!-- Exclude classes in cdk-render module -->
8095921 Added rendering of wedged bonds.
egonw authored
495 <exclude name="org/openscience/cdk/renderer/**" />
496 <exclude name="org/openscience/cdk/controller/**" />
5aa532f Add editor classes to compile and dist targets if appropriate
egonw authored
497 <exclude name="org/openscience/cdk/editor/**" />
495e7da Removed classes in cdk-extra module that belong elsewhere
egonw authored
498 <exclude name="org/openscience/cdk/event/**" />
8713d91 Finished work on basic JOELib <-> CDK convertor.
egonw authored
499 <!-- Exclude libio classes -->
500 <exclude name="org/openscience/cdk/libio/**" />
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
501 <exclude name="org/openscience/cdk/test/libio/**" />
38401bd Put applications in separate jar.
egonw authored
502 <!-- Exclude application classes -->
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
503 <excludesfile name="${src}/applications.classes" />
2c7c43d Fixed loading of files in JUnit IO tests: now using get resource.
egonw authored
504 <!-- Exclude test classes -->
505 <exclude name="org/openscience/cdk/test/**" />
0ef4af6 Added cdk-experimental package
egonw authored
506 <!-- Exclude classes in cdk-standard module -->
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
507 <excludesfile name="${src}/standard.classes" />
0ef4af6 Added cdk-experimental package
egonw authored
508 <!-- Exclude classes in cdk-experimental module -->
509 <excludesfile name="${src}/experimental.classes" />
510 </fileset>
511 </jar>
512 </target>
513
514 <target id="dist-experimental" name="dist-experimental" depends="compile-experimental, dist.init">
515 <jar jarfile="${dist}/jar/cdk-experimental.jar">
516 <fileset dir="${build}">
517 <includesfile name="${src}/experimental.classes" />
f3efa88 Add string resources for IUPAC name generator to jar
egonw authored
518 <include name="org/openscience/cdk/iupac/generator/data/**" />
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
519 </fileset>
520 </jar>
521 </target>
522
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
523 <target id="dist-apps" name="dist-apps" depends="compile-apps">
4ae9e15 Compile PublicJmol when doing compile-libio.
egonw authored
524 <jar jarfile="${dist}/jar/cdk-apps.jar" manifest="${src}/cdk-apps.manifest">
38401bd Put applications in separate jar.
egonw authored
525 <fileset dir="${build}">
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
526 <includesfile name="${src}/applications.classes" />
38401bd Put applications in separate jar.
egonw authored
527 </fileset>
528 </jar>
529 </target>
530
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
531 <target id="dist-test" name="dist-test" depends="dist-all, compile-test">
2c7c43d Fixed loading of files in JUnit IO tests: now using get resource.
egonw authored
532 <jar jarfile="${dist}/jar/cdk-test.jar">
533 <fileset dir="${build}">
534 <include name="org/openscience/cdk/test/**" />
535 </fileset>
536 <fileset dir=".">
537 <include name="data/**" />
538 </fileset>
539 </jar>
540 </target>
541
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
542 <target name="dist-libio" depends="compile-libio" unless="libio.present">
8713d91 Finished work on basic JOELib <-> CDK convertor.
egonw authored
543 <jar jarfile="${dist}/jar/cdk-libio.jar">
544 <fileset dir="${build}">
545 <include name="org/openscience/cdk/libio/**" />
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
546 <include name="org/openscience/cdk/test/libio/**" />
4ae9e15 Compile PublicJmol when doing compile-libio.
egonw authored
547 </fileset>
548 <fileset dir="${build}">
549 <include name="org/openscience/jmol/**" />
8713d91 Finished work on basic JOELib <-> CDK convertor.
egonw authored
550 </fileset>
551 </jar>
552 </target>
553
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
554 <target id="dist-io" name="dist-io" depends="compile-io">
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
555 <jar jarfile="${dist}/jar/cdk-io.jar">
556 <fileset dir="${build}">
557 <include name="org/openscience/cdk/io/**/*" />
6971b96 Added new CML IO test and Ant target for doing the tests for the classes...
egonw authored
558 <include name="org/openscience/cdk/ChemFile.class" />
2786e34 Moved the IChIReader into experimental too
egonw authored
559 <excludesfile name="${src}/experimental.classes" />
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
560 </fileset>
561 </jar>
562 </target>
563
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
564 <target id="dist-render" name="dist-render" depends="compile-render">
8095921 Added rendering of wedged bonds.
egonw authored
565 <jar jarfile="${dist}/jar/cdk-render.jar">
566 <fileset dir="${build}">
567 <include name="org/openscience/cdk/renderer/**/*" />
568 <include name="org/openscience/cdk/controller/**/*" />
5aa532f Add editor classes to compile and dist targets if appropriate
egonw authored
569 <include name="org/openscience/cdk/editor/**/*" />
495e7da Removed classes in cdk-extra module that belong elsewhere
egonw authored
570 <include name="org/openscience/cdk/event/**/*" />
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
571 <excludesfile name="${src}/java3d.classes" />
8095921 Added rendering of wedged bonds.
egonw authored
572 </fileset>
573 </jar>
574 </target>
575
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
576 <target name="dist-render-with-java3d" depends="compile-render-with-java3d"
577 if="java3D.present">
578 <jar jarfile="${dist}/jar/cdk-render.jar">
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
579 <fileset dir="${build}">
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
580 <include name="org/openscience/cdk/renderer/**/*" />
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
581 <include name="org/openscience/cdk/controller/**/*" />
90025c1 Added missing editor classes to cdk-render.jar when compiling with-java3...
egonw authored
582 <include name="org/openscience/cdk/editor/**/*" />
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
583 <include name="org/openscience/cdk/event/**/*" />
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
584 </fileset>
585 </jar>
586 </target>
587
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
588 <target id="dist-standard" name="dist-standard" depends="compile-standard, dist.init">
36b733d Adding cdk-standard module.
egonw authored
589 <jar jarfile="${dist}/jar/cdk-standard.jar">
590 <fileset dir="${build}">
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
591 <includesfile name="${src}/standard.classes" />
95c12c2 Added config files to cdk-standard module.
egonw authored
592 <include name="org/openscience/cdk/config/**" />
36b733d Adding cdk-standard module.
egonw authored
593 </fileset>
594 </jar>
595 </target>
596
0ef4af6 Added cdk-experimental package
egonw authored
597 <target name="dist-default" depends="dist-core, dist-standard,
598 dist-io, dist-render,
599 dist-extra, dist-libio,
600 dist-apps" />
601
8095921 Added rendering of wedged bonds.
egonw authored
602 <target name="dist-all" depends="dist-core, dist-standard,
90025c1 Added missing editor classes to cdk-render.jar when compiling with-java3...
egonw authored
603 dist-io, dist-render,
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
604 dist-extra, dist-libio,
a2e5e7d Added apps jar to dist-all
egonw authored
605 dist-render-with-java3d,
0ef4af6 Added cdk-experimental package
egonw authored
606 dist-experimental,
a2e5e7d Added apps jar to dist-all
egonw authored
607 dist-apps" />
08b1a6d New CDK release. And moved JavaDoc generation back to javadoc.xml.
egonw authored
608
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
609 <target id="dist" name="dist" depends="dist-all"
a2e5e7d Added apps jar to dist-all
egonw authored
610 description="Builds the jar files for all parts of the CDK."/>
ce6c169 Include config and data files in dist-with-java3d too.
egonw authored
611
4ac3d10 Add patches to sourcedist
egonw authored
612 <target id="sourcedist" name="sourcedist" depends="init">
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
613 <property name="package" value="cdk-source-${DSTAMP}"/>
614 <property name="sourcedist.dir" value="${sourcedist}/${package}"/>
615 <copy todir="${sourcedist.dir}/${src}">
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
616 <fileset dir="${src}" includes="*.javafiles" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
617 <fileset dir="${src}" includes="**/*java" />
618 <fileset dir="${src}" includes="org/openscience/cdk/io/cml/data/**" />
619 </copy>
620 <copy todir="${sourcedist.dir}">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
621 <fileset dir="." includes="build.xml" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
622 <fileset dir="." includes="javadoc.xml" />
623 <fileset dir="." includes="README" />
624 <fileset dir="." includes="CHANGELOG" />
625 </copy>
d6cda7b Distribute LGPL license with sourcecode
egonw authored
626 <copy todir="${sourcedist.dir}/jar">
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
627 <fileset dir="jar" />
628 </copy>
629 <copy todir="${sourcedist.dir}/data">
630 <fileset dir="data" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
631 </copy>
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
632 <copy todir="${sourcedist.dir}/${src}/org/openscience/cdk/config/">
5d39146 Fixed bug in build.xml.
egonw authored
633 <fileset dir="${src}/org/openscience/cdk/config/"
e1f7ebb Do not try to build classes that depend on classes that depend on Java3D
egonw authored
634 includes="*" />
635 </copy>
a289167 Minor tweak to get distribs working
egonw authored
636 <copy
637 file="${src}/org/openscience/cdk/iupac/generator/data/IUPACNames.properties"
638 tofile="${sourcedist.dir}/${src}/org/openscience/cdk/iupac/generator/data/IUPACNames.properties" />
639 <copy
640 file="${src}/org/openscience/cdk/dict/data/chemical.xml"
641 tofile="${sourcedist.dir}/${src}/org/openscience/cdk/dict/data/chemical.xml" />
642 <copy
643 file="${src}/org/openscience/cdk/dict/data/elements.xml"
644 tofile="${sourcedist.dir}/${src}/org/openscience/cdk/dict/data/elements.xml" />
4ac3d10 Add patches to sourcedist
egonw authored
645 <copy todir="${sourcedist.dir}/${src}/patches/">
646 <fileset dir="${src}/patches/" includes="*" />
647 </copy>
9496005 Added missing manifest
egonw authored
648 <copy todir="${sourcedist.dir}/${src}/">
649 <fileset dir="${src}/" includes="*.manifest" />
650 </copy>
d6cda7b Distribute LGPL license with sourcecode
egonw authored
651 <mkdir dir="${sourcedist.dir}/doc/" />
652 <copy todir="${sourcedist.dir}/doc/">
653 <fileset dir="doc/" includes="lgpl.license" />
654 </copy>
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
655 <tar tarfile="${package}.tar" basedir="${sourcedist}/" includes="${package}/**" />
656 <gzip zipfile="${package}.tar.gz" src="cdk-source-${DSTAMP}.tar" />
657 <delete file="${package}.tar" />
658 <zip zipfile="${package}.zip" basedir="${sourcedist}/" includes="${package}/**" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
659 </target>
660
81258bd Added Ant task for doing Junit tests on the cdk-core and cdk-standard mo...
egonw authored
661 <target name="test-core" depends="dist-core, dist-test">
662 <junit printsummary="yes" haltonfailure="yes">
663 <classpath refid="project.class.path" />
664 <classpath>
665 <fileset dir="${dist}/jar">
666 <include name="cdk-core.jar" />
667 <include name="cdk-test.jar" />
668 </fileset>
669 </classpath>
670
671 <test name="org.openscience.cdk.test.CoreClassesTests"
672 haltonfailure="no" todir="${reports.tests}"
673 outfile="result.core">
674 <formatter type="brief" />
675 </test>
676 </junit>
677 </target>
678
679 <target name="test-standard" depends="dist-core, dist-standard, dist-test">
680 <junit printsummary="yes" haltonfailure="yes">
681 <classpath refid="project.class.path" />
682 <classpath>
683 <fileset dir="${dist}/jar">
684 <include name="cdk-core.jar" />
685 <include name="cdk-standard.jar" />
686 <include name="cdk-test.jar" />
687 </fileset>
688 </classpath>
689
690 <test name="org.openscience.cdk.test.StandardClassesTests"
691 haltonfailure="no" todir="${reports.tests}"
692 outfile="result.standard">
693 <formatter type="brief" />
694 </test>
695 </junit>
696 </target>
697
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
698 <target name="test-io" depends="dist-core, dist-standard, dist-test, dist-io">
699 <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
6971b96 Added new CML IO test and Ant target for doing the tests for the classes...
egonw authored
700 <classpath refid="project.class.path" />
701 <classpath>
702 <fileset dir="${dist}/jar">
703 <include name="cdk-core.jar" />
704 <include name="cdk-standard.jar" />
705 <include name="cdk-io.jar" />
706 <include name="cdk-test.jar" />
707 </fileset>
708 </classpath>
709
262da08 Removed local, temporary change
egonw authored
710 <test name="org.openscience.cdk.test.io.IOTests"
6971b96 Added new CML IO test and Ant target for doing the tests for the classes...
egonw authored
711 haltonfailure="no" todir="${reports.tests}"
712 outfile="result.io">
713 <formatter type="brief" />
714 </test>
715 </junit>
716 </target>
01d6e3d Minor layout update.
egonw authored
717
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
718 <target id="test" name="test" depends="dist-all, dist-test" description="Performs a full JUnit test for the CDK">
9344d76 Fork testing, and removed reference to classpaths "." and "${java.class....
egonw authored
719 <junit printsummary="yes" haltonfailure="yes" fork="yes">
720 <classpath>
721 <pathelement location="${dist}/jar/cdk-core.jar" />
722 <pathelement location="${dist}/jar/cdk-standard.jar" />
723 <pathelement location="${dist}/jar/cdk-io.jar" />
724 <pathelement location="${dist}/jar/cdk-render.jar" />
725 <pathelement location="${dist}/jar/cdk-extra.jar" />
726 <pathelement location="${dist}/jar/cdk-apps.jar" />
727 <pathelement location="${dist}/jar/cdk-test.jar" />
728 <pathelement location="${dist}/jar/cdk-libio.jar" />
729 <pathelement location="${dist}/jar/cdk-experimental.jar" />
730 <fileset dir="${lib}">
731 <include name="*.jar" />
732 </fileset>
733 <fileset dir="${lib}/libio">
734 <include name="*.jar" />
735 </fileset>
736 </classpath>
ded0503 Oops. forgot to change back to CDKTests
egonw authored
737 <test name="org.openscience.cdk.test.CDKTests"
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
738 haltonfailure="no"
739 todir="${reports.tests}"
740 outfile="result">
81258bd Added Ant task for doing Junit tests on the cdk-core and cdk-standard mo...
egonw authored
741 <formatter type="brief" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
742 </test>
743 </junit>
744 </target>
745
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
746 <target name="test-libio" depends="dist-libio">
747 <java classname="org.openscience.cdk.test.libio.joelib.JOELibIOTest" fork="yes">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
748 <classpath>
7b0e32f Updated run-with-java3d task for some recent changes.
egonw authored
749 <pathelement location="${dist}/jar/cdk-core.jar" />
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
750 <pathelement location="${dist}/jar/cdk-extra.jar" />
751 <pathelement location="${dist}/jar/cdk-libio.jar" />
7b0e32f Updated run-with-java3d task for some recent changes.
egonw authored
752 <pathelement path="${java.class.path}" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
753 <pathelement location="." />
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
754 <fileset dir="${lib}">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
755 <include name="*.jar" />
756 </fileset>
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
757 <fileset dir="${lib}/libio">
7b0e32f Updated run-with-java3d task for some recent changes.
egonw authored
758 <include name="*.jar" />
759 </fileset>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
760 </classpath>
761 </java>
762 </target>
763
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
764 <target name="run-with-java3d"
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
765 depends="dist-extra, dist-io, dist-extra, dist-render-with-java3d">
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
766 <java
767 classname="org.openscience.cdk.test.OrbitalsRenderer3DTest"
768 fork="yes">
769 <arg value="data/reserpine.mol" />
770
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
771 <classpath>
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
772 <pathelement location="${dist}/jar/cdk-core.jar" />
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
773 <pathelement location="${dist}/jar/cdk-standard.jar" />
774 <pathelement location="${dist}/jar/cdk-extra.jar" />
775 <pathelement location="${dist}/jar/cdk-io.jar" />
776 <pathelement location="${dist}/jar/cdk-render.jar" />
777 <pathelement location="${dist}/jar/cdk-render-with-java3d.jar" />
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
778 <pathelement path="${java.class.path}" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
779 <pathelement location="." />
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
780 <fileset dir="${lib}">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
781 <include name="*.jar" />
782 </fileset>
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
783 <fileset dir="${pathto3djava}">
784 <include name="*.jar" />
785 </fileset>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
786 </classpath>
787 </java>
788 </target>
789
58425b9 Added use of properties to run target
steinbeck authored
790 <target id="run-test" name="run-test" depends="dist-core, dist-extra, dist-test, dist-standard"
791 description="Runs an application">
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
792 <java classname="org.openscience.cdk.test.${testclass}" fork="yes">
3d88ed4 Turn on CDK debugging while running JUnit test
egonw authored
793 <jvmarg value="-Dcdk.debugging=true"/>
756bd80 When running a specific test (e.g. 'ant -Dtestclass=ringsearch.RingSearc...
egonw authored
794 <classpath>
795 <pathelement location="${dist}/jar/cdk-core.jar" />
796 <pathelement location="${dist}/jar/cdk-standard.jar" />
797 <pathelement location="${dist}/jar/cdk-io.jar" />
798 <pathelement location="${dist}/jar/cdk-render.jar" />
799 <pathelement location="${dist}/jar/cdk-extra.jar" />
800 <pathelement location="${dist}/jar/cdk-apps.jar" />
801 <pathelement location="${dist}/jar/cdk-test.jar" />
802 <pathelement location="${dist}/jar/cdk-libio.jar" />
803 <fileset dir="${lib}">
804 <include name="*.jar" />
805 </fileset>
806 <fileset dir="${lib}/libio">
807 <include name="*.jar" />
808 </fileset>
809 </classpath>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
810 </java>
811 </target>
812
813 <target id="junit-test" name="junit-test" depends="dist-core, dist-extra, dist-test, dist-standard"
814 description="Runs one specific JUnit test set with -Dtestclass=&lt;class>">
815 <junit printsummary="yes" haltonfailure="no" fork="yes">
79f7451 Switch debugging on in run-test target
steinbeck authored
816 <jvmarg value="-Dcdk.debugging=true"/>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
817 <jvmarg value="-Dcdk.debug.stdout=true"/>
818 <classpath>
58425b9 Added use of properties to run target
steinbeck authored
819 <pathelement location="${dist}/jar/cdk-core.jar" />
820 <pathelement location="${dist}/jar/cdk-standard.jar" />
821 <pathelement location="${dist}/jar/cdk-io.jar" />
822 <pathelement location="${dist}/jar/cdk-render.jar" />
823 <pathelement location="${dist}/jar/cdk-extra.jar" />
824 <pathelement location="${dist}/jar/cdk-apps.jar" />
825 <pathelement location="${dist}/jar/cdk-test.jar" />
826 <pathelement location="${dist}/jar/cdk-libio.jar" />
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
827 <pathelement location="${dist}/jar/cdk-experimental.jar" />
58425b9 Added use of properties to run target
steinbeck authored
828 <pathelement path="${java.class.path}" />
829 <pathelement location="." />
830 <fileset dir="${lib}">
831 <include name="*.jar" />
832 </fileset>
833 <fileset dir="${lib}/libio">
834 <include name="*.jar" />
835 </fileset>
836 </classpath>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
837 <test name="org.openscience.cdk.test.${testclass}"
838 haltonfailure="no"
839 todir="${reports.tests}"
840 outfile="result.${testclass}">
841 <formatter type="brief" />
842 </test>
843 </junit>
58425b9 Added use of properties to run target
steinbeck authored
844 </target>
845
846
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
847 <target id="run" name="run" depends="dist-core, dist-extra, dist-test, dist-standard"
848 description="Runs an application">
58425b9 Added use of properties to run target
steinbeck authored
849 <java classname="org.openscience.cdk.${runclass}" fork="yes" >
850 <arg value="${arg1}" />
851 <arg value="${arg2}" />
852 <arg value="${arg3}" />
853 <arg value="${arg4}" />
ac448e9 Nothing happend here.
steinbeck authored
854 <classpath>
8095921 Added rendering of wedged bonds.
egonw authored
855 <pathelement location="${dist}/jar/cdk-core.jar" />
856 <pathelement location="${dist}/jar/cdk-standard.jar" />
857 <pathelement location="${dist}/jar/cdk-io.jar" />
858 <pathelement location="${dist}/jar/cdk-render.jar" />
859 <pathelement location="${dist}/jar/cdk-extra.jar" />
860 <pathelement location="${dist}/jar/cdk-apps.jar" />
861 <pathelement location="${dist}/jar/cdk-test.jar" />
862 <pathelement location="${dist}/jar/cdk-libio.jar" />
863 <pathelement path="${java.class.path}" />
864 <pathelement location="." />
865 <fileset dir="${lib}">
866 <include name="*.jar" />
867 </fileset>
868 <fileset dir="${lib}/libio">
869 <include name="*.jar" />
870 </fileset>
871 </classpath>
8713d91 Finished work on basic JOELib <-> CDK convertor.
egonw authored
872 </java>
873 </target>
874
c5eb7ec Added Ant build file.
egonw authored
875 </project>
Something went wrong with that request. Please try again.