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