Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100755 769 lines (710 sloc) 39.479 kB
ea39d29 More dependency clean up... A lot is working now, but the cyclic depe…
egonw authored
1 <project name="CDK" default="dist-all" 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
246601c Added a test to check for the presence of R and thus prevent compilat…
rajarshi authored
18
3a26de3 Made compilation with debug=on customizable.
egonw authored
19 <!-- directories -->
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
20 <property name="build" value="build" />
bd36ed1 Trial for new build system
egonw authored
21 <property name="build.src" value="${build}/src" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
22 <property name="sourcedist" value="sourcedist" />
23 <property name="dist" value="dist" />
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
24 <property name="doc" value="doc" />
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
25 <property name="src" value="src" />
26 <property name="lib" value="jar" />
9e95b7b Finished splitting devel from user jars
egonw authored
27 <property name="devellib" value="develjar" />
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
28 <property name="src.tests" value="${src}/org/openscience/cdk/test" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
29 <property name="reports.tests" value="reports" />
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -j…
egonw authored
30 <property name="appjars.dir" value="${dist}/appjars" />
bd36ed1 Trial for new build system
egonw authored
31 <property name="metainf" value="${src}/META-INF" />
f7be51f Removed alternative core classes patch offering more detailed debug info
egonw authored
32
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar whi…
egonw authored
33 <!-- class to run for testing-->
34 <property name="testclass" value="CDKTests" />
9bcd183 Fixed default executed application
egonw authored
35 <property name="runclass" value="applications.FileConvertor" />
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar whi…
egonw authored
36 <property name="arg1" value="" />
37 <property name="arg2" value="" />
38 <property name="arg3" value="" />
39 <property name="arg4" value="" />
58425b9 Added use of properties to run target
steinbeck authored
40
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
41 <target id="info" name="info" depends="check">
42 <!-- Gives information about the building process. -->
8f6d674 Fixed after breaking it earlier today
egonw authored
43 <echo message="Platform:" />
7cd4ff8 Added R/SJava found to info target
egonw authored
44 <echo message=" OS: ${os.name}" />
45 <echo message=" Architecture: ${os.arch}" />
46 <echo message=" Version: ${os.version}" />
47 <echo message=" Mac OS/X found: ${isMacOsX}" />
8f6d674 Fixed after breaking it earlier today
egonw authored
48 <echo message="" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info …
egonw authored
49 <echo message="Java/Ant Environment:" />
7cd4ff8 Added R/SJava found to info target
egonw authored
50 <echo message=" Java version: ${java.version}" />
51 <echo message=" Java vendor: ${java.vendor}" />
52 <echo message=" Java dir: ${java.home}" />
53 <echo message=" Java ext dir: ${java.ext.dirs}" />
54 <echo message=" Ant version: ${ant.version}" />
55 <echo message=" ${ANT_HOME}: ${ant.home}" />
56 <echo message=" hasAnt16: ${hasAnt16}" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info …
egonw authored
57 <echo message="" />
58 <echo message="CDK Environment:" />
7cd4ff8 Added R/SJava found to info target
egonw authored
59 <echo message=" CDK version: ${version}" />
60 <echo message=" build.xml: $Id$" />
6d246fd Fixed detection of class binaries of Doclets required to compile the CDK
egonw authored
61 <echo message=" Doclets found: ${docletsAreCompiled}" />
5a470af Added detection of Jmol, and added comments on optionality of libs
egonw authored
62 <echo message=" Junit found: ${junit.present}" />
63 <echo message=" --- distributed libraries ---" />
7cd4ff8 Added R/SJava found to info target
egonw authored
64 <echo message=" CMLDOM found: ${cmllibs.present}" />
5a470af Added detection of Jmol, and added comments on optionality of libs
egonw authored
65 <echo message=" Jmol found: ${jmol.present}" />
66 <echo message=" --- optional libraries ---" />
67 <echo message=" JOELib found: ${joelib.present}" />
7cd4ff8 Added R/SJava found to info target
egonw authored
68 <echo message=" Java3D found: ${java3D.present}" />
69 <echo message="R/SJava present: ${rispresent}"/>
2f3eee0 Adapted to provide for a customizable patch scheme
egonw authored
70 <echo message="" />
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
71 <echo message="Compiling:" />
7cd4ff8 Added R/SJava found to info target
egonw authored
72 <echo message=" for: ${build.compiler}" />
73 <echo message=" debug: ${debug}" />
74 <echo message=" deprecation: ${deprecation}" />
75 <echo message=" optimization: ${optimization}" />
eb01480 Added skipDoclet option: try ant -DskipDoclet info runDoclet
egonw authored
76 <echo message=" skipDoclet: ${doSkipDoclet}" />
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
77 </target>
78
8f6d674 Fixed after breaking it earlier today
egonw authored
79 <target id="checkPlatforms" name="checkPlatforms">
58405cf Fixed build.xml to allow compile of doclets on MacOS/X (closes #1001497)
egonw authored
80 <condition property="isMacOsX">
81 <and>
82 <os family="mac"/>
83 <os family="unix"/>
84 </and>
85 </condition>
86 </target>
87
8f6d674 Fixed after breaking it earlier today
egonw authored
88 <target id="check" name="check" depends="checkPlatforms">
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
89 <!-- Checks which parts of CDK can be build. -->
6d246fd Fixed detection of class binaries of Doclets required to compile the CDK
egonw authored
90 <condition property="docletsAreCompiled">
91 <and>
efbfe43 Fixed 'doclets-are-compiled' detection
egonw authored
92 <available classname="net.sf.cdk.tools.MakeJavaFilesFilesDoclet" classpath="${doc}/javadoc"/>
93 <available classname="net.sf.cdk.tools.MakeCDKSetFilesDoclet" classpath="${doc}/javadoc"/>
6d246fd Fixed detection of class binaries of Doclets required to compile the CDK
egonw authored
94 </and>
95 </condition>
246601c Added a test to check for the presence of R and thus prevent compilat…
rajarshi authored
96 <available classname="joelib.molecule.JOEAtom"
97 classpath="${lib}/libio/joelib.jar"
98 property="joelib.present"/>
5a470af Added detection of Jmol, and added comments on optionality of libs
egonw authored
99 <available classname="org.jmol.api.JmolAdapter"
100 classpath="${lib}/jmolApis.jar"
101 property="jmol.present"/>
4302fbf Updated for Jumbo50 transition.
egonw authored
102 <available file="${lib}/jumbo50.jar"
246601c Added a test to check for the presence of R and thus prevent compilat…
rajarshi authored
103 property="cmllibs.present"/>
104 <available classname="javax.media.j3d.Canvas3D"
105 property="java3D.present"/>
106 <available classname="junit.framework.TestCase"
107 classpath="${ant.home}/lib/junit.jar"
108 property="junit.present"/>
109 <condition property="hasAnt16">
110 <contains string="${ant.version}" substring="1.6"/>
111 </condition>
112 <condition property="isJava13">
113 <contains string="${java.version}" substring="1.3"/>
114 </condition>
115 <condition property="isJava14">
116 <contains string="${java.version}" substring="1.4"/>
117 </condition>
866bc72 CML is now available for Java1.5 too
egonw authored
118 <condition property="isJava15">
119 <contains string="${java.version}" substring="1.5"/>
120 </condition>
246601c Added a test to check for the presence of R and thus prevent compilat…
rajarshi authored
121 <condition property="isJava14+">
122 <or>
123 <contains string="${java.version}" substring="1.4"/>
124 <contains string="${java.version}" substring="1.5"/>
125 </or>
126 </condition>
127 <condition property="isJava15">
128 <contains string="${java.version}" substring="1.5"/>
129 </condition>
130 <uptodate property="dotjavafiles.uptodate"
131 targetfile="${src}/core.javafiles">
132 <srcfiles dir="${src}" includes="**/*.java" />
133 </uptodate>
134 <condition property="dotjjfiles.uptodate">
135 <and>
136 <uptodate property="NomParserJavafiles.uptodate"
137 targetfile="${src}/org/openscience/cdk/iupac/parser/NomParser.java">
138 <srcfiles dir="${src}" includes="org/openscience/cdk/iupac/parser/NomParser.jj" />
139 </uptodate>
140 <uptodate property="SMARTSParserJavafiles.uptodate"
141 targetfile="${src}/org/openscience/cdk/smiles/smarts/SMARTSParser.java">
142 <srcfiles dir="${src}" includes="org/openscience/cdk/smiles/smarts/SMARTSParser.jj" />
143 </uptodate>
144 </and>
145 </condition>
146 <condition property="rispresent">
147 <and>
148 <or>
149 <available file="/usr/bin/R" />
150 <available file="/usr/local/bin/R"/>
151 </or>
152 <or>
153 <available file="/usr/lib/R/library/SJava/" />
154 <available file="/usr/local/lib/R/library/SJava/" />
e55ee94 Added another dir to look, though the R tests still fail
egonw authored
155 <available file="/usr/local/lib/R/site-library/SJava/" />
246601c Added a test to check for the presence of R and thus prevent compilat…
rajarshi authored
156 </or>
157 </and>
158 </condition>
eb01480 Added skipDoclet option: try ant -DskipDoclet info runDoclet
egonw authored
159 <condition property="doSkipDoclet">
160 <equals arg1="${skipDoclet}" arg2="true"/>
161 </condition>
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
162 </target>
163
246601c Added a test to check for the presence of R and thus prevent compilat…
rajarshi authored
164
d2ed020 Reworked dependencies
egonw authored
165 <target id="init" name="init" depends="check, setupBuildDir"/>
4302fbf Updated for Jumbo50 transition.
egonw authored
166 <target id="customize" name="customize" depends="javacc"/>
866bc72 CML is now available for Java1.5 too
egonw authored
167
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
168 <target id="setupBuildDir" name="setupBuildDir">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
169 <tstamp />
170 <mkdir dir="${build}" />
171 <mkdir dir="${sourcedist}" />
172 <mkdir dir="${dist}" />
173 <mkdir dir="${reports.tests}" />
174 </target>
175
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
176 <target id="clean" name="clean" description="Removes autogenerated files.">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
177 <delete>
24af772 Delete autogenerated .javafiles in clean target
egonw authored
178 <fileset dir="." includes="**/*~" />
179 <fileset dir="." includes="*.tar.gz" />
180 <fileset dir="." includes="*.zip" />
06ee5d1 Modified the clean target to remove .rda files generated during testi…
rajarshi authored
181 <fileset dir="." includes="*.rda" />
24af772 Delete autogenerated .javafiles in clean target
egonw authored
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>
bfe0e17 Build interfaces before data
egonw authored
186 <fileset dir="${src}" includes="*.entitylist" />
5ad21a8 Fixed building CDK with Ant 1.5.x
egonw authored
187 <!-- remove java files generated with JavaCC -->
188 <fileset dir="${src}/org/openscience/cdk/smiles/smarts" includes="*.java" />
189 <fileset dir="${src}/org/openscience/cdk/iupac/parser" includes="*.java">
190 <!-- the next are from CVS -->
191 <exclude name="AttachedGroup.java" />
192 <exclude name="MoleculeBuilder.java" />
193 </fileset>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
194 </delete>
195
196 <delete dir="${build}" />
197 <delete dir="${sourcedist}" />
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
198 <delete dir="${dist}" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
199 <delete dir="${reports.tests}" />
200 </target>
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
201
6d246fd Fixed detection of class binaries of Doclets required to compile the CDK
egonw authored
202 <target name="compileDoclet" id="compileDoclet" depends="check" unless="docletsAreCompiled">
203 <echo>Compiling doclets in doc/javadoc that are required for compiling CDK...</echo>
204 <antcall target="compileDoclet.MacOSX"/>
205 <antcall target="compileDoclet.Other" />
206 </target>
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info …
egonw authored
207
208 <target name="compileDoclet.MacOSX" id="compileDoclet.MacOSX" if="isMacOsX">
209 <javac srcdir="doc/javadoc/source" destdir="doc/javadoc"
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g.…
egonw authored
210 includes="MakeJavaFilesFilesDoclet.java, MakeCDKSetFilesDoclet.java" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info …
egonw authored
211 </target>
212
213 <target name="compileDoclet.Other" id="compileDoclet.Other" unless="isMacOsX">
ca98ea5 Refactored build process (closes #883519)
egonw authored
214 <javac srcdir="doc/javadoc/source" destdir="doc/javadoc"
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g.…
egonw authored
215 includes="MakeJavaFilesFilesDoclet.java, MakeCDKSetFilesDoclet.java">
ca98ea5 Refactored build process (closes #883519)
egonw authored
216 <classpath>
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info …
egonw authored
217 <fileset dir="${java.ext.dirs}">
218 <include name="tools.jar" />
219 </fileset>
220 <fileset dir="${java.ext.dirs}/../../../lib">
221 <include name="tools.jar" />
5a62197 Fixed compileDoclet target
egonw authored
222 </fileset>
ca98ea5 Refactored build process (closes #883519)
egonw authored
223 </classpath>
224 </javac>
225 </target>
226
9012143 Reworked dependencies a bit, fixing the -DskipDoclet option
egonw authored
227 <target name="runDoclet" id="runDoclet"
228 depends="check, customize" unless="doSkipDoclet">
229 <echo>Not skipping doclet run...</echo>
230 <antcall target="reallyRunDoclet"/>
231 <antcall target="failIfNoDocletResults"/>
232 </target>
2583a62 Added better output about missing src/*.javafiles
egonw authored
233
676c95b Cleaned up more of the build file
egonw authored
234 <target name="checkDocletResults" id="checkDocletResults">
2583a62 Added better output about missing src/*.javafiles
egonw authored
235 <condition property="dotjavafiles.uptodate">
236 <and>
3148e46 Moved the former core module classes to the data module, and the Logg…
egonw authored
237 <available file="${src}/data.javafiles" />
2583a62 Added better output about missing src/*.javafiles
egonw authored
238 <available file="${src}/core.javafiles" />
239 <available file="${src}/standard.javafiles" />
240 <available file="${src}/extra.javafiles" />
241 <available file="${src}/io.javafiles" />
242 </and>
243 </condition>
244 </target>
245
676c95b Cleaned up more of the build file
egonw authored
246 <target name="failIfNoDocletResults" id="failIfNoDocletResults" depends="checkDocletResults" unless="dotjavafiles.uptodate">
2583a62 Added better output about missing src/*.javafiles
egonw authored
247 <fail>
248 There seems to be a problem with building the cdk/src/*.javafiles.
fa91151 A better error message: in most cases source code errors cause the pr…
egonw authored
249 Often this is caused by malformed java source code, so please check the output
250 of the reallyRunDoclet target (ant reallyRunDoclet).
251
252 If there is no reported source code error, please report this to
253 cdk-devel@lists.sf.net and send the output of
2583a62 Added better output about missing src/*.javafiles
egonw authored
254 this command: ant -v info runDoclet.
255 </fail>
256 </target>
257
676c95b Cleaned up more of the build file
egonw authored
258 <target name="reallyRunDoclet" id="reallyRunDoclet" depends="compileDoclet" unless="dotjavafiles.uptodate">
3ec097a Modified the reallyRunDoclet task so that it considers all classes (p…
rajarshi authored
259 <javadoc private="true" maxmemory="128m">
6dc1be4 Less complaining when running MakeJavaFilesFilesDoclet
egonw authored
260 <classpath>
6e42787 Moved render and io to new system
egonw authored
261 <fileset dir="${lib}">
262 <include name="*.jar" />
263 </fileset>
6dc1be4 Less complaining when running MakeJavaFilesFilesDoclet
egonw authored
264 <fileset dir="${lib}/libio">
265 <include name="*.jar" />
266 </fileset>
b1187d4 The devel libs are needed when running the doclets too
egonw authored
267 <fileset dir="${devellib}">
268 <include name="*.jar" />
269 </fileset>
6dc1be4 Less complaining when running MakeJavaFilesFilesDoclet
egonw authored
270 </classpath>
271
23408ac Put classes in a package (closes #1323761).
egonw authored
272 <doclet name="net.sf.cdk.tools.MakeJavaFilesFilesDoclet" path="${doc}/javadoc"/>
24af772 Delete autogenerated .javafiles in clean target
egonw authored
273
026da28 Removed last trace of patch system: compile errors in IDE tools work …
egonw authored
274 <packageset dir="${src}">
ca98ea5 Refactored build process (closes #883519)
egonw authored
275 <include name="org/openscience/cdk/**"/>
276 </packageset>
6dc1be4 Less complaining when running MakeJavaFilesFilesDoclet
egonw authored
277
ca98ea5 Refactored build process (closes #883519)
egonw authored
278 </javadoc>
3ec097a Modified the reallyRunDoclet task so that it considers all classes (p…
rajarshi authored
279 <javadoc private="true" maxmemory="128m">
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g.…
egonw authored
280 <classpath>
6e42787 Moved render and io to new system
egonw authored
281 <fileset dir="${lib}">
282 <include name="*.jar" />
283 </fileset>
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g.…
egonw authored
284 <fileset dir="${lib}/libio">
285 <include name="*.jar" />
286 </fileset>
b1187d4 The devel libs are needed when running the doclets too
egonw authored
287 <fileset dir="${devellib}">
288 <include name="*.jar" />
289 </fileset>
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g.…
egonw authored
290 </classpath>
291
23408ac Put classes in a package (closes #1323761).
egonw authored
292 <doclet name="net.sf.cdk.tools.MakeCDKSetFilesDoclet" path="${doc}/javadoc"/>
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g.…
egonw authored
293
294 <packageset dir="${src}">
295 <include name="org/openscience/cdk/**"/>
296 </packageset>
297
298 </javadoc>
0bbfc90 Removed Viewer application. Use JChemPaint (jchempaint.sf.net) or Jmo…
egonw authored
299 <move todir="${src}" failonerror="true">
ca98ea5 Refactored build process (closes #883519)
egonw authored
300 <fileset dir=".">
301 <include name="*.javafiles"/>
0c049c7 Further work on new build system: all packages compile, but target te…
egonw authored
302 <include name="*.classes"/>
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g.…
egonw authored
303 <include name="*.set"/>
46a17d2 Clean entity lists
egonw authored
304 <include name="*.entitylist"/>
ca98ea5 Refactored build process (closes #883519)
egonw authored
305 </fileset>
306 </move>
307 </target>
308
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
309 <target id="compile-needed-test" name="compile-needed-test">
310 <uptodate property="module-uptodate" targetfile="${dist}/jar/cdk-${module}.jar">
311 <srcfiles dir="${src}">
312 <includesfile name="${src}/${module}.javafiles"/>
313 </srcfiles>
314 </uptodate>
315 </target>
9012143 Reworked dependencies a bit, fixing the -DskipDoclet option
egonw authored
316
317 <target id="compile-init" name="compile-init"
b0f7700 Checks are really needed a bit more often to ensure that some variabl…
egonw authored
318 depends="init, check, runDoclet"/>
9012143 Reworked dependencies a bit, fixing the -DskipDoclet option
egonw authored
319
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
320 <target id="compile-module" name="compile-module"
b0f7700 Checks are really needed a bit more often to ensure that some variabl…
egonw authored
321 depends="check, dist.init, compile-needed-test"
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
322 unless="module-uptodate">
323
bd36ed1 Trial for new build system
egonw authored
324 <echo message="Compiling classes for CDK's ${module} module." />
666b237 Ok, next step... getting extra and apps to the new system; lot's of u…
egonw authored
325
326 <!-- check for availability for meta info files -->
327 <available file="${metainf}/${module}.datafiles" property="module.datafiles.present"/>
cd4dbe5 Added hook for extra files outside the src/ directory, solving the re…
egonw authored
328 <available file="${metainf}/${module}.extrafiles" property="module.extrafiles.present"/>
666b237 Ok, next step... getting extra and apps to the new system; lot's of u…
egonw authored
329 <available file="${metainf}/${module}.cdkdepends" property="module.cdkdepends.present"/>
330 <available file="${metainf}/${module}.libdepends" property="module.libdepends.present"/>
ea39d29 More dependency clean up... A lot is working now, but the cyclic depe…
egonw authored
331 <available file="${metainf}/${module}.devellibdepends" property="module.devellibdepends.present"/>
bd36ed1 Trial for new build system
egonw authored
332
666b237 Ok, next step... getting extra and apps to the new system; lot's of u…
egonw authored
333 <!-- be somewhat informative -->
334 <echo message="Datafiles defined: ${module.datafiles.present}"/>
cd4dbe5 Added hook for extra files outside the src/ directory, solving the re…
egonw authored
335 <echo message="Extra files defined: ${module.extrafiles.present}"/>
666b237 Ok, next step... getting extra and apps to the new system; lot's of u…
egonw authored
336 <echo message="CDK dependencies defined: ${module.cdkdepends.present}"/>
337 <echo message="Library dependencies defined: ${module.libdepends.present}"/>
ea39d29 More dependency clean up... A lot is working now, but the cyclic depe…
egonw authored
338 <echo message="Developer Library dependencies defined: ${module.devellibdepends.present}"/>
666b237 Ok, next step... getting extra and apps to the new system; lot's of u…
egonw authored
339
bd36ed1 Trial for new build system
egonw authored
340 <!-- normally javac compiles not just the given files, but also missing
341 classes that are in the same src/ directory. By making a copy first,
342 we explicitely make it impossible to compile files that are not
343 marked for a specific module -->
51ac13a Also delete .class files as they mess up CDK dependency cleanless too
egonw authored
344 <delete dir="${build}"/>
345 <mkdir dir="${build}"/>
bd36ed1 Trial for new build system
egonw authored
346 <mkdir dir="${build.src}"/>
347 <copy todir="${build.src}">
348 <fileset dir="${src}">
927c067 Don't copy files it cannot compile either, fixing another set of buil…
egonw authored
349 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
350 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
351 <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
352 <excludesfile name="${src}/r-project.javafiles" unless="rispresent"/>
353
bd36ed1 Trial for new build system
egonw authored
354 <includesfile name="${src}/${module}.javafiles"/>
355 </fileset>
356 </copy>
357
358 <!-- ok, now that we have a copy, compile this copy -->
359 <javac srcdir="${build.src}" destdir="${build}" optimize="${optimization}"
666b237 Ok, next step... getting extra and apps to the new system; lot's of u…
egonw authored
360 debug="${debug}" deprecation="${deprecation}">
bd36ed1 Trial for new build system
egonw authored
361 <classpath>
666b237 Ok, next step... getting extra and apps to the new system; lot's of u…
egonw authored
362 <fileset dir="${lib}" >
363 <exclude name="**/*" unless="module.libdepends.present" />
364 <includesfile name="${metainf}/${module}.libdepends" if="module.libdepends.present" />
bd36ed1 Trial for new build system
egonw authored
365 </fileset>
ea39d29 More dependency clean up... A lot is working now, but the cyclic depe…
egonw authored
366 <fileset dir="${devellib}">
367 <exclude name="**/*" unless="module.devellibdepends.present" />
368 <includesfile name="${metainf}/${module}.devellibdepends" if="module.devellibdepends.present" />
369 </fileset>
bd36ed1 Trial for new build system
egonw authored
370 <fileset dir="${dist}/jar">
666b237 Ok, next step... getting extra and apps to the new system; lot's of u…
egonw authored
371 <exclude name="**/*" unless="module.cdkdepends.present" />
372 <includesfile name="${metainf}/${module}.cdkdepends" if="module.cdkdepends.present" />
bd36ed1 Trial for new build system
egonw authored
373 </fileset>
374 </classpath>
375
376 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
377 <excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/>
378 <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
676c95b Cleaned up more of the build file
egonw authored
379 <excludesfile name="${src}/r-project.javafiles" unless="rispresent"/>
bd36ed1 Trial for new build system
egonw authored
380
381 <includesfile name="${src}/${module}.javafiles"/>
382 </javac>
383
384 <!-- and then jar things up into the module jar -->
385 <jar jarfile="${dist}/jar/cdk-${module}.jar">
386 <fileset dir="${build}">
387 <includesfile name="${src}/${module}.classes" />
388 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
389 <excludesfile name="${src}/java1.4.classes" unless="isJava14"/>
390 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
391 </fileset>
392 <fileset dir="${src}">
393 <include name="${module}.javafiles" />
394 </fileset>
666b237 Ok, next step... getting extra and apps to the new system; lot's of u…
egonw authored
395 <fileset dir="${src}">
141cf36 Fixed problem with including data files in the module jars
egonw authored
396 <exclude name="**/*" unless="module.datafiles.present"/>
666b237 Ok, next step... getting extra and apps to the new system; lot's of u…
egonw authored
397 <includesfile name="${metainf}/${module}.datafiles" if="module.datafiles.present" />
398 </fileset>
ddebad1 Modified to match new dir struct
egonw authored
399 <fileset dir="${src}">
cd4dbe5 Added hook for extra files outside the src/ directory, solving the re…
egonw authored
400 <exclude name="**/*" unless="module.extrafiles.present"/>
401 <includesfile name="${metainf}/${module}.extrafiles" if="module.extrafiles.present" />
402 </fileset>
bd36ed1 Trial for new build system
egonw authored
403 </jar>
404 </target>
405
6dc5408 Added stuff for qsar module
egonw authored
406 <!-- 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
407 <target id="javacc" name="javacc" depends="init, check" if="hasAnt16" unless="dotjjfiles.uptodate">
5ad21a8 Fixed building CDK with Ant 1.5.x
egonw authored
408 <echo message="Compiling Ant 1.6 depending classes." />
cd49d3a A bit of comment
egonw authored
409 <!-- the IUPAC name parser -->
1dd9647 Added IUPAC name parser
stomkinson authored
410 <delete>
411 <fileset id="javacc-generated"
cd49d3a A bit of comment
egonw authored
412 dir="${src}/org/openscience/cdk/iupac/parser/"
413 includes="NomParser*.java,ParseException.java,SimpleCharStream.java,Token.java,TokenMgrError.java"/>
1dd9647 Added IUPAC name parser
stomkinson authored
414 </delete>
415 <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
416 outputdirectory="${src}/org/openscience/cdk/iupac/parser/"
1dd9647 Added IUPAC name parser
stomkinson authored
417 javacchome="${lib}"/>
2fa9ba9 Forgot to upload the updated build.xml
egonw authored
418 <delete>
419 <fileset id="javacc-generated"
420 dir="${src}/org/openscience/cdk/smiles/smarts/"
421 includes="*.java"/>
422 </delete>
423 <javacc target="${src}/org/openscience/cdk/smiles/smarts/SMARTSParser.jj"
424 outputdirectory="${src}/org/openscience/cdk/smiles/smarts/"
425 javacchome="${lib}"/>
1dd9647 Added IUPAC name parser
stomkinson authored
426 </target>
8095921 Added rendering of wedged bonds.
egonw authored
427
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
428 <target id="dist.init" name="dist.init">
246601c Added a test to check for the presence of R and thus prevent compilat…
rajarshi authored
429 <mkdir dir="${dist}/jar" />
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
430 </target>
d313d03 Also include cml.dtd in normal jar.
egonw authored
431
21cfa9b More documentation in AllRingsFinder and FingerPrinter on recent time…
steinbeck authored
432 <target id="dist-all" name="dist-all" description="dist-all">
9012143 Reworked dependencies a bit, fixing the -DskipDoclet option
egonw authored
433 <antcall target="compile-init"/>
bfe0e17 Build interfaces before data
egonw authored
434 <antcall target="compile-module"><param name="module" value="interfaces"/></antcall>
c378f2b Synched indentation
egonw authored
435 <antcall target="compile-module"><param name="module" value="core"/></antcall>
bd36ed1 Trial for new build system
egonw authored
436 <antcall target="compile-module"><param name="module" value="data"/></antcall>
676c95b Cleaned up more of the build file
egonw authored
437 <antcall target="compile-module"><param name="module" value="standard"/></antcall>
438 <antcall target="compile-module"><param name="module" value="render"/></antcall>
439 <antcall target="compile-module"><param name="module" value="io"/></antcall>
ea39d29 More dependency clean up... A lot is working now, but the cyclic depe…
egonw authored
440 <antcall target="compile-module"><param name="module" value="io-jmol"/></antcall>
206145b Added a new module 'pdb' with a new class PDBAtom; PDB fields are now…
egonw authored
441 <antcall target="compile-module"><param name="module" value="pdb"/></antcall>
666b237 Ok, next step... getting extra and apps to the new system; lot's of u…
egonw authored
442 <antcall target="compile-module"><param name="module" value="extra"/></antcall>
ea39d29 More dependency clean up... A lot is working now, but the cyclic depe…
egonw authored
443 <antcall target="compile-module"><param name="module" value="libio-cml"/></antcall>
29687ca Added a CML Customizer interface which reduces the CDK module depende…
egonw authored
444 <antcall target="compile-module"><param name="module" value="pdb-cml"/></antcall>
676c95b Cleaned up more of the build file
egonw authored
445 <antcall target="compile-module"><param name="module" value="experimental"/></antcall>
ea39d29 More dependency clean up... A lot is working now, but the cyclic depe…
egonw authored
446 <antcall target="compile-module"><param name="module" value="swing"/></antcall>
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
447 <antcall target="compile-module"><param name="module" value="qsar"/></antcall>
29687ca Added a CML Customizer interface which reduces the CDK module depende…
egonw authored
448 <antcall target="compile-module"><param name="module" value="qsar-cml"/></antcall>
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
449 <antcall target="compile-module"><param name="module" value="builder3d"/></antcall>
450 <antcall target="compile-module"><param name="module" value="test"/></antcall>
666b237 Ok, next step... getting extra and apps to the new system; lot's of u…
egonw authored
451 <antcall target="compile-module"><param name="module" value="applications"/></antcall>
38401bd Put applications in separate jar.
egonw authored
452 </target>
453
11cc770 build.xml target dist-large now depends on dist-all
steinbeck authored
454 <target id="dist-large" name="dist-large" depends="dist-all"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
455 description="Builds on big jar file for the CDK, including experimental classes.">
c660505 Reworked dist-large target
egonw authored
456
457 <!-- first unjar the CDK and other jars we need -->
458 <delete dir="${build}"/>
459 <mkdir dir="${build}"/>
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -j…
egonw authored
460 <mkdir dir="${appjars.dir}"/>
c660505 Reworked dist-large target
egonw authored
461 <unjar dest="${appjars.dir}">
462 <fileset dir="${lib}">
463 <includesfile name="${metainf}/applications.libdepends"/>
464 <includesfile name="${metainf}/builder3d.libdepends"/>
465 <includesfile name="${metainf}/core.libdepends"/>
466 <includesfile name="${metainf}/data.libdepends"/>
467 <includesfile name="${metainf}/experimental.libdepends"/>
468 <includesfile name="${metainf}/extra.libdepends"/>
469 <includesfile name="${metainf}/io.libdepends"/>
470 <includesfile name="${metainf}/io-jmol.libdepends"/>
471 <includesfile name="${metainf}/libio-cml.libdepends"/>
472 <includesfile name="${metainf}/qsar.libdepends"/>
473 <includesfile name="${metainf}/render.libdepends"/>
474 <includesfile name="${metainf}/standard.libdepends"/>
475 <includesfile name="${metainf}/swing.libdepends"/>
476 </fileset>
477 <fileset dir="${dist}/jar">
478 <include name="cdk-applications.jar"/>
479 <include name="cdk-builder3d.jar"/>
480 <include name="cdk-core.jar"/>
481 <include name="cdk-data.jar"/>
482 <include name="cdk-experimental.jar"/>
483 <include name="cdk-extra.jar"/>
484 <include name="cdk-interfaces.jar"/>
485 <include name="cdk-io.jar"/>
486 <include name="cdk-io-jmol.jar"/>
206145b Added a new module 'pdb' with a new class PDBAtom; PDB fields are now…
egonw authored
487 <include name="cdk-pdb.jar"/>
c660505 Reworked dist-large target
egonw authored
488 <include name="cdk-libio-cml.jar"/>
489 <include name="cdk-qsar.jar"/>
29687ca Added a CML Customizer interface which reduces the CDK module depende…
egonw authored
490 <include name="cdk-qsar-cml.jar"/>
491 <include name="cdk-pdb.jar"/>
492 <include name="cdk-pdb-cml.jar"/>
c660505 Reworked dist-large target
egonw authored
493 <include name="cdk-render.jar"/>
494 <include name="cdk-standard.jar"/>
495 <include name="cdk-swing.jar"/>
496 </fileset>
497 </unjar>
498
499 <!-- then zip up things -->
500 <jar jarfile="${dist}/jar/cdk-${version}.jar">
501 <manifest>
502 <attribute name="Main-Class" value="org.openscience.cdk.applications.DistLargeInfo"/>
503 <section name="org.openscience.cdk">
504 <attribute name="Specification-Title" value="The Chemistry Development Kit"/>
505 <attribute name="Specification-Version" value="1.0"/>
506 <attribute name="Specification-Vendor" value="The CDK Project"/>
507 <attribute name="Implementation-Title" value="org.openscience.cdk"/>
508 <attribute name="Implementation-Version" value="${version}"/>
509 <attribute name="Implementation-Vendor" value="The CDK Project"/>
510 </section>
511 </manifest>
512 <fileset dir="${appjars.dir}">
513 <include name="**/*" />
514 </fileset>
515 </jar>
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -j…
egonw authored
516 </target>
517
8c06c63 Fixed inclusion of .javafiles, .classes, and .set files for easy buil…
egonw authored
518 <target id="sourcedist" name="sourcedist" depends="init, runDoclet"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
519 description="Builds the source packages.">
dccd7d0 Sourcedist making now also uses the defined version
egonw authored
520 <property name="package" value="cdk-source-${version}"/>
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
521 <property name="sourcedist.dir" value="${sourcedist}/${package}"/>
522 <copy todir="${sourcedist.dir}/${src}">
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
523 <fileset dir="${src}" includes="*.javafiles" />
ba078b3 Also include .classes file, otherwise I still won't compile :(
egonw authored
524 <fileset dir="${src}" includes="*.classes" />
8c06c63 Fixed inclusion of .javafiles, .classes, and .set files for easy buil…
egonw authored
525 <fileset dir="${src}" includes="*.set" />
ad5a692 Included *.jj files in sourcedist (closes #888710)
egonw authored
526 <fileset dir="${src}" includes="**/*.java" />
527 <fileset dir="${src}" includes="**/*.jj" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
528 <fileset dir="${src}" includes="org/openscience/cdk/io/cml/data/**" />
529 </copy>
530 <copy todir="${sourcedist.dir}">
7447e16 Getting ready for release
egonw authored
531 <fileset dir="." includes="build.props" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
532 <fileset dir="." includes="build.xml" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
533 <fileset dir="." includes="javadoc.xml" />
534 <fileset dir="." includes="README" />
535 <fileset dir="." includes="CHANGELOG" />
536 </copy>
d6cda7b Distribute LGPL license with sourcecode
egonw authored
537 <copy todir="${sourcedist.dir}/jar">
fbf19c3 The source releases contained unnecessary libraries
egonw authored
538 <fileset dir="jar">
539 <exclude name="libio/*.jar"/>
540 <exclude name="pmd-1.8.jar"/>
541 <exclude name="xalan-2.0.1.jar"/>
542 <exclude name="doccheck.jar"/>
543 <exclude name="dbdoclet*.*"/>
544 </fileset>
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
545 </copy>
998ae6a Updated for current CVS.
egonw authored
546 <copy todir="${sourcedist.dir}/develjar">
547 <fileset dir="develjar">
548 <exclude name="pmd-1.8.jar"/>
549 <exclude name="doccheck.jar"/>
550 <exclude name="dbdoclet*.*"/>
551 </fileset>
552 </copy>
553 <copy todir="${sourcedist.dir}/src/data">
ddebad1 Modified to match new dir struct
egonw authored
554 <fileset dir="src/data" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
555 </copy>
998ae6a Updated for current CVS.
egonw authored
556 <copy todir="${sourcedist.dir}/src/META-INF">
557 <fileset dir="src/META-INF" />
558 </copy>
ad5a692 Included *.jj files in sourcedist (closes #888710)
egonw authored
559 <copy tofile="${sourcedist.dir}/doc/javadoc/source//MakeJavaFilesFilesDoclet.java"
560 file="doc/javadoc/source/MakeJavaFilesFilesDoclet.java"/>
7aa27da Make sure the config.data files get included in the source dist (clos…
egonw authored
561 <copy todir="${sourcedist.dir}/${src}/org/openscience/cdk/config/data/">
562 <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
563 includes="*" />
564 </copy>
a289167 Minor tweak to get distribs working
egonw authored
565 <copy
566 file="${src}/org/openscience/cdk/iupac/generator/data/IUPACNames.properties"
567 tofile="${sourcedist.dir}/${src}/org/openscience/cdk/iupac/generator/data/IUPACNames.properties" />
568 <copy
569 file="${src}/org/openscience/cdk/dict/data/chemical.xml"
570 tofile="${sourcedist.dir}/${src}/org/openscience/cdk/dict/data/chemical.xml" />
571 <copy
572 file="${src}/org/openscience/cdk/dict/data/elements.xml"
573 tofile="${sourcedist.dir}/${src}/org/openscience/cdk/dict/data/elements.xml" />
e2623a3 Added some missing files to the sourcedist
egonw authored
574 <mkdir dir="${sourcedist.dir}/${src}/org/openscience/cdk/qsar/model/data/"/>
575 <copy todir="${sourcedist.dir}/${src}/org/openscience/cdk/qsar/model/data/">
576 <fileset dir="${src}/org/openscience/cdk/qsar/model/data/" includes="*.R"/>
577 </copy>
998ae6a Updated for current CVS.
egonw authored
578 <mkdir dir="${sourcedist.dir}/${src}/org/openscience/cdk/modeling/forcefield/data/"/>
579 <copy todir="${sourcedist.dir}/${src}/org/openscience/cdk/modeling/forcefield/data/">
b566a03 Fixed copying of .prm files.
egonw authored
580 <fileset dir="${src}/org/openscience/cdk/modeling/forcefield/data/" includes="*.prm"/>
998ae6a Updated for current CVS.
egonw authored
581 </copy>
00c2efc Added missing builder3d templates to sourcedist.
egonw authored
582 <mkdir dir="${sourcedist.dir}/${src}/org/openscience/cdk/modeling/builder3d/data/"/>
583 <copy todir="${sourcedist.dir}/${src}/org/openscience/cdk/modeling/builder3d/data/">
584 <fileset dir="${src}/org/openscience/cdk/modeling/builder3d/data/" includes="*.gz"/>
585 </copy>
9496005 Added missing manifest
egonw authored
586 <copy todir="${sourcedist.dir}/${src}/">
587 <fileset dir="${src}/" includes="*.manifest" />
588 </copy>
d6cda7b Distribute LGPL license with sourcecode
egonw authored
589 <mkdir dir="${sourcedist.dir}/doc/" />
590 <copy todir="${sourcedist.dir}/doc/">
591 <fileset dir="doc/" includes="lgpl.license" />
592 </copy>
7447e16 Getting ready for release
egonw authored
593 <mkdir dir="${sourcedist.dir}/doc/javadoc" />
594 <copy todir="${sourcedist.dir}/doc/javadoc">
595 <fileset dir="doc/javadoc" includes="MakeJavaFilesFilesDoclet.class" />
596 <fileset dir="doc/javadoc" includes="MakeCDKSetFilesDoclet.class" />
597 </copy>
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
598 <tar tarfile="${package}.tar" basedir="${sourcedist}/" includes="${package}/**" />
dccd7d0 Sourcedist making now also uses the defined version
egonw authored
599 <gzip zipfile="${package}.tar.gz" src="cdk-source-${version}.tar" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
600 <delete file="${package}.tar" />
601 <zip zipfile="${package}.zip" basedir="${sourcedist}/" includes="${package}/**" />
998ae6a Updated for current CVS.
egonw authored
602 </target>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
603
40c31d0 Fixed more dependency problems: ant clean test-all now works
egonw authored
604 <target id="test-all" name="test-all" depends="test, test-experimental"/>
cd012c0 Added posibility to just check the experimental classes
egonw authored
605
40c31d0 Fixed more dependency problems: ant clean test-all now works
egonw authored
606 <target id="test-experimental" name="test-experimental" depends="noJunit, dist-all"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
607 description="Performs a full JUnit test for the CDK, including experimental classes.">
7f7ea85 Have the experimental JME reader actually compile
egonw authored
608 <mkdir dir="${reports.tests}"/>
60b89d5 Added test suite for cdk-experimental, and moved Association to exper…
egonw authored
609 <junit printsummary="yes" haltonfailure="yes" fork="yes">
610 <classpath>
40c31d0 Fixed more dependency problems: ant clean test-all now works
egonw authored
611 <fileset dir="${dist}/jar">
612 <include name="cdk-*.jar" />
613 </fileset>
60b89d5 Added test suite for cdk-experimental, and moved Association to exper…
egonw authored
614 <fileset dir="${lib}">
615 <include name="*.jar" />
616 </fileset>
9e95b7b Finished splitting devel from user jars
egonw authored
617 <fileset dir="${devellib}">
618 <include name="*.jar" />
619 </fileset>
60b89d5 Added test suite for cdk-experimental, and moved Association to exper…
egonw authored
620 <fileset dir="${lib}/libio">
621 <include name="*.jar" />
622 </fileset>
623 </classpath>
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
624 <test name="org.openscience.cdk.test.ExperimentalClassesTests"
60b89d5 Added test suite for cdk-experimental, and moved Association to exper…
egonw authored
625 haltonfailure="no"
626 todir="${reports.tests}"
0c93d33 Put results of tests for experimental classes in result.experimental.…
egonw authored
627 outfile="result.experimental">
60b89d5 Added test suite for cdk-experimental, and moved Association to exper…
egonw authored
628 <formatter type="brief" />
629 </test>
630 </junit>
40c31d0 Fixed more dependency problems: ant clean test-all now works
egonw authored
631 </target>
60b89d5 Added test suite for cdk-experimental, and moved Association to exper…
egonw authored
632
6fa4411 Fail build process for test (etc) when JUnit is not installed in ANT_…
egonw authored
633 <target id="noJunit" name="noJunit" depends="check" unless="junit.present">
32a84b3 Fixed location of junit.jar
egonw authored
634 <fail message="JUnit is not installed in Ant. Please copy cdk/develjar/junit.jar to ${ant.home}/lib/."/>
6fa4411 Fail build process for test (etc) when JUnit is not installed in ANT_…
egonw authored
635 </target>
636
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
637 <target id="test" name="test" depends="noJunit, dist-all"
638 description="Performs a full JUnit test for the CDK."
639 if="junit.present">
7f7ea85 Have the experimental JME reader actually compile
egonw authored
640 <mkdir dir="${reports.tests}"/>
866bc72 CML is now available for Java1.5 too
egonw authored
641 <junit printsummary="yes" haltonfailure="no" fork="yes" maxmemory="256m">
9344d76 Fork testing, and removed reference to classpaths "." and "${java.cla…
egonw authored
642 <classpath>
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
643 <fileset dir="${dist}/jar">
866bc72 CML is now available for Java1.5 too
egonw authored
644 <include name="*.jar" />
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
645 </fileset>
9344d76 Fork testing, and removed reference to classpaths "." and "${java.cla…
egonw authored
646 <fileset dir="${lib}">
647 <include name="*.jar" />
648 </fileset>
9e95b7b Finished splitting devel from user jars
egonw authored
649 <fileset dir="${devellib}">
650 <include name="*.jar" />
651 </fileset>
9344d76 Fork testing, and removed reference to classpaths "." and "${java.cla…
egonw authored
652 <fileset dir="${lib}/libio">
653 <include name="*.jar" />
654 </fileset>
655 </classpath>
1f14ffa More @cdkPackage completed: dist-test now also works with kaffe
egonw authored
656 <test name="org.openscience.cdk.test.CDKTests"
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
657 haltonfailure="no"
658 todir="${reports.tests}"
659 outfile="result">
81258bd Added Ant task for doing Junit tests on the cdk-core and cdk-standard…
egonw authored
660 <formatter type="brief" />
3790797 Splitted tests which are supposed to fail from those which are suppos…
egonw authored
661 </test>
662 </junit>
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
663 </target>
3790797 Splitted tests which are supposed to fail from those which are suppos…
egonw authored
664
40c31d0 Fixed more dependency problems: ant clean test-all now works
egonw authored
665 <target id="limitations" name="limitations" depends="noJunit, dist-all"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
666 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
667 <junit printsummary="yes" haltonfailure="yes" fork="yes">
668 <classpath>
40c31d0 Fixed more dependency problems: ant clean test-all now works
egonw authored
669 <fileset dir="${dist}/jar">
670 <include name="cdk-*.jar" />
671 </fileset>
3790797 Splitted tests which are supposed to fail from those which are suppos…
egonw authored
672 <fileset dir="${lib}">
673 <include name="*.jar" />
674 </fileset>
9e95b7b Finished splitting devel from user jars
egonw authored
675 <fileset dir="${devellib}">
676 <include name="*.jar" />
677 </fileset>
3790797 Splitted tests which are supposed to fail from those which are suppos…
egonw authored
678 <fileset dir="${lib}/libio">
679 <include name="*.jar" />
680 </fileset>
681 </classpath>
682 <test name="org.openscience.cdk.test.limitations.AlgorithmLimitations"
683 haltonfailure="no"
684 todir="${reports.tests}"
685 outfile="limitations">
686 <formatter type="brief" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
687 </test>
688 </junit>
40c31d0 Fixed more dependency problems: ant clean test-all now works
egonw authored
689 </target>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
690
bd397e8 Run test target should be working too now
egonw authored
691 <target id="run-test" name="run-test" depends="dist-all"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
692 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
693 <echo message="Running test class: testclass=${testclass}"/>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
694 <java classname="org.openscience.cdk.test.${testclass}" fork="yes">
3d88ed4 Turn on CDK debugging while running JUnit test
egonw authored
695 <jvmarg value="-Dcdk.debugging=true"/>
756bd80 When running a specific test (e.g. 'ant -Dtestclass=ringsearch.RingSe…
egonw authored
696 <classpath>
bd397e8 Run test target should be working too now
egonw authored
697 <fileset dir="${dist}/jar/">
698 <include name="*.jar" />
699 </fileset>
756bd80 When running a specific test (e.g. 'ant -Dtestclass=ringsearch.RingSe…
egonw authored
700 <fileset dir="${lib}">
701 <include name="*.jar" />
702 </fileset>
9e95b7b Finished splitting devel from user jars
egonw authored
703 <fileset dir="${devellib}">
704 <include name="*.jar" />
705 </fileset>
756bd80 When running a specific test (e.g. 'ant -Dtestclass=ringsearch.RingSe…
egonw authored
706 <fileset dir="${lib}/libio">
707 <include name="*.jar" />
708 </fileset>
709 </classpath>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
710 </java>
bd397e8 Run test target should be working too now
egonw authored
711 </target>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
712
5b2a8d2 Reintroduced the junit-test target
egonw authored
713 <target id="junit-test" name="junit-test" depends="dist-all, noJunit"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
714 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
715 <echo message="JUnit tests class: testclass=${testclass}"/>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
716 <junit printsummary="yes" haltonfailure="no" fork="yes">
79f7451 Switch debugging on in run-test target
steinbeck authored
717 <jvmarg value="-Dcdk.debugging=true"/>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
718 <jvmarg value="-Dcdk.debug.stdout=true"/>
719 <classpath>
5b2a8d2 Reintroduced the junit-test target
egonw authored
720 <fileset dir="${dist}/jar/">
721 <include name="*.jar" />
722 </fileset>
58425b9 Added use of properties to run target
steinbeck authored
723 <pathelement path="${java.class.path}" />
724 <pathelement location="." />
725 <fileset dir="${lib}">
726 <include name="*.jar" />
727 </fileset>
9e95b7b Finished splitting devel from user jars
egonw authored
728 <fileset dir="${devellib}">
729 <include name="*.jar" />
730 </fileset>
58425b9 Added use of properties to run target
steinbeck authored
731 <fileset dir="${lib}/libio">
732 <include name="*.jar" />
733 </fileset>
734 </classpath>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
735 <test name="org.openscience.cdk.test.${testclass}"
736 haltonfailure="no"
737 todir="${reports.tests}"
738 outfile="result.${testclass}">
739 <formatter type="brief" />
740 </test>
741 </junit>
5b2a8d2 Reintroduced the junit-test target
egonw authored
742 </target>
58425b9 Added use of properties to run target
steinbeck authored
743
676c95b Cleaned up more of the build file
egonw authored
744 <target id="run" name="run" depends="dist-all"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
745 description="Runs an application (org.openscience.cdk.&lt;class>) with -Drunclass=&lt;class>.">
58425b9 Added use of properties to run target
steinbeck authored
746 <java classname="org.openscience.cdk.${runclass}" fork="yes" >
21cfa9b More documentation in AllRingsFinder and FingerPrinter on recent time…
steinbeck authored
747 <!--jvmarg value="-Dcdk.debugging=true"/>
748 <jvmarg value="-Dcdk.debug.stdout=true"/-->
5d724f3 Fix and test for bug 931608
steinbeck authored
749
750 <arg value="${arg1}" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuf…
egonw authored
751 <arg value="${arg2}" />
752 <arg value="${arg3}" />
753 <arg value="${arg4}" />
ac448e9 Nothing happend here.
steinbeck authored
754 <classpath>
40c31d0 Fixed more dependency problems: ant clean test-all now works
egonw authored
755 <fileset dir="${dist}/jar">
756 <include name="*.jar" />
757 </fileset>
8095921 Added rendering of wedged bonds.
egonw authored
758 <fileset dir="${lib}">
759 <include name="*.jar" />
760 </fileset>
761 <fileset dir="${lib}/libio">
762 <include name="*.jar" />
763 </fileset>
764 </classpath>
8713d91 Finished work on basic JOELib <-> CDK convertor.
egonw authored
765 </java>
766 </target>
767
c5eb7ec Added Ant build file.
egonw authored
768 </project>
Something went wrong with that request. Please try again.