Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100755 1102 lines (1002 sloc) 57.403 kB
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
1 <project name="CDK" default="dist" basedir=".">
3d221c1 Added additional PDBReader tests.
yeldar authored
2
0e9e5ef Added version info to JavaDoc html output, and share this with the bu…
egonw authored
3 <property file="build.props"/>
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -j…
egonw authored
4
3a26de3 Made compilation with debug=on customizable.
egonw authored
5 <!-- compile options -->
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
6 <property name="build.sysclasspath" value="ignore" />
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
7 <property name="build.compiler" value="modern" />
3a26de3 Made compilation with debug=on customizable.
egonw authored
8 <property name="debug" value="on" />
460ea79 Detect deprecated methods
egonw authored
9 <property name="deprecation" value="on" />
3a26de3 Made compilation with debug=on customizable.
egonw authored
10 <property name="optimization" value="off" />
11
2f3eee0 Adapted to provide for a customizable patch scheme
egonw authored
12 <!-- patches to apply -->
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" />
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -j…
egonw authored
27 <property name="appjars.dir" value="${dist}/appjars" />
f7be51f Removed alternative core classes patch offering more detailed debug info
egonw authored
28
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar whi…
egonw authored
29 <!-- class to run for testing-->
30 <property name="testclass" value="CDKTests" />
9bcd183 Fixed default executed application
egonw authored
31 <property name="runclass" value="applications.FileConvertor" />
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar whi…
egonw authored
32 <property name="arg1" value="" />
33 <property name="arg2" value="" />
34 <property name="arg3" value="" />
35 <property name="arg4" value="" />
58425b9 Added use of properties to run target
steinbeck authored
36
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar whi…
egonw authored
37 <!-- CLASSPATH -->
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
38 <path id="project.class.path">
0c049c7 Further work on new build system: all packages compile, but target te…
egonw authored
39 <pathelement location="${java.ext.dirs}/rt.jar" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
40
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
41 <fileset dir="${lib}">
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
42 <include name="batik-awt-util.jar" />
43 <include name="batik-dom.jar" />
9bcb948 Updated Xerces and Batik libraries to current versions
egonw authored
44 <include name="batik-svggen.jar" />
327694a Uploaded two required batik libs, and new version of castor
egonw authored
45 <include name="batik-util.jar" />
46 <include name="batik-xml.jar" />
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
47 <include name="baysmith-io.jar" />
48 <include name="dadml.jar" />
49 <include name="gnujaxp.jar" />
50 <include name="junit.jar" />
51 <include name="log4j-core.jar" />
52 <include name="log4j.jar" />
53 <include name="mysql-2.0.4.jar" />
54 <include name="postgresql7.0-1.2.jar" />
55 <include name="printf.jar" />
56 <include name="vecmath1.2-1.14.jar" />
21491b7 Updated for new Xerces lib
egonw authored
57 <include name="xerces-2.6.2.jar" />
58 <include name="xmlApis-2.6.2.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" />
482731a Extended classpath to include cml stuff
shk3 authored
63 <include name="cmlAll.jar" />
64 <include name="base.jar" />
65 <include name="pmrlib.jar" />
7f7ea85 Have the experimental JME reader actually compile
egonw authored
66 <include name="jmolApis.jar" />
67 <include name="jmolIO.jar" />
5569297 Updated FileConvertor: all options are now implemented, and the app n…
egonw authored
68 <include name="commons-cli-1.0.jar" />
85d8c8c Renderer2D font can now be set (closes JCP RFE #901009)
egonw authored
69 <include name="jfontchooser.jar" />
0223082 Updated for new jar for SSSRFinder code
egonw authored
70 <include name="jgrapht-0.5.3.jar" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
71 </fileset>
943daec Location of Java3D classes is now settable. If Java3D is not installe…
egonw authored
72 <fileset dir="${pathtojava3d}">
73 <include name="*.jar" />
74 </fileset>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
75 </path>
76
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
77 <target id="info" name="info" depends="check">
78 <!-- Gives information about the building process. -->
8f6d674 Fixed after breaking it earlier today
egonw authored
79 <echo message="Platform:" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info …
egonw authored
80 <echo message=" OS: ${os.name}" />
81 <echo message=" Architecture: ${os.arch}" />
82 <echo message=" Version: ${os.version}" />
83 <echo message="Mac OS/X found: ${isMacOsX}" />
8f6d674 Fixed after breaking it earlier today
egonw authored
84 <echo message="" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info …
egonw authored
85 <echo message="Java/Ant Environment:" />
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
86 <echo message=" Java version: ${java.version}" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info …
egonw authored
87 <echo message=" Java vendor: ${java.vendor}" />
88 <echo message=" Java dir: ${java.home}" />
6fa4411 Fail build process for test (etc) when JUnit is not installed in ANT_…
egonw authored
89 <echo message=" Java ext dir: ${java.ext.dirs}" />
d35e6b7 This will hopefully include the build.xml version in the info target …
egonw authored
90 <echo message=" Ant version: ${ant.version}" />
91 <echo message=" ${ANT_HOME}: ${ant.home}" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info …
egonw authored
92 <echo message="" />
93 <echo message="CDK Environment:" />
0e9e5ef Added version info to JavaDoc html output, and share this with the bu…
egonw authored
94 <echo message=" CDK version: ${version}" />
d35e6b7 This will hopefully include the build.xml version in the info target …
egonw authored
95 <echo message=" build.xml: $Id$" />
cc7da6f Report on found 'requirements'
egonw authored
96 <echo message=" JOELib found: ${joelib.present}" />
0bbc7aa Fixed compiling without CMLDOM libraries (for some reason it does not…
egonw authored
97 <echo message=" CMLDOM found: ${cmllibs.present}" />
f3efa88 Add string resources for IUPAC name generator to jar
egonw authored
98 <echo message=" Java3D found: ${java3D.present}" />
6fa4411 Fail build process for test (etc) when JUnit is not installed in ANT_…
egonw authored
99 <echo message=" Junit found: ${junit.present}" />
2f3eee0 Adapted to provide for a customizable patch scheme
egonw authored
100 <echo message="" />
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
101 <echo message="Compiling:" />
102 <echo message=" for: ${build.compiler}" />
103 <echo message=" debug: ${debug}" />
104 <echo message=" deprecation: ${deprecation}" />
105 <echo message=" optimization: ${optimization}" />
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
106 </target>
107
8f6d674 Fixed after breaking it earlier today
egonw authored
108 <target id="checkPlatforms" name="checkPlatforms">
58405cf Fixed build.xml to allow compile of doclets on MacOS/X (closes #1001497)
egonw authored
109 <condition property="isMacOsX">
110 <and>
111 <os family="mac"/>
112 <os family="unix"/>
113 </and>
114 </condition>
115 </target>
116
8f6d674 Fixed after breaking it earlier today
egonw authored
117 <target id="check" name="check" depends="checkPlatforms">
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
118 <!-- Checks which parts of CDK can be build. -->
bd7054c Don't try to build libio if lib jars are not available
egonw authored
119 <available classname="joelib.molecule.JOEAtom"
120 classpath="${lib}/libio/joelib.jar"
121 property="joelib.present"/>
cbfa2fa Fixed building of CMLDom libio
egonw authored
122 <available file="${lib}/cmlAll.jar"
0bbc7aa Fixed compiling without CMLDOM libraries (for some reason it does not…
egonw authored
123 property="cmllibs.present"/>
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
124 <available classname="javax.media.j3d.Canvas3D"
125 classpathref="project.class.path"
126 property="java3D.present"/>
6fa4411 Fail build process for test (etc) when JUnit is not installed in ANT_…
egonw authored
127 <available classname="junit.framework.TestCase"
128 classpath="${ant.home}/lib/junit.jar"
129 property="junit.present"/>
1dca8cc Optionalized IUPAC parser compilation depending on Ant 1.6 availability
egonw authored
130 <condition property="hasAnt16">
131 <contains string="${ant.version}" substring="1.6"/>
132 </condition>
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
133 <condition property="isJava13">
134 <contains string="${java.version}" substring="1.3"/>
135 </condition>
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
136 <condition property="isJava14">
137 <contains string="${java.version}" substring="1.4"/>
138 </condition>
139 <condition property="isJava14+">
140 <or>
141 <contains string="${java.version}" substring="1.4"/>
142 <contains string="${java.version}" substring="1.5"/>
143 </or>
144 </condition>
145 <condition property="isJava15">
146 <contains string="${java.version}" substring="1.5"/>
147 </condition>
8a8b889 Don't redo javacc if not necessary (closes #888925), and fixed uptoda…
egonw authored
148 <uptodate property="dotjavafiles.uptodate"
149 targetfile="${src}/core.javafiles">
1449de7 Added test to see if *.javafiles are up to date
egonw authored
150 <srcfiles dir="${src}" includes="**/*.java" />
151 </uptodate>
2fa9ba9 Forgot to upload the updated build.xml
egonw authored
152 <condition property="dotjjfiles.uptodate">
153 <and>
154 <uptodate property="NomParserJavafiles.uptodate"
155 targetfile="${src}/org/openscience/cdk/iupac/parser/NomParser.java">
156 <srcfiles dir="${src}" includes="org/openscience/cdk/iupac/parser/NomParser.jj" />
157 </uptodate>
158 <uptodate property="SMARTSParserJavafiles.uptodate"
159 targetfile="${src}/org/openscience/cdk/smiles/smarts/SMARTSParser.java">
160 <srcfiles dir="${src}" includes="org/openscience/cdk/smiles/smarts/SMARTSParser.jj" />
161 </uptodate>
162 </and>
163 </condition>
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
164 </target>
165
d2ed020 Reworked dependencies
egonw authored
166 <target id="init" name="init" depends="check, setupBuildDir"/>
2b69107 Ok, reworked build process that now also build restrictions can be gi…
egonw authored
167 <target id="customize" name="customize" depends="javacc"/>
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
168
169 <target id="setupBuildDir" name="setupBuildDir">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
170 <tstamp />
171 <mkdir dir="${build}" />
172 <mkdir dir="${sourcedist}" />
173 <mkdir dir="${dist}" />
174 <mkdir dir="${reports.tests}" />
175 </target>
176
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
177 <target id="clean" name="clean" description="Removes autogenerated files.">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
178 <delete>
24af772 Delete autogenerated .javafiles in clean target
egonw authored
179 <fileset dir="." includes="**/*~" />
180 <fileset dir="." includes="*.tar.gz" />
181 <fileset dir="." includes="*.zip" />
182 <fileset dir="${src}" includes="*.classes" />
df95df5 Don't delete the *.javafiles from CVS
egonw authored
183 <fileset dir="${src}" includes="*.javafiles">
184 <exclude name="jmol*.javafiles" />
185 </fileset>
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info …
egonw authored
186 <fileset dir="doc/javadoc" includes="MakeJavaFilesFilesDoclet.class" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
187 </delete>
188
189 <delete dir="${build}" />
190 <delete dir="${sourcedist}" />
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
191 <delete dir="${dist}" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
192 <delete dir="${reports.tests}" />
193 </target>
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
194
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info …
egonw authored
195 <target name="compileDoclet" id="compileDoclet" depends="check, compileDoclet.MacOSX, compileDoclet.Other" />
196
197 <target name="compileDoclet.MacOSX" id="compileDoclet.MacOSX" if="isMacOsX">
198 <javac srcdir="doc/javadoc/source" destdir="doc/javadoc"
199 includes="MakeJavaFilesFilesDoclet.java" />
200 </target>
201
202 <target name="compileDoclet.Other" id="compileDoclet.Other" unless="isMacOsX">
ca98ea5 Refactored build process (closes #883519)
egonw authored
203 <javac srcdir="doc/javadoc/source" destdir="doc/javadoc"
204 includes="MakeJavaFilesFilesDoclet.java">
205 <classpath>
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info …
egonw authored
206 <fileset dir="${java.ext.dirs}">
207 <include name="tools.jar" />
208 </fileset>
209 <fileset dir="${java.ext.dirs}/../../../lib">
210 <include name="tools.jar" />
5a62197 Fixed compileDoclet target
egonw authored
211 </fileset>
ca98ea5 Refactored build process (closes #883519)
egonw authored
212 </classpath>
213 </javac>
214 </target>
215
2583a62 Added better output about missing src/*.javafiles
egonw authored
216 <target name="runDoclet" id="runDoclet" depends="reallyRunDoclet, failIfNoDocletResults"/>
217
218 <target name="checkDocletResults">
219 <condition property="dotjavafiles.uptodate">
220 <and>
221 <available file="${src}/core.javafiles" />
222 <available file="${src}/standard.javafiles" />
223 <available file="${src}/extra.javafiles" />
224 <available file="${src}/io.javafiles" />
225 </and>
226 </condition>
227 </target>
228
229 <target name="failIfNoDocletResults" depends="checkDocletResults" unless="dotjavafiles.uptodate">
230 <fail>
231 There seems to be a problem with building the cdk/src/*.javafiles.
232 Please report this to cdk-devel@lists.sf.net and send the output of
233 this command: ant -v info runDoclet.
234 </fail>
235 </target>
236
237 <target name="reallyRunDoclet" depends="compileDoclet" unless="dotjavafiles.uptodate">
ca98ea5 Refactored build process (closes #883519)
egonw authored
238 <javadoc private="false" public="true">
239 <classpath refid="project.class.path" />
6dc1be4 Less complaining when running MakeJavaFilesFilesDoclet
egonw authored
240 <classpath>
241 <fileset dir="${lib}/libio">
242 <include name="*.jar" />
243 </fileset>
244 </classpath>
245
ca98ea5 Refactored build process (closes #883519)
egonw authored
246 <doclet name="MakeJavaFilesFilesDoclet" path="${doc}/javadoc"/>
24af772 Delete autogenerated .javafiles in clean target
egonw authored
247
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
248 <packageset dir="${src}">
ca98ea5 Refactored build process (closes #883519)
egonw authored
249 <include name="org/openscience/cdk/**"/>
250 </packageset>
6dc1be4 Less complaining when running MakeJavaFilesFilesDoclet
egonw authored
251
ca98ea5 Refactored build process (closes #883519)
egonw authored
252 </javadoc>
0bbfc90 Removed Viewer application. Use JChemPaint (jchempaint.sf.net) or Jmo…
egonw authored
253 <move todir="${src}" failonerror="true">
ca98ea5 Refactored build process (closes #883519)
egonw authored
254 <fileset dir=".">
255 <include name="*.javafiles"/>
0c049c7 Further work on new build system: all packages compile, but target te…
egonw authored
256 <include name="*.classes"/>
ca98ea5 Refactored build process (closes #883519)
egonw authored
257 </fileset>
258 </move>
259 </target>
260
1449de7 Added test to see if *.javafiles are up to date
egonw authored
261 <target name="compile.init" id="compile.init"
262 depends="init, customize, compileDoclet, runDoclet"/>
263
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
264 <target id="compile" name="compile"
265 description="Compiles the CDK."
d2ed020 Reworked dependencies
egonw authored
266 depends="compile-core, compile-standard, compile-extra, compile-io,
6dc5408 Added stuff for qsar module
egonw authored
267 compile-render, compile-render-with-java3d, compile-libio,
268 compile-qsar">
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
269 </target>
270
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
271 <target id="compile-all" name="compile-all" depends="compile, compile-experimental, compile-apps"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
272 description="Compiles the CDK, including experimental classes.">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
273 </target>
8713d91 Finished work on basic JOELib <-> CDK convertor.
egonw authored
274
0bbc7aa Fixed compiling without CMLDOM libraries (for some reason it does not…
egonw authored
275 <target id="compile-libio" name="compile-libio" depends="dist-standard,
276 compile-libio-joelib, compile-libio-cml" />
bd7054c Don't try to build libio if lib jars are not available
egonw authored
277
278 <target name="dont-compile-libio-joelib" unless="joelib.present">
279 <echo message="Not compiling libio for JOELib, jar/libio/joelib.jar is not present" />
280 </target>
281
0bbc7aa Fixed compiling without CMLDOM libraries (for some reason it does not…
egonw authored
282 <target name="dont-compile-libio-cml" unless="cmllibs.present">
283 <echo message="Not compiling libio for CMLDOM, jar/cmlAll.jar is not present" />
284 </target>
285
286 <target name="compile-libio-joelib" if="joelib.present" depends="dont-compile-libio-joelib">
bd7054c Don't try to build libio if lib jars are not available
egonw authored
287 <!-- Task to build the libio classes for JOELib. -->
288 <echo message="Compiling libio for JOELib" />
7ce93c7 Added cdk.Atom <-> joelib.molecule.JOEAtom Convertor procedure.
egonw authored
289
bd7054c Don't try to build libio if lib jars are not available
egonw authored
290 <javac destdir="${build}" optimize="${optimization}"
291 debug="${debug}" deprecation="${deprecation}">
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
292 <src path="${src}/org/openscience/cdk/libio/joelib" />
293 <src path="${src}/org/openscience/cdk/test/libio/joelib" />
bd7054c Don't try to build libio if lib jars are not available
egonw authored
294
295 <classpath refid="project.class.path" />
296 <classpath>
297 <fileset dir="${lib}/libio">
6dc1be4 Less complaining when running MakeJavaFilesFilesDoclet
egonw authored
298 <include name="joelib.jar" />
bd7054c Don't try to build libio if lib jars are not available
egonw authored
299 </fileset>
300 </classpath>
301 </javac>
302 </target>
7ce93c7 Added cdk.Atom <-> joelib.molecule.JOEAtom Convertor procedure.
egonw authored
303
0bbc7aa Fixed compiling without CMLDOM libraries (for some reason it does not…
egonw authored
304 <target name="compile-libio-cml" if="cmllibs.present" depends="dont-compile-libio-cml">
305 <!-- Task to build the libio classes for CMLDOM. -->
306 <echo message="Compiling libio for CMLDOM" />
307
308 <javac destdir="${build}" optimize="${optimization}"
309 debug="${debug}" deprecation="${deprecation}">
310 <src path="${src}/org/openscience/cdk/libio/cml" />
311
312 <classpath refid="project.class.path" />
313 <classpath>
314 <fileset dir="${lib}">
315 <include name="base.jar" />
316 <include name="cmlAll.jar" />
317 <include name="pmrlib.jar" />
318 </fileset>
319 </classpath>
320 </javac>
321 </target>
322
4b8b4e6 Added shell variant of test.bat
egonw authored
323 <target id="compile-apps" name="compile-apps"
0bbfc90 Removed Viewer application. Use JChemPaint (jchempaint.sf.net) or Jmo…
egonw authored
324 depends="dist-libio, dist-experimental, dist-render-with-java3d">
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
325 <!-- Task to build the applications classes. Some require extra
326 jars, like those in ${lib}/libio -->
327 <echo message="Compiling classes defined in ${src}/applications.javafiles." />
38401bd Put applications in separate jar.
egonw authored
328
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
329 <javac srcdir="${src}" destdir="${build}" optimize="${optimization}"
2b69107 Ok, reworked build process that now also build restrictions can be gi…
egonw authored
330 debug="${debug}" deprecation="${deprecation}">
331 <includesfile name="${src}/applications.javafiles"/>
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
332 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
333 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
9247f2e Don't compile the SMARTS parser and the SubstructureSearcher
egonw authored
334 <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
335 <classpath refid="project.class.path" />
336 <classpath>
337 <fileset dir="${dist}/jar">
338 <include name="cdk-core.jar" />
339 <include name="cdk-standard.jar" />
340 <include name="cdk-render.jar" />
341 <include name="cdk-io.jar" />
342 <include name="cdk-extra.jar" />
343 <include name="cdk-libio.jar" />
344 <include name="cdk-experimental.jar" />
345 </fileset>
346 </classpath>
347 <classpath>
348 <fileset dir="${lib}/libio">
349 <include name="*.jar" />
350 </fileset>
351 </classpath>
352 </javac>
38401bd Put applications in separate jar.
egonw authored
353 </target>
354
d2ed020 Reworked dependencies
egonw authored
355 <target id="compile-core" name="compile-core" depends="compile.init">
36b733d Adding cdk-standard module.
egonw authored
356 <echo message="Compiling classes for cdk-core module." />
20ba54a Simplifying the build proces.
egonw authored
357
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
358 <javac srcdir="${src}" destdir="${build}" optimize="${optimization}"
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
359 debug="${debug}" deprecation="${deprecation}">
20ba54a Simplifying the build proces.
egonw authored
360 <classpath refid="project.class.path" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
361 <includesfile name="${src}/core.javafiles"/>
362 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
363 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
20ba54a Simplifying the build proces.
egonw authored
364 </javac>
365 </target>
366
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
367 <target id="compile-standard" name="compile-standard" depends="dist-core">
36b733d Adding cdk-standard module.
egonw authored
368 <echo message="Compiling classes for cdk-standard module." />
369
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
370 <javac srcdir="${src}" destdir="${build}" optimize="${optimization}"
2b69107 Ok, reworked build process that now also build restrictions can be gi…
egonw authored
371 debug="${debug}" deprecation="${deprecation}">
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
372 <includesfile name="${src}/standard.javafiles"/>
373 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
374 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
36b733d Adding cdk-standard module.
egonw authored
375 <classpath>
376 <fileset dir="${lib}">
db10183 Moving general code out of ShelX reader.
egonw authored
377 <include name="vecmath1.2-1.14.jar" />
015e9b3 Fixed bug #649013.
egonw authored
378 <include name="log4j-core.jar" />
379 <include name="log4j.jar" />
4c55e18 Added missing jar files required for cdk-standard
egonw authored
380 <include name="gnujaxp.jar" />
9bcb948 Updated Xerces and Batik libraries to current versions
egonw authored
381 <include name="xerces-2.5.0.jar" />
0223082 Updated for new jar for SSSRFinder code
egonw authored
382 <include name="jgrapht-0.5.3.jar" />
36b733d Adding cdk-standard module.
egonw authored
383 </fileset>
384 <fileset dir="${dist}/jar">
385 <include name="cdk-core.jar" />
386 </fileset>
387 </classpath>
388 </javac>
389 </target>
390
a34eb22 More @cdkPackage completed: cdk-io now also compiles with kaffe
egonw authored
391 <target id="compile-io" name="compile-io" depends="init, dist-core, dist-standard">
36b733d Adding cdk-standard module.
egonw authored
392 <echo message="Compiling classes for cdk-io module." />
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
393
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
394 <javac srcdir="${src}" destdir="${build}" optimize="${optimization}"
2b69107 Ok, reworked build process that now also build restrictions can be gi…
egonw authored
395 debug="${debug}" deprecation="${deprecation}">
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
396 <includesfile name="${src}/io.javafiles"/>
397 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
398 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
399 <classpath refid="project.class.path" />
400 <classpath>
401 <fileset dir="${dist}/jar">
402 <include name="cdk-core.jar" />
36b733d Adding cdk-standard module.
egonw authored
403 <include name="cdk-standard.jar" />
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
404 </fileset>
405 </classpath>
406 </javac>
407 </target>
408
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
409 <target id="compile-render" name="compile-render" depends="init, dist-core, dist-standard">
8095921 Added rendering of wedged bonds.
egonw authored
410 <echo message="Compiling classes for cdk-render module." />
411
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
412 <javac srcdir="${src}" destdir="${build}" optimize="${optimization}"
94396d9 More @cdkPackage completed: cdk-render now also compiles with kaffe
egonw authored
413 debug="${debug}" deprecation="${deprecation}"
414 includesfile="${src}/render.javafiles">
8095921 Added rendering of wedged bonds.
egonw authored
415
416 <classpath refid="project.class.path" />
417 <classpath>
418 <fileset dir="${dist}/jar">
419 <include name="cdk-core.jar" />
420 <include name="cdk-standard.jar" />
421 </fileset>
422 </classpath>
423 </javac>
424 </target>
1dd9647 Added IUPAC name parser
stomkinson authored
425
6dc5408 Added stuff for qsar module
egonw authored
426 <target id="compile-qsar" name="compile-qsar" depends="compile.init">
427 <echo message="Compiling classes for cdk-qsar module." />
428
429 <javac srcdir="${src}" destdir="${build}" optimize="${optimization}"
430 debug="${debug}" deprecation="${deprecation}">
431 <classpath refid="project.class.path" />
432 <includesfile name="${src}/qsar.javafiles"/>
433 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
434 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
435 </javac>
436 </target>
437
438 <!-- Convert the JavaCC .jj file to the correct .java files for the IUPAC parser -->
62f2673 Don't delete everything in cdk.iupac.parser
egonw authored
439 <target id="javacc" name="javacc" depends="init, check" if="hasAnt16" unless="dotjjfiles.uptodate">
cd49d3a A bit of comment
egonw authored
440 <!-- the IUPAC name parser -->
1dd9647 Added IUPAC name parser
stomkinson authored
441 <delete>
442 <fileset id="javacc-generated"
cd49d3a A bit of comment
egonw authored
443 dir="${src}/org/openscience/cdk/iupac/parser/"
444 includes="NomParser*.java,ParseException.java,SimpleCharStream.java,Token.java,TokenMgrError.java"/>
1dd9647 Added IUPAC name parser
stomkinson authored
445 </delete>
446 <javacc target="${src}/org/openscience/cdk/iupac/parser/NomParser.jj"
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
447 outputdirectory="${src}/org/openscience/cdk/iupac/parser/"
1dd9647 Added IUPAC name parser
stomkinson authored
448 javacchome="${lib}"/>
2fa9ba9 Forgot to upload the updated build.xml
egonw authored
449 <delete>
450 <fileset id="javacc-generated"
451 dir="${src}/org/openscience/cdk/smiles/smarts/"
452 includes="*.java"/>
453 </delete>
454 <javacc target="${src}/org/openscience/cdk/smiles/smarts/SMARTSParser.jj"
455 outputdirectory="${src}/org/openscience/cdk/smiles/smarts/"
456 javacchome="${lib}"/>
1dd9647 Added IUPAC name parser
stomkinson authored
457 </target>
8095921 Added rendering of wedged bonds.
egonw authored
458
d2ed020 Reworked dependencies
egonw authored
459 <target id="compile-extra" name="compile-extra" depends="dist-standard, dist-io, dist-render">
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
460 <javac srcdir="${src}" destdir="${build}" optimize="${optimization}"
2b69107 Ok, reworked build process that now also build restrictions can be gi…
egonw authored
461 debug="${debug}" deprecation="${deprecation}">
462 <includesfile name="${src}/extra.javafiles"/>
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
463 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
464 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
72d1834 Explicitily state which cdk jars to use for compile-extra
egonw authored
465
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
466 <classpath refid="project.class.path" />
72d1834 Explicitily state which cdk jars to use for compile-extra
egonw authored
467 <classpath>
468 <fileset dir="${dist}/jar">
469 <include name="cdk-core.jar" />
470 <include name="cdk-standard.jar" />
0386767 More @cdkPackage completed for test classes
egonw authored
471 <include name="cdk-render.jar" />
472 <include name="cdk-io.jar" />
72d1834 Explicitily state which cdk jars to use for compile-extra
egonw authored
473 </fileset>
474 </classpath>
9f4ce4f Added patch for RFC #20
egonw authored
475 </javac>
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
476 </target>
f095e4e Fixed dist.extra target. Not all classes were added to the jar: it did
egonw authored
477
0386767 More @cdkPackage completed for test classes
egonw authored
478 <target id="compile-experimental" name="compile-experimental"
479 depends="dist-extra">
480 <echo message="Compiling classes for cdk-experimental module." />
0ef4af6 Added cdk-experimental package
egonw authored
481
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
482 <javac srcdir="${src}" destdir="${build}" optimize="${optimization}"
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
483 debug="${debug}" deprecation="${deprecation}">
484 <includesfile name="${src}/experimental.javafiles"/>
485 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
486 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
0386767 More @cdkPackage completed for test classes
egonw authored
487 <classpath refid="project.class.path" />
488 <classpath>
489 <fileset dir="${dist}/jar">
490 <include name="cdk-core.jar" />
491 <include name="cdk-standard.jar" />
492 <include name="cdk-render.jar" />
493 <include name="cdk-io.jar" />
494 <include name="cdk-extra.jar" />
495 </fileset>
496 </classpath>
497 </javac>
0ef4af6 Added cdk-experimental package
egonw authored
498 </target>
499
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
500 <target id="compile-test" name="compile-test"
501 depends="dist-all">
0386767 More @cdkPackage completed for test classes
egonw authored
502 <!-- Task to build the test classes. -->
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
503 <javac srcdir="${src}"
0386767 More @cdkPackage completed for test classes
egonw authored
504 destdir="${build}" optimize="${optimization}"
2b69107 Ok, reworked build process that now also build restrictions can be gi…
egonw authored
505 debug="${debug}" deprecation="${deprecation}">
506 <includesfile name="${src}/test.javafiles"/>
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
507 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
508 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
509
0386767 More @cdkPackage completed for test classes
egonw authored
510 <classpath refid="project.class.path" />
511 <classpath>
512 <fileset dir="${dist}/jar">
513 <include name="cdk-core.jar" />
514 <include name="cdk-standard.jar" />
515 <include name="cdk-render.jar" />
516 <include name="cdk-io.jar" />
517 <include name="cdk-extra.jar" />
518 <include name="cdk-libio.jar" />
519 <include name="cdk-experimental.jar" />
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
520 <include name="cdk-apps.jar" />
0386767 More @cdkPackage completed for test classes
egonw authored
521 </fileset>
522 </classpath>
523 </javac>
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
524 </target>
525
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
526
527 <target name="compile-render-with-java3d"
528 depends="dont-compile-render-with-java3d, do-compile-render-with-java3d"/>
529
530 <target name="dont-compile-render-with-java3d" depends="compile-render"
531 unless="java3D.present">
532 <echo message="Cannot compile Java3D based viewer classes. Java3D is not present" />
533 </target>
534
535 <target name="do-compile-render-with-java3d" depends="compile-render"
536 if="java3D.present">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
537 <mkdir dir="${build}" />
538
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
539 <javac srcdir="${src}"
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
540 destdir="${build}" optimize="${optimization}"
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
541 debug="${debug}" deprecation="${deprecation}"
26336c0 Fixed build.xml for proper reference to java3d.javafiles (thanks to G…
egonw authored
542 includesfile="${src}/java3d.javafiles">
aa6535c Don't compile java source files in ${sourcedist} with java3D too.
egonw authored
543
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
544 <classpath refid="project.class.path" />
545 </javac>
546 </target>
547
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
548 <target id="dist.init" name="dist.init">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
549 <mkdir dir="${dist}/jar" />
550
f3efa88 Add string resources for IUPAC name generator to jar
egonw authored
551 <!-- copy data files -->
552
51eff2f Updated for new config data dir
egonw authored
553 <mkdir dir="${build}/org/openscience/cdk/config/data" />
f3efa88 Add string resources for IUPAC name generator to jar
egonw authored
554 <mkdir dir="${build}/org/openscience/cdk/io/cml/data" />
0ac9cc0 Include dictionaries in jar
egonw authored
555 <mkdir dir="${build}/org/openscience/cdk/dict/data" />
f3efa88 Add string resources for IUPAC name generator to jar
egonw authored
556 <mkdir dir="${build}/org/openscience/cdk/iupac/generator/data" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
557
558 <copy
db6accc Cleaned up a bit and just copy all dicts and atom type lists
egonw authored
559 file="${src}/org/openscience/cdk/config/data/isotopes.xml"
560 tofile="${build}/org/openscience/cdk/config/data/isotopes.xml" />
561 <copy todir="${build}/org/openscience/cdk/config/data/">
562 <fileset dir="${src}/org/openscience/cdk/config/data/" includes="*_atomtypes.xml"/>
563 <fileset dir="${src}/org/openscience/cdk/config/data/" includes="jmol_atomtypes.txt"/>
564 </copy>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
565 <copy
db6accc Cleaned up a bit and just copy all dicts and atom type lists
egonw authored
566 file="${src}/org/openscience/cdk/config/data/log4j.properties"
567 tofile="${build}/org/openscience/cdk/config/data/log4j.properties" />
c3ba50b Added Log4J configuration file.
egonw authored
568 <copy
db6accc Cleaned up a bit and just copy all dicts and atom type lists
egonw authored
569 file="${src}/org/openscience/cdk/io/cml/data/cml1_0.dtd"
570 tofile="${build}/org/openscience/cdk/io/cml/data/cml1_0.dtd" />
ff82543 Added ValencyCheckerInterface which enables HydrogenAdder to make use…
egonw authored
571 <copy
db6accc Cleaned up a bit and just copy all dicts and atom type lists
egonw authored
572 file="${src}/org/openscience/cdk/io/cml/data/cml1_0_1.dtd"
573 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
574
0ac9cc0 Include dictionaries in jar
egonw authored
575 <copy
db6accc Cleaned up a bit and just copy all dicts and atom type lists
egonw authored
576 file="${src}/org/openscience/cdk/iupac/generator/data/IUPACNames.properties"
577 tofile="${build}/org/openscience/cdk/iupac/generator/data/IUPACNames.properties" />
f3efa88 Add string resources for IUPAC name generator to jar
egonw authored
578
db6accc Cleaned up a bit and just copy all dicts and atom type lists
egonw authored
579 <copy todir="${build}/org/openscience/cdk/dict/data/">
580 <fileset dir="${src}/org/openscience/cdk/dict/data/" includes="*.xml"/>
581 </copy>
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
582 </target>
d313d03 Also include cml.dtd in normal jar.
egonw authored
583
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
584 <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
585 <jar jarfile="${dist}/jar/cdk-core.jar">
586 <fileset dir="${build}">
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
587 <includesfile name="${src}/core.classes" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
588 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
589 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
590 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
591 </fileset>
592 </jar>
593 </target>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
594
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
595 <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
596 <jar jarfile="${dist}/jar/cdk-extra.jar">
597 <fileset dir="${build}">
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
598 <includesfile name="${src}/extra.classes" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
599 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
600 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
601 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
602 </fileset>
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
603 <fileset dir="${build}">
2679b69 Added missing dictionaries to cdk-extra.jar
egonw authored
604 <include name="org/openscience/cdk/dict/data/*.xml" />
605 </fileset>
0ef4af6 Added cdk-experimental package
egonw authored
606 </jar>
607 </target>
608
609 <target id="dist-experimental" name="dist-experimental" depends="compile-experimental, dist.init">
610 <jar jarfile="${dist}/jar/cdk-experimental.jar">
611 <fileset dir="${build}">
612 <includesfile name="${src}/experimental.classes" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
613 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
614 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
615 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
616 </fileset>
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
617 </jar>
618 </target>
619
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
620 <target id="dist-apps" name="dist-apps" depends="compile-apps">
4ae9e15 Compile PublicJmol when doing compile-libio.
egonw authored
621 <jar jarfile="${dist}/jar/cdk-apps.jar" manifest="${src}/cdk-apps.manifest">
38401bd Put applications in separate jar.
egonw authored
622 <fileset dir="${build}">
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
623 <includesfile name="${src}/applications.classes" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
624 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
625 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
626 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
38401bd Put applications in separate jar.
egonw authored
627 </fileset>
628 </jar>
629 </target>
630
df42e11 Fixed a few dependencies for the test target
egonw authored
631 <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
632 <jar jarfile="${dist}/jar/cdk-test.jar">
633 <fileset dir="${build}">
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
634 <includesfile name="${src}/test.classes" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
635 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
636 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
637 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
2c7c43d Fixed loading of files in JUnit IO tests: now using get resource.
egonw authored
638 </fileset>
639 <fileset dir=".">
640 <include name="data/**" />
641 </fileset>
642 </jar>
643 </target>
644
0386767 More @cdkPackage completed for test classes
egonw authored
645 <target id="dist-libio" name="dist-libio" depends="compile-libio" unless="libio.present">
8713d91 Finished work on basic JOELib <-> CDK convertor.
egonw authored
646 <jar jarfile="${dist}/jar/cdk-libio.jar">
647 <fileset dir="${build}">
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
648 <includesfile name="${src}/libio.classes" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
649 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
650 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
651 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
4ae9e15 Compile PublicJmol when doing compile-libio.
egonw authored
652 </fileset>
653 <fileset dir="${build}">
654 <include name="org/openscience/jmol/**" />
8713d91 Finished work on basic JOELib <-> CDK convertor.
egonw authored
655 </fileset>
656 </jar>
657 </target>
658
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
659 <target id="dist-io" name="dist-io" depends="compile-io">
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
660 <jar jarfile="${dist}/jar/cdk-io.jar">
661 <fileset dir="${build}">
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
662 <includesfile name="${src}/io.classes" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
663 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
664 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
665 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
2b0ab15 Make sure the CML DTDs are in the cdk-io.jar again
egonw authored
666 <include name="org/openscience/cdk/io/cml/data/**" />
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
667 </fileset>
668 </jar>
669 </target>
670
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
671 <target id="dist-render" name="dist-render" depends="compile-render">
8095921 Added rendering of wedged bonds.
egonw authored
672 <jar jarfile="${dist}/jar/cdk-render.jar">
673 <fileset dir="${build}">
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
674 <includesfile name="${src}/render.classes" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
675 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
676 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
677 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
8095921 Added rendering of wedged bonds.
egonw authored
678 </fileset>
679 </jar>
680 </target>
681
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
682 <target id="dist-render-with-java3d" name="dist-render-with-java3d" depends="compile-render-with-java3d"
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
683 if="java3D.present">
684 <jar jarfile="${dist}/jar/cdk-render.jar">
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
685 <fileset dir="${build}">
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
686 <includesfile name="${src}/render.classes" />
26336c0 Fixed build.xml for proper reference to java3d.javafiles (thanks to G…
egonw authored
687 <includesfile name="${src}/java3d.classes" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
688 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
689 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
690 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
691 </fileset>
692 </jar>
693 </target>
694
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
695 <target id="dist-standard" name="dist-standard" depends="compile-standard, dist.init">
36b733d Adding cdk-standard module.
egonw authored
696 <jar jarfile="${dist}/jar/cdk-standard.jar">
697 <fileset dir="${build}">
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
698 <includesfile name="${src}/standard.classes" />
95c12c2 Added config files to cdk-standard module.
egonw authored
699 <include name="org/openscience/cdk/config/**" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
700 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
701 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
702 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
36b733d Adding cdk-standard module.
egonw authored
703 </fileset>
704 </jar>
705 </target>
706
6dc5408 Added stuff for qsar module
egonw authored
707 <target id="dist-qsar" name="dist-qsar" depends="compile-qsar, dist.init">
708 <jar jarfile="${dist}/jar/cdk-qsar.jar">
709 <fileset dir="${build}">
710 <includesfile name="${src}/qsar.classes" />
711 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
712 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
713 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
714 </fileset>
715 </jar>
716 </target>
717
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -j…
egonw authored
718 <target id="dist-large" name="dist-large" depends="compile-all, dist.init, libjars"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
719 description="Builds on big jar file for the CDK, including experimental classes.">
e3792d4 Added description for sourcedist target, and target for putting all c…
egonw authored
720 <jar jarfile="${dist}/jar/cdk-all.jar">
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -j…
egonw authored
721 <manifest>
722 <attribute name="Main-Class" value="org.openscience.cdk.applications.DistLargeInfo"/>
723 <section name="org.openscience.cdk">
724 <attribute name="Specification-Title" value="The Chemistry Development Kit"/>
725 <attribute name="Specification-Version" value="1.0"/>
726 <attribute name="Specification-Vendor" value="The CDK Project"/>
727 <attribute name="Implementation-Title" value="org.openscience.cdk"/>
728 <attribute name="Implementation-Version" value="${version}"/>
729 <attribute name="Implementation-Vendor" value="The CDK Project"/>
730 </section>
731 </manifest>
555ce1a Fixed build.xml to properly generate a self-containing cdk-all.jar re…
egonw authored
732 <fileset dir="${build}">
e3792d4 Added description for sourcedist target, and target for putting all c…
egonw authored
733 <include name="org/openscience/cdk/**" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
734 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
735 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
736 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
e3792d4 Added description for sourcedist target, and target for putting all c…
egonw authored
737 </fileset>
555ce1a Fixed build.xml to properly generate a self-containing cdk-all.jar re…
egonw authored
738 <fileset dir=".">
739 <include name="CHANGELOG" />
740 <include name="README" />
741 <include name="BUGS" />
742 </fileset>
743 <fileset dir="${doc}">
744 <include name="lgpl.license" />
745 </fileset>
746 <fileset dir="packages/tar/cdk">
747 <include name="AUTHORS" />
748 </fileset>
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -j…
egonw authored
749 <fileset dir="${appjars.dir}" includes="**/*.class"/>
e3792d4 Added description for sourcedist target, and target for putting all c…
egonw authored
750 </jar>
751 </target>
752
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -j…
egonw authored
753 <target name="check.libjars" id="check.libjars">
754 <uptodate property="libjars.uptodate" targetfile="${appjars.dir}">
755 <srcfiles dir="${lib}" includes="base.jar"/>
756 <srcfiles dir="${lib}" includes="batik-dom.jar"/>
757 <srcfiles dir="${lib}" includes="batik-awt-util.jar"/>
758 <srcfiles dir="${lib}" includes="batik-svggen.jar"/>
759 <srcfiles dir="${lib}" includes="batik-util.jar"/>
760 <srcfiles dir="${lib}" includes="batik-xml.jar"/>
761 <srcfiles dir="${lib}" includes="castor-0.9.5-xml.jar"/>
762 <srcfiles dir="${lib}" includes="cmlAll.jar"/>
763 <srcfiles dir="${lib}" includes="commons-cli-1.0.jar"/>
764 <srcfiles dir="${lib}" includes="dadml.jar"/>
765 <srcfiles dir="${lib}" includes="gnujaxp.jar"/>
766 <srcfiles dir="${lib}" includes="jmolApis.jar"/>
767 <srcfiles dir="${lib}" includes="jmolIO.jar"/>
768 <srcfiles dir="${lib}" includes="junit.jar"/>
769 <srcfiles dir="${lib}" includes="log4j-core.jar"/>
770 <srcfiles dir="${lib}" includes="log4j.jar"/>
771 <srcfiles dir="${lib}" includes="mysql-2.0.4.jar"/>
772 <srcfiles dir="${lib}" includes="pmrlib.jar"/>
773 <srcfiles dir="${lib}" includes="postgresql7.0-1.2.jar"/>
774 <srcfiles dir="${lib}" includes="printf.jar"/>
775 <srcfiles dir="${lib}" includes="stmml.jar"/>
776 <srcfiles dir="${lib}" includes="vecmath1.2-1.14.jar"/>
777 <srcfiles dir="${lib}" includes="xerces-2.6.2.jar"/>
778 <srcfiles dir="${lib}" includes="xindice.jar"/>
779 <srcfiles dir="${lib}" includes="xmlApis-2.6.2.jar"/>
780 <srcfiles dir="${lib}" includes="xmldb.jar"/>
781 </uptodate>
782 </target>
783
784 <target name="libjars" id="libjars" depends="check.libjars" unless="libjars.uptodate">
785 <mkdir dir="${appjars.dir}"/>
786 <unjar dest="${appjars.dir}" src="${lib}/base.jar"/>
787 <unjar dest="${appjars.dir}" src="${lib}/batik-dom.jar"/>
788 <unjar dest="${appjars.dir}" src="${lib}/batik-awt-util.jar"/>
789 <unjar dest="${appjars.dir}" src="${lib}/batik-svggen.jar"/>
790 <unjar dest="${appjars.dir}" src="${lib}/batik-util.jar"/>
791 <unjar dest="${appjars.dir}" src="${lib}/batik-xml.jar"/>
792 <unjar dest="${appjars.dir}" src="${lib}/castor-0.9.5-xml.jar"/>
793 <unjar dest="${appjars.dir}" src="${lib}/cmlAll.jar"/>
794 <unjar dest="${appjars.dir}" src="${lib}/commons-cli-1.0.jar"/>
795 <unjar dest="${appjars.dir}" src="${lib}/dadml.jar"/>
796 <unjar dest="${appjars.dir}" src="${lib}/gnujaxp.jar"/>
797 <unjar dest="${appjars.dir}" src="${lib}/jmolApis.jar"/>
798 <unjar dest="${appjars.dir}" src="${lib}/jmolIO.jar"/>
799 <unjar dest="${appjars.dir}" src="${lib}/junit.jar"/>
800 <unjar dest="${appjars.dir}" src="${lib}/log4j-core.jar"/>
801 <unjar dest="${appjars.dir}" src="${lib}/log4j.jar"/>
802 <unjar dest="${appjars.dir}" src="${lib}/mysql-2.0.4.jar"/>
803 <unjar dest="${appjars.dir}" src="${lib}/pmrlib.jar"/>
804 <unjar dest="${appjars.dir}" src="${lib}/postgresql7.0-1.2.jar"/>
805 <unjar dest="${appjars.dir}" src="${lib}/printf.jar"/>
806 <unjar dest="${appjars.dir}" src="${lib}/stmml.jar"/>
807 <unjar dest="${appjars.dir}" src="${lib}/vecmath1.2-1.14.jar"/>
808 <unjar dest="${appjars.dir}" src="${lib}/xerces-2.6.2.jar"/>
809 <unjar dest="${appjars.dir}" src="${lib}/xindice.jar"/>
810 <unjar dest="${appjars.dir}" src="${lib}/xmlApis-2.6.2.jar"/>
811 <unjar dest="${appjars.dir}" src="${lib}/xmldb.jar"/>
812 </target>
813
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
814 <target id="dist-all" name="dist-all" depends="dist, dist-experimental, dist-apps"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
815 description="Builds the jar files for the CDK, including experimental classes."/>
53aff7c dist-all should also build cdk-experimental.jar, dist should not
egonw authored
816
817 <target id="dist" name="dist" depends="dist-core, dist-standard,
90025c1 Added missing editor classes to cdk-render.jar when compiling with-ja…
egonw authored
818 dist-io, dist-render,
88b3428 Don't build accelerated 3D viewer class if Java3D is not present
egonw authored
819 dist-extra, dist-libio,
6dc5408 Added stuff for qsar module
egonw authored
820 dist-render-with-java3d,
821 dist-qsar"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
822 description="Builds the jar files for the CDK."/>
ce6c169 Include config and data files in dist-with-java3d too.
egonw authored
823
e3792d4 Added description for sourcedist target, and target for putting all c…
egonw authored
824 <target id="sourcedist" name="sourcedist" depends="init"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
825 description="Builds the source packages.">
dccd7d0 Sourcedist making now also uses the defined version
egonw authored
826 <property name="package" value="cdk-source-${version}"/>
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
827 <property name="sourcedist.dir" value="${sourcedist}/${package}"/>
828 <copy todir="${sourcedist.dir}/${src}">
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
829 <fileset dir="${src}" includes="*.javafiles" />
ad5a692 Included *.jj files in sourcedist (closes #888710)
egonw authored
830 <fileset dir="${src}" includes="**/*.java" />
831 <fileset dir="${src}" includes="**/*.jj" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
832 <fileset dir="${src}" includes="org/openscience/cdk/io/cml/data/**" />
833 </copy>
834 <copy todir="${sourcedist.dir}">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
835 <fileset dir="." includes="build.xml" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
836 <fileset dir="." includes="javadoc.xml" />
837 <fileset dir="." includes="README" />
838 <fileset dir="." includes="CHANGELOG" />
839 </copy>
d6cda7b Distribute LGPL license with sourcecode
egonw authored
840 <copy todir="${sourcedist.dir}/jar">
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
841 <fileset dir="jar" />
842 </copy>
843 <copy todir="${sourcedist.dir}/data">
844 <fileset dir="data" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
845 </copy>
ad5a692 Included *.jj files in sourcedist (closes #888710)
egonw authored
846 <copy tofile="${sourcedist.dir}/doc/javadoc/source//MakeJavaFilesFilesDoclet.java"
847 file="doc/javadoc/source/MakeJavaFilesFilesDoclet.java"/>
7aa27da Make sure the config.data files get included in the source dist (clos…
egonw authored
848 <copy todir="${sourcedist.dir}/${src}/org/openscience/cdk/config/data/">
849 <fileset dir="${src}/org/openscience/cdk/config/data/"
e1f7ebb Do not try to build classes that depend on classes that depend on Java3D
egonw authored
850 includes="*" />
851 </copy>
a289167 Minor tweak to get distribs working
egonw authored
852 <copy
853 file="${src}/org/openscience/cdk/iupac/generator/data/IUPACNames.properties"
854 tofile="${sourcedist.dir}/${src}/org/openscience/cdk/iupac/generator/data/IUPACNames.properties" />
855 <copy
856 file="${src}/org/openscience/cdk/dict/data/chemical.xml"
857 tofile="${sourcedist.dir}/${src}/org/openscience/cdk/dict/data/chemical.xml" />
858 <copy
859 file="${src}/org/openscience/cdk/dict/data/elements.xml"
860 tofile="${sourcedist.dir}/${src}/org/openscience/cdk/dict/data/elements.xml" />
9496005 Added missing manifest
egonw authored
861 <copy todir="${sourcedist.dir}/${src}/">
862 <fileset dir="${src}/" includes="*.manifest" />
863 </copy>
d6cda7b Distribute LGPL license with sourcecode
egonw authored
864 <mkdir dir="${sourcedist.dir}/doc/" />
865 <copy todir="${sourcedist.dir}/doc/">
866 <fileset dir="doc/" includes="lgpl.license" />
867 </copy>
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
868 <tar tarfile="${package}.tar" basedir="${sourcedist}/" includes="${package}/**" />
dccd7d0 Sourcedist making now also uses the defined version
egonw authored
869 <gzip zipfile="${package}.tar.gz" src="cdk-source-${version}.tar" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
870 <delete file="${package}.tar" />
871 <zip zipfile="${package}.zip" basedir="${sourcedist}/" includes="${package}/**" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
872 </target>
873
cd012c0 Added posibility to just check the experimental classes
egonw authored
874 <target id="test-all" name="test-all" depends="test, test-experimental"/>
875
876 <target id="test-experimental" name="test-experimental" depends="noJunit"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
877 description="Performs a full JUnit test for the CDK, including experimental classes.">
7f7ea85 Have the experimental JME reader actually compile
egonw authored
878 <mkdir dir="${reports.tests}"/>
60b89d5 Added test suite for cdk-experimental, and moved Association to exper…
egonw authored
879 <junit printsummary="yes" haltonfailure="yes" fork="yes">
880 <classpath>
881 <pathelement location="${dist}/jar/cdk-core.jar" />
882 <pathelement location="${dist}/jar/cdk-standard.jar" />
883 <pathelement location="${dist}/jar/cdk-io.jar" />
884 <pathelement location="${dist}/jar/cdk-render.jar" />
885 <pathelement location="${dist}/jar/cdk-extra.jar" />
886 <pathelement location="${dist}/jar/cdk-apps.jar" />
887 <pathelement location="${dist}/jar/cdk-test.jar" />
6dc5408 Added stuff for qsar module
egonw authored
888 <pathelement location="${dist}/jar/cdk-qsar.jar" />
60b89d5 Added test suite for cdk-experimental, and moved Association to exper…
egonw authored
889 <pathelement location="${dist}/jar/cdk-libio.jar" />
890 <pathelement location="${dist}/jar/cdk-experimental.jar" />
891 <fileset dir="${lib}">
892 <include name="*.jar" />
893 </fileset>
894 <fileset dir="${lib}/libio">
895 <include name="*.jar" />
896 </fileset>
897 </classpath>
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
898 <test name="org.openscience.cdk.test.ExperimentalClassesTests"
60b89d5 Added test suite for cdk-experimental, and moved Association to exper…
egonw authored
899 haltonfailure="no"
900 todir="${reports.tests}"
0c93d33 Put results of tests for experimental classes in result.experimental.…
egonw authored
901 outfile="result.experimental">
60b89d5 Added test suite for cdk-experimental, and moved Association to exper…
egonw authored
902 <formatter type="brief" />
903 </test>
904 </junit>
905 </target>
906
6fa4411 Fail build process for test (etc) when JUnit is not installed in ANT_…
egonw authored
907 <target id="noJunit" name="noJunit" depends="check" unless="junit.present">
908 <fail message="JUnit is not installed in Ant. Please copy cdk/jar/junit.jar to ${ant.home}/lib/."/>
909 </target>
910
911 <target id="test" name="test" depends="dist-test, noJunit"
912 description="Performs a full JUnit test for the CDK." if="junit.present">
7f7ea85 Have the experimental JME reader actually compile
egonw authored
913 <mkdir dir="${reports.tests}"/>
9344d76 Fork testing, and removed reference to classpaths "." and "${java.cla…
egonw authored
914 <junit printsummary="yes" haltonfailure="yes" fork="yes">
915 <classpath>
916 <pathelement location="${dist}/jar/cdk-core.jar" />
917 <pathelement location="${dist}/jar/cdk-standard.jar" />
918 <pathelement location="${dist}/jar/cdk-io.jar" />
919 <pathelement location="${dist}/jar/cdk-render.jar" />
920 <pathelement location="${dist}/jar/cdk-extra.jar" />
921 <pathelement location="${dist}/jar/cdk-apps.jar" />
922 <pathelement location="${dist}/jar/cdk-test.jar" />
923 <pathelement location="${dist}/jar/cdk-libio.jar" />
6dc5408 Added stuff for qsar module
egonw authored
924 <pathelement location="${dist}/jar/cdk-qsar.jar" />
4c961ee Added missing jar file
egonw authored
925 <pathelement location="${dist}/jar/cdk-experimental.jar" />
9344d76 Fork testing, and removed reference to classpaths "." and "${java.cla…
egonw authored
926 <fileset dir="${lib}">
927 <include name="*.jar" />
928 </fileset>
929 <fileset dir="${lib}/libio">
930 <include name="*.jar" />
931 </fileset>
932 </classpath>
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
933 <test name="org.openscience.cdk.test.CDKTests"
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
934 haltonfailure="no"
935 todir="${reports.tests}"
936 outfile="result">
81258bd Added Ant task for doing Junit tests on the cdk-core and cdk-standard…
egonw authored
937 <formatter type="brief" />
3790797 Splitted tests which are supposed to fail from those which are suppos…
egonw authored
938 </test>
939 </junit>
940 </target>
941
6fa4411 Fail build process for test (etc) when JUnit is not installed in ANT_…
egonw authored
942 <target id="limitations" name="limitations" depends="dist-test, noJunit"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
943 description="Performs a JUnit tests that indicate limitations of certain CDK algorithms/classes.">
3790797 Splitted tests which are supposed to fail from those which are suppos…
egonw authored
944 <junit printsummary="yes" haltonfailure="yes" fork="yes">
945 <classpath>
946 <pathelement location="${dist}/jar/cdk-core.jar" />
947 <pathelement location="${dist}/jar/cdk-standard.jar" />
948 <pathelement location="${dist}/jar/cdk-io.jar" />
949 <pathelement location="${dist}/jar/cdk-render.jar" />
950 <pathelement location="${dist}/jar/cdk-extra.jar" />
951 <pathelement location="${dist}/jar/cdk-apps.jar" />
952 <pathelement location="${dist}/jar/cdk-test.jar" />
953 <pathelement location="${dist}/jar/cdk-libio.jar" />
954 <fileset dir="${lib}">
955 <include name="*.jar" />
956 </fileset>
957 <fileset dir="${lib}/libio">
958 <include name="*.jar" />
959 </fileset>
960 </classpath>
961 <test name="org.openscience.cdk.test.limitations.AlgorithmLimitations"
962 haltonfailure="no"
963 todir="${reports.tests}"
964 outfile="limitations">
965 <formatter type="brief" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
966 </test>
967 </junit>
968 </target>
969
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
970 <target name="test-libio" depends="dist-libio">
971 <java classname="org.openscience.cdk.test.libio.joelib.JOELibIOTest" fork="yes">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
972 <classpath>
7b0e32f Updated run-with-java3d task for some recent changes.
egonw authored
973 <pathelement location="${dist}/jar/cdk-core.jar" />
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
974 <pathelement location="${dist}/jar/cdk-extra.jar" />
975 <pathelement location="${dist}/jar/cdk-libio.jar" />
7b0e32f Updated run-with-java3d task for some recent changes.
egonw authored
976 <pathelement path="${java.class.path}" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
977 <pathelement location="." />
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
978 <fileset dir="${lib}">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
979 <include name="*.jar" />
980 </fileset>
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
981 <fileset dir="${lib}/libio">
7b0e32f Updated run-with-java3d task for some recent changes.
egonw authored
982 <include name="*.jar" />
983 </fileset>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
984 </classpath>
985 </java>
986 </target>
987
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
988 <target name="run-with-java3d"
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
989 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
990 <java
991 classname="org.openscience.cdk.test.OrbitalsRenderer3DTest"
992 fork="yes">
993 <arg value="data/reserpine.mol" />
994
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
995 <classpath>
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
996 <pathelement location="${dist}/jar/cdk-core.jar" />
e8dadc5 Finished rewriting Ant tasks into cdk modules.
egonw authored
997 <pathelement location="${dist}/jar/cdk-standard.jar" />
998 <pathelement location="${dist}/jar/cdk-extra.jar" />
999 <pathelement location="${dist}/jar/cdk-io.jar" />
1000 <pathelement location="${dist}/jar/cdk-render.jar" />
1001 <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
1002 <pathelement path="${java.class.path}" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
1003 <pathelement location="." />
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
1004 <fileset dir="${lib}">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
1005 <include name="*.jar" />
1006 </fileset>
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
1007 <fileset dir="${pathto3djava}">
1008 <include name="*.jar" />
1009 </fileset>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
1010 </classpath>
1011 </java>
1012 </target>
1013
58425b9 Added use of properties to run target
steinbeck authored
1014 <target id="run-test" name="run-test" depends="dist-core, dist-extra, dist-test, dist-standard"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
1015 description="Runs one specific JUnit test suite (org.openscience.cdk.test.&lt;class>) as a standalone application with -Dtestclass=&lt;class>.">
f1c49ce Added some feedback on what is tested
egonw authored
1016 <echo message="Running test class: testclass=${testclass}"/>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
1017 <java classname="org.openscience.cdk.test.${testclass}" fork="yes">
3d88ed4 Turn on CDK debugging while running JUnit test
egonw authored
1018 <jvmarg value="-Dcdk.debugging=true"/>
756bd80 When running a specific test (e.g. 'ant -Dtestclass=ringsearch.RingSe…
egonw authored
1019 <classpath>
1020 <pathelement location="${dist}/jar/cdk-core.jar" />
1021 <pathelement location="${dist}/jar/cdk-standard.jar" />
1022 <pathelement location="${dist}/jar/cdk-io.jar" />
1023 <pathelement location="${dist}/jar/cdk-render.jar" />
1024 <pathelement location="${dist}/jar/cdk-extra.jar" />
1025 <pathelement location="${dist}/jar/cdk-apps.jar" />
1026 <pathelement location="${dist}/jar/cdk-test.jar" />
1027 <pathelement location="${dist}/jar/cdk-libio.jar" />
1028 <fileset dir="${lib}">
1029 <include name="*.jar" />
1030 </fileset>
1031 <fileset dir="${lib}/libio">
1032 <include name="*.jar" />
1033 </fileset>
1034 </classpath>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
1035 </java>
1036 </target>
1037
6fa4411 Fail build process for test (etc) when JUnit is not installed in ANT_…
egonw authored
1038 <target id="junit-test" name="junit-test" depends="dist-core, dist-extra, dist-test, dist-standard, noJunit"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
1039 description="Runs one specific JUnit test suite (org.openscience.cdk.test.&lt;class>) with -Dtestclass=&lt;class>.">
f1c49ce Added some feedback on what is tested
egonw authored
1040 <echo message="JUnit tests class: testclass=${testclass}"/>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
1041 <junit printsummary="yes" haltonfailure="no" fork="yes">
79f7451 Switch debugging on in run-test target
steinbeck authored
1042 <jvmarg value="-Dcdk.debugging=true"/>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
1043 <jvmarg value="-Dcdk.debug.stdout=true"/>
1044 <classpath>
58425b9 Added use of properties to run target
steinbeck authored
1045 <pathelement location="${dist}/jar/cdk-core.jar" />
1046 <pathelement location="${dist}/jar/cdk-standard.jar" />
1047 <pathelement location="${dist}/jar/cdk-io.jar" />
1048 <pathelement location="${dist}/jar/cdk-render.jar" />
1049 <pathelement location="${dist}/jar/cdk-extra.jar" />
1050 <pathelement location="${dist}/jar/cdk-apps.jar" />
1051 <pathelement location="${dist}/jar/cdk-test.jar" />
1052 <pathelement location="${dist}/jar/cdk-libio.jar" />
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
1053 <pathelement location="${dist}/jar/cdk-experimental.jar" />
58425b9 Added use of properties to run target
steinbeck authored
1054 <pathelement path="${java.class.path}" />
1055 <pathelement location="." />
1056 <fileset dir="${lib}">
1057 <include name="*.jar" />
1058 </fileset>
1059 <fileset dir="${lib}/libio">
1060 <include name="*.jar" />
1061 </fileset>
1062 </classpath>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
1063 <test name="org.openscience.cdk.test.${testclass}"
1064 haltonfailure="no"
1065 todir="${reports.tests}"
1066 outfile="result.${testclass}">
1067 <formatter type="brief" />
1068 </test>
1069 </junit>
58425b9 Added use of properties to run target
steinbeck authored
1070 </target>
1071
1072
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
1073 <target id="run" name="run" depends="dist-core, dist-extra, dist-test, dist-standard"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
1074 description="Runs an application (org.openscience.cdk.&lt;class>) with -Drunclass=&lt;class>.">
58425b9 Added use of properties to run target
steinbeck authored
1075 <java classname="org.openscience.cdk.${runclass}" fork="yes" >
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
1076 <arg value="${arg1}" />
1077 <arg value="${arg2}" />
1078 <arg value="${arg3}" />
1079 <arg value="${arg4}" />
ac448e9 Nothing happend here.
steinbeck authored
1080 <classpath>
8095921 Added rendering of wedged bonds.
egonw authored
1081 <pathelement location="${dist}/jar/cdk-core.jar" />
1082 <pathelement location="${dist}/jar/cdk-standard.jar" />
1083 <pathelement location="${dist}/jar/cdk-io.jar" />
1084 <pathelement location="${dist}/jar/cdk-render.jar" />
1085 <pathelement location="${dist}/jar/cdk-extra.jar" />
1086 <pathelement location="${dist}/jar/cdk-apps.jar" />
1087 <pathelement location="${dist}/jar/cdk-test.jar" />
1088 <pathelement location="${dist}/jar/cdk-libio.jar" />
1089 <pathelement path="${java.class.path}" />
1090 <pathelement location="." />
1091 <fileset dir="${lib}">
1092 <include name="*.jar" />
1093 </fileset>
1094 <fileset dir="${lib}/libio">
1095 <include name="*.jar" />
1096 </fileset>
1097 </classpath>
8713d91 Finished work on basic JOELib <-> CDK convertor.
egonw authored
1098 </java>
1099 </target>
1100
c5eb7ec Added Ant build file.
egonw authored
1101 </project>
Something went wrong with that request. Please try again.