Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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