Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100755 968 lines (892 sloc) 51.77 kb
ea39d29 More dependency clean up... A lot is working now, but the cyclic depende...
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 build...
egonw authored
3 <property file="build.props"/>
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -jar ...
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
320baea Removed more traces of Java3D
egonw authored
14 <!-- where to find some libraries -->
3a26de3 Made compilation with debug=on customizable.
egonw authored
15 <property name="pathtojoelib" value="../../JoeLib/joelib/" />
16
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
17
3a26de3 Made compilation with debug=on customizable.
egonw authored
18 <!-- directories -->
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
19 <property name="build" value="build" />
bd36ed1 Trial for new build system
egonw authored
20 <property name="build.src" value="${build}/src" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
21 <property name="sourcedist" value="sourcedist" />
22 <property name="dist" value="dist" />
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
23 <property name="doc" value="doc" />
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
24 <property name="src" value="src" />
25 <property name="lib" value="jar" />
9e95b7b Finished splitting devel from user jars
egonw authored
26 <property name="devellib" value="develjar" />
6bcf896 Edited build file in order to reflect the move of the src folder
steinbeck authored
27 <property name="src.tests" value="${src}/org/openscience/cdk/test" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
28 <property name="reports.tests" value="reports" />
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -jar ...
egonw authored
29 <property name="appjars.dir" value="${dist}/appjars" />
bd36ed1 Trial for new build system
egonw authored
30 <property name="metainf" value="${src}/META-INF" />
f7be51f Removed alternative core classes patch offering more detailed debug info
egonw authored
31
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar which ...
egonw authored
32 <!-- class to run for testing-->
33 <property name="testclass" value="CDKTests" />
9bcd183 Fixed default executed application
egonw authored
34 <property name="runclass" value="applications.FileConvertor" />
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar which ...
egonw authored
35 <property name="arg1" value="" />
36 <property name="arg2" value="" />
37 <property name="arg3" value="" />
38 <property name="arg4" value="" />
5c40bcf Removed the check for rJava as we don't strictly need it. Also added a p...
rajarshi authored
39
40 <property environment="env" />
41
42 <target id="info" name="info" depends="check">
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
43 <!-- Gives information about the building process. -->
8f6d674 Fixed after breaking it earlier today
egonw authored
44 <echo message="Platform:" />
7cd4ff8 Added R/SJava found to info target
egonw authored
45 <echo message=" OS: ${os.name}" />
46 <echo message=" Architecture: ${os.arch}" />
47 <echo message=" Version: ${os.version}" />
48 <echo message=" Mac OS/X found: ${isMacOsX}" />
8f6d674 Fixed after breaking it earlier today
egonw authored
49 <echo message="" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info fee...
egonw authored
50 <echo message="Java/Ant Environment:" />
7cd4ff8 Added R/SJava found to info target
egonw authored
51 <echo message=" Java version: ${java.version}" />
52 <echo message=" Java vendor: ${java.vendor}" />
53 <echo message=" Java dir: ${java.home}" />
54 <echo message=" Java ext dir: ${java.ext.dirs}" />
55 <echo message=" Ant version: ${ant.version}" />
56 <echo message=" ${ANT_HOME}: ${ant.home}" />
57 <echo message=" hasAnt16: ${hasAnt16}" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info fee...
egonw authored
58 <echo message="" />
c1e01f8 Added support for gjdoc
egonw authored
59 <echo message="JavaDoc Environment:" />
60 <echo message=" SUN JavaDoc: ${sunJavaDoc}" />
61 <echo message=" gjdoc JavaDoc: ${gjdocJavaDoc}" />
62 <echo message="" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info fee...
egonw authored
63 <echo message="CDK Environment:" />
7cd4ff8 Added R/SJava found to info target
egonw authored
64 <echo message=" CDK version: ${version}" />
65 <echo message=" build.xml: $Id$" />
6d246fd Fixed detection of class binaries of Doclets required to compile the CDK
egonw authored
66 <echo message=" Doclets found: ${docletsAreCompiled}" />
5a470af Added detection of Jmol, and added comments on optionality of libs
egonw authored
67 <echo message=" Junit found: ${junit.present}" />
cc68a07 Added detection of more third party libraries
egonw authored
68 <echo message=" --- required libraries ---" />
69 <echo message=" Vecmath found: ${vecmath.present}" />
70 <echo message=" Log4j found: ${log4j.present}" />
71 <echo message=" JGraphT found: ${jgrapht.present}" />
5a470af Added detection of Jmol, and added comments on optionality of libs
egonw authored
72 <echo message=" --- distributed libraries ---" />
cc68a07 Added detection of more third party libraries
egonw authored
73 <echo message=" Batik found: ${batik.present}" />
7cd4ff8 Added R/SJava found to info target
egonw authored
74 <echo message=" CMLDOM found: ${cmllibs.present}" />
cc68a07 Added detection of more third party libraries
egonw authored
75 <echo message=" DADML found: ${dadml.present}" />
76 <echo message=" JAI found: ${jai.present}" />
77 <echo message=" JavaHelp found: ${javahelp.present}" />
78 <echo message=" XIndice found: ${xindice.present}"/>
5a470af Added detection of Jmol, and added comments on optionality of libs
egonw authored
79 <echo message=" --- optional libraries ---" />
81cab20 Added Ant target for compiling 'optional' modules
egonw authored
80 <echo message=" Jmol found: ${jmol.present}" />
5a470af Added detection of Jmol, and added comments on optionality of libs
egonw authored
81 <echo message=" JOELib found: ${joelib.present}" />
cc68a07 Added detection of more third party libraries
egonw authored
82 <echo message=" R/SJava found: ${rispresent}"/>
2f3eee0 Adapted to provide for a customizable patch scheme
egonw authored
83 <echo message="" />
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
84 <echo message="Compiling:" />
7cd4ff8 Added R/SJava found to info target
egonw authored
85 <echo message=" for: ${build.compiler}" />
86 <echo message=" debug: ${debug}" />
87 <echo message=" deprecation: ${deprecation}" />
88 <echo message=" optimization: ${optimization}" />
5c40bcf Removed the check for rJava as we don't strictly need it. Also added a p...
rajarshi authored
89 <echo message=" skipDoclet: ${doSkipDoclet}" />
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
90 </target>
91
8f6d674 Fixed after breaking it earlier today
egonw authored
92 <target id="checkPlatforms" name="checkPlatforms">
58405cf Fixed build.xml to allow compile of doclets on MacOS/X (closes #1001497)
egonw authored
93 <condition property="isMacOsX">
94 <and>
95 <os family="mac"/>
96 <os family="unix"/>
97 </and>
98 </condition>
99 </target>
100
8f6d674 Fixed after breaking it earlier today
egonw authored
101 <target id="check" name="check" depends="checkPlatforms">
cc68a07 Added detection of more third party libraries
egonw authored
102 <!-- Check wether Doclets are compiled and output is generated -->
6d246fd Fixed detection of class binaries of Doclets required to compile the CDK
egonw authored
103 <condition property="docletsAreCompiled">
104 <and>
efbfe43 Fixed 'doclets-are-compiled' detection
egonw authored
105 <available classname="net.sf.cdk.tools.MakeJavaFilesFilesDoclet" classpath="${doc}/javadoc"/>
106 <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
107 </and>
108 </condition>
cc68a07 Added detection of more third party libraries
egonw authored
109 <uptodate property="dotjavafiles.uptodate"
110 targetfile="${src}/core.javafiles">
111 <srcfiles dir="${src}" includes="**/*.java" />
112 </uptodate>
113 <condition property="dotjjfiles.uptodate">
114 <and>
115 <uptodate property="NomParserJavafiles.uptodate"
116 targetfile="${src}/org/openscience/cdk/iupac/parser/NomParser.java">
117 <srcfiles dir="${src}" includes="org/openscience/cdk/iupac/parser/NomParser.jj" />
118 </uptodate>
119 <uptodate property="SMARTSParserJavafiles.uptodate"
120 targetfile="${src}/org/openscience/cdk/smiles/smarts/SMARTSParser.java">
121 <srcfiles dir="${src}" includes="org/openscience/cdk/smiles/smarts/SMARTSParser.jj" />
122 </uptodate>
123 </and>
124 </condition>
125 <condition property="doSkipDoclet">
126 <equals arg1="${skipDoclet}" arg2="true"/>
127 </condition>
128
129 <!-- Checks which parts of CDK can be build. -->
130
131 <!-- test for optional jars -->
132 <available property="vecmath.present"
133 file="${lib}/vecmath1.2-1.14.jar"/>
134 <available property="log4j.present"
135 file="${lib}/log4j.jar"/>
136 <available property="jgrapht.present"
152e213 Updated for recent upgrades to Jumbo 5.2 and JGraphT 0.6.0
egonw authored
137 file="${lib}/jgrapht-0.6.0.jar"/>
cc68a07 Added detection of more third party libraries
egonw authored
138
139 <!-- test for optional jars -->
140 <condition property="batik.present">
141 <and>
142 <available file="${lib}/batik-awt-util.jar"/>
143 <available file="${lib}/batik-dom.jar"/>
144 <available file="${lib}/batik-svggen.jar"/>
145 <available file="${lib}/batik-util.jar"/>
146 <available file="${lib}/batik-xml.jar"/>
147 </and>
148 </condition>
149 <condition property="cmllibs.present">
150 <or>
152e213 Updated for recent upgrades to Jumbo 5.2 and JGraphT 0.6.0
egonw authored
151 <available file="${lib}/jumbo52.jar"/>
cc68a07 Added detection of more third party libraries
egonw authored
152 </or>
153 </condition>
154 <available property="dadml.present"
155 file="${lib}/dadml.jar"/>
156 <condition property="jai.present">
157 <and>
158 <available file="${lib}/jai_codec.jar"/>
159 <available file="${lib}/jai_core.jar"/>
160 </and>
161 </condition>
162 <available property="javahelp.present"
163 file="${lib}/jh.jar"/>
164 <available property="joelib.present"
165 classname="joelib.molecule.JOEAtom"
166 classpath="${lib}/libio/joelib.jar"/>
167 <available property="jmol.present"
168 classname="org.jmol.api.JmolAdapter"
169 classpath="${lib}/jmolApis.jar"/>
170 <available property="junit.present"
171 classname="junit.framework.TestCase"
172 classpath="${ant.home}/lib/junit.jar"/>
173 <condition property="rispresent">
174 <and>
175 <or>
176 <available file="/usr/bin/R" />
177 <available file="/usr/local/bin/R"/>
178 </or>
179 </and>
180 </condition>
181 <condition property="xindice.present">
182 <and>
183 <available file="${lib}/xindice.jar"/>
184 <available file="${lib}/xmldb.jar"/>
185 </and>
186 </condition>
187
188 <!-- test Ant version -->
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
189 <condition property="hasAnt16">
190 <contains string="${ant.version}" substring="1.6"/>
191 </condition>
cc68a07 Added detection of more third party libraries
egonw authored
192
193 <!-- test Java version -->
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
194 <condition property="isJava13">
195 <contains string="${java.version}" substring="1.3"/>
196 </condition>
197 <condition property="isJava14">
198 <contains string="${java.version}" substring="1.4"/>
199 </condition>
866bc72 CML is now available for Java1.5 too
egonw authored
200 <condition property="isJava15">
201 <contains string="${java.version}" substring="1.5"/>
202 </condition>
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
203 <condition property="isJava14+">
204 <or>
205 <contains string="${java.version}" substring="1.4"/>
206 <contains string="${java.version}" substring="1.5"/>
207 </or>
208 </condition>
209 <condition property="isJava15">
210 <contains string="${java.version}" substring="1.5"/>
211 </condition>
cc68a07 Added detection of more third party libraries
egonw authored
212
213 <!-- testing which JavaDoc is present -->
b23a50f Hopefully fixed Rajarshi's problem
egonw authored
214 <condition property="sunJavaDocInExt">
c1e01f8 Added support for gjdoc
egonw authored
215 <or>
216 <available file="${java.ext.dirs}/tools.jar" />
b23a50f Hopefully fixed Rajarshi's problem
egonw authored
217 </or>
218 </condition>
219 <condition property="sunJavaDocInLib">
220 <or>
221 <available file="${java.home}/lib/tools.jar" />
f2b2a90 Applied Rajarshi's patch: gcj+gjdoc still works
egonw authored
222 <available file="${java.home}/../lib/tools.jar" />
c1e01f8 Added support for gjdoc
egonw authored
223 </or>
224 </condition>
c7c3815 Another attempt for get the doclets compiled properly on gjdoc *and* sun...
egonw authored
225 <condition property="sunJavaDoc">
226 <or>
227 <available file="${java.ext.dirs}/tools.jar" />
278e9e1 Missed a ../lib case for the sun JavaDoc problem. Fixed
rajarshi authored
228 <available file="${java.home}/../lib/tools.jar" />
c7c3815 Another attempt for get the doclets compiled properly on gjdoc *and* sun...
egonw authored
229 </or>
230 </condition>
c1e01f8 Added support for gjdoc
egonw authored
231 <condition property="gjdocJavaDoc">
232 <available file="/usr/share/java/gnu-classpath-tools-gjdoc.jar" />
233 </condition>
cc68a07 Added detection of more third party libraries
egonw authored
234
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
235 </target>
236
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
237
d2ed020 Reworked dependencies
egonw authored
238 <target id="init" name="init" depends="check, setupBuildDir"/>
4302fbf Updated for Jumbo50 transition.
egonw authored
239 <target id="customize" name="customize" depends="javacc"/>
866bc72 CML is now available for Java1.5 too
egonw authored
240
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
241 <target id="setupBuildDir" name="setupBuildDir">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
242 <tstamp />
243 <mkdir dir="${build}" />
244 <mkdir dir="${sourcedist}" />
245 <mkdir dir="${dist}" />
246 <mkdir dir="${reports.tests}" />
247 </target>
248
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
249 <target id="clean" name="clean" description="Removes autogenerated files.">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
250 <delete>
24af772 Delete autogenerated .javafiles in clean target
egonw authored
251 <fileset dir="." includes="**/*~" />
252 <fileset dir="." includes="*.tar.gz" />
253 <fileset dir="." includes="*.zip" />
06ee5d1 Modified the clean target to remove .rda files generated during testing ...
rajarshi authored
254 <fileset dir="." includes="*.rda" />
24af772 Delete autogenerated .javafiles in clean target
egonw authored
255 <fileset dir="${src}" includes="*.classes" />
df95df5 Don't delete the *.javafiles from CVS
egonw authored
256 <fileset dir="${src}" includes="*.javafiles">
257 <exclude name="jmol*.javafiles" />
258 </fileset>
bfe0e17 Build interfaces before data
egonw authored
259 <fileset dir="${src}" includes="*.entitylist" />
5ad21a8 Fixed building CDK with Ant 1.5.x
egonw authored
260 <!-- remove java files generated with JavaCC -->
261 <fileset dir="${src}/org/openscience/cdk/smiles/smarts" includes="*.java" />
262 <fileset dir="${src}/org/openscience/cdk/iupac/parser" includes="*.java">
263 <!-- the next are from CVS -->
264 <exclude name="AttachedGroup.java" />
265 <exclude name="MoleculeBuilder.java" />
266 </fileset>
2b81a22 Fixed a problem with deleting the doclet classes
egonw authored
267 <fileset dir="${doc}">
268 <include name="javadoc/net/sf/cdk/tools/*.class" />
269 </fileset>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
270 </delete>
271
272 <delete dir="${build}" />
273 <delete dir="${sourcedist}" />
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
274 <delete dir="${dist}" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
275 <delete dir="${reports.tests}" />
276 </target>
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
277
6d246fd Fixed detection of class binaries of Doclets required to compile the CDK
egonw authored
278 <target name="compileDoclet" id="compileDoclet" depends="check" unless="docletsAreCompiled">
279 <echo>Compiling doclets in doc/javadoc that are required for compiling CDK...</echo>
280 <antcall target="compileDoclet.MacOSX"/>
c7c3815 Another attempt for get the doclets compiled properly on gjdoc *and* sun...
egonw authored
281 <antcall target="compileDoclet.gjDoc" />
282 <antcall target="compileDoclet.sunJavaDoc" />
6d246fd Fixed detection of class binaries of Doclets required to compile the CDK
egonw authored
283 </target>
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info fee...
egonw authored
284
285 <target name="compileDoclet.MacOSX" id="compileDoclet.MacOSX" if="isMacOsX">
286 <javac srcdir="doc/javadoc/source" destdir="doc/javadoc"
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g. de...
egonw authored
287 includes="MakeJavaFilesFilesDoclet.java, MakeCDKSetFilesDoclet.java" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info fee...
egonw authored
288 </target>
289
c7c3815 Another attempt for get the doclets compiled properly on gjdoc *and* sun...
egonw authored
290 <target name="compileDoclet.sunJavaDoc" id="compileDoclet.sunJavaDoc" if="sunJavaDoc" unless="isMacOsX">
ca98ea5 Refactored build process (closes #883519)
egonw authored
291 <javac srcdir="doc/javadoc/source" destdir="doc/javadoc"
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g. de...
egonw authored
292 includes="MakeJavaFilesFilesDoclet.java, MakeCDKSetFilesDoclet.java">
ca98ea5 Refactored build process (closes #883519)
egonw authored
293 <classpath>
c1e01f8 Added support for gjdoc
egonw authored
294 <fileset dir="${java.ext.dirs}">
c7c3815 Another attempt for get the doclets compiled properly on gjdoc *and* sun...
egonw authored
295 <include name="tools.jar" if="sunJavaDocInExt"/>
b23a50f Hopefully fixed Rajarshi's problem
egonw authored
296 </fileset>
297 <fileset dir="${java.home}/lib">
c7c3815 Another attempt for get the doclets compiled properly on gjdoc *and* sun...
egonw authored
298 <include name="tools.jar" if="sunJavaDocInLib"/>
c1e01f8 Added support for gjdoc
egonw authored
299 </fileset>
b534185 More fixes: ../lib in both required places, and commented out java1.4 be...
egonw authored
300 <fileset dir="${java.home}/../lib">
301 <include name="tools.jar" if="sunJavaDocInLib"/>
302 </fileset>
ca98ea5 Refactored build process (closes #883519)
egonw authored
303 </classpath>
304 </javac>
305 </target>
306
c7c3815 Another attempt for get the doclets compiled properly on gjdoc *and* sun...
egonw authored
307 <target name="compileDoclet.gjDoc" id="compileDoclet.gjDoc" if="gjdocJavaDoc">
308 <javac srcdir="doc/javadoc/source" destdir="doc/javadoc"
309 includes="MakeJavaFilesFilesDoclet.java, MakeCDKSetFilesDoclet.java">
310 <classpath>
311 <fileset dir="/usr/share/java">
312 <include name="com-sun-javadoc.jar" if="gjdocJavaDoc"/>
313 </fileset>
314 </classpath>
315 </javac>
316 </target>
317
9012143 Reworked dependencies a bit, fixing the -DskipDoclet option
egonw authored
318 <target name="runDoclet" id="runDoclet"
319 depends="check, customize" unless="doSkipDoclet">
320 <echo>Not skipping doclet run...</echo>
321 <antcall target="reallyRunDoclet"/>
322 <antcall target="failIfNoDocletResults"/>
323 </target>
2583a62 Added better output about missing src/*.javafiles
egonw authored
324
676c95b Cleaned up more of the build file
egonw authored
325 <target name="checkDocletResults" id="checkDocletResults">
2583a62 Added better output about missing src/*.javafiles
egonw authored
326 <condition property="dotjavafiles.uptodate">
327 <and>
3148e46 Moved the former core module classes to the data module, and the Logging...
egonw authored
328 <available file="${src}/data.javafiles" />
2583a62 Added better output about missing src/*.javafiles
egonw authored
329 <available file="${src}/core.javafiles" />
330 <available file="${src}/standard.javafiles" />
331 <available file="${src}/extra.javafiles" />
332 <available file="${src}/io.javafiles" />
333 </and>
334 </condition>
335 </target>
336
676c95b Cleaned up more of the build file
egonw authored
337 <target name="failIfNoDocletResults" id="failIfNoDocletResults" depends="checkDocletResults" unless="dotjavafiles.uptodate">
2583a62 Added better output about missing src/*.javafiles
egonw authored
338 <fail>
339 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 probl...
egonw authored
340 Often this is caused by malformed java source code, so please check the output
341 of the reallyRunDoclet target (ant reallyRunDoclet).
342
343 If there is no reported source code error, please report this to
344 cdk-devel@lists.sf.net and send the output of
2583a62 Added better output about missing src/*.javafiles
egonw authored
345 this command: ant -v info runDoclet.
346 </fail>
347 </target>
348
676c95b Cleaned up more of the build file
egonw authored
349 <target name="reallyRunDoclet" id="reallyRunDoclet" depends="compileDoclet" unless="dotjavafiles.uptodate">
3ec097a Modified the reallyRunDoclet task so that it considers all classes (publ...
rajarshi authored
350 <javadoc private="true" maxmemory="128m">
6dc1be4 Less complaining when running MakeJavaFilesFilesDoclet
egonw authored
351 <classpath>
6e42787 Moved render and io to new system
egonw authored
352 <fileset dir="${lib}">
353 <include name="*.jar" />
42ca7fe Don't include class format 49.0 depending jars if not running Java 1.5.
egonw authored
354 <!-- some jars require some Java version -->
355 <exclude name="jumbo50.jar" unless="isJava15"/>
6e42787 Moved render and io to new system
egonw authored
356 </fileset>
6dc1be4 Less complaining when running MakeJavaFilesFilesDoclet
egonw authored
357 <fileset dir="${lib}/libio">
358 <include name="*.jar" />
359 </fileset>
b1187d4 The devel libs are needed when running the doclets too
egonw authored
360 <fileset dir="${devellib}">
361 <include name="*.jar" />
362 </fileset>
6dc1be4 Less complaining when running MakeJavaFilesFilesDoclet
egonw authored
363 </classpath>
364
23408ac Put classes in a package (closes #1323761).
egonw authored
365 <doclet name="net.sf.cdk.tools.MakeJavaFilesFilesDoclet" path="${doc}/javadoc"/>
24af772 Delete autogenerated .javafiles in clean target
egonw authored
366
026da28 Removed last trace of patch system: compile errors in IDE tools work aga...
egonw authored
367 <packageset dir="${src}">
ca98ea5 Refactored build process (closes #883519)
egonw authored
368 <include name="org/openscience/cdk/**"/>
369 </packageset>
6dc1be4 Less complaining when running MakeJavaFilesFilesDoclet
egonw authored
370
ca98ea5 Refactored build process (closes #883519)
egonw authored
371 </javadoc>
3ec097a Modified the reallyRunDoclet task so that it considers all classes (publ...
rajarshi authored
372 <javadoc private="true" maxmemory="128m">
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g. de...
egonw authored
373 <classpath>
6e42787 Moved render and io to new system
egonw authored
374 <fileset dir="${lib}">
375 <include name="*.jar" />
42ca7fe Don't include class format 49.0 depending jars if not running Java 1.5.
egonw authored
376 <!-- some jars require some Java version -->
377 <exclude name="jumbo50.jar" unless="isJava15"/>
6e42787 Moved render and io to new system
egonw authored
378 </fileset>
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g. de...
egonw authored
379 <fileset dir="${lib}/libio">
380 <include name="*.jar" />
381 </fileset>
b1187d4 The devel libs are needed when running the doclets too
egonw authored
382 <fileset dir="${devellib}">
383 <include name="*.jar" />
384 </fileset>
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g. de...
egonw authored
385 </classpath>
386
23408ac Put classes in a package (closes #1323761).
egonw authored
387 <doclet name="net.sf.cdk.tools.MakeCDKSetFilesDoclet" path="${doc}/javadoc"/>
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g. de...
egonw authored
388
389 <packageset dir="${src}">
390 <include name="org/openscience/cdk/**"/>
391 </packageset>
392
393 </javadoc>
0bbfc90 Removed Viewer application. Use JChemPaint (jchempaint.sf.net) or Jmol (...
egonw authored
394 <move todir="${src}" failonerror="true">
ca98ea5 Refactored build process (closes #883519)
egonw authored
395 <fileset dir=".">
396 <include name="*.javafiles"/>
0c049c7 Further work on new build system: all packages compile, but target test-...
egonw authored
397 <include name="*.classes"/>
da8d319 Implemented @cdk.set to define sets of certain types of classes, e.g. de...
egonw authored
398 <include name="*.set"/>
46a17d2 Clean entity lists
egonw authored
399 <include name="*.entitylist"/>
ca98ea5 Refactored build process (closes #883519)
egonw authored
400 </fileset>
401 </move>
402 </target>
403
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
404 <target id="compile-needed-test" name="compile-needed-test">
405 <uptodate property="module-uptodate" targetfile="${dist}/jar/cdk-${module}.jar">
406 <srcfiles dir="${src}">
407 <includesfile name="${src}/${module}.javafiles"/>
408 </srcfiles>
409 </uptodate>
410 </target>
9012143 Reworked dependencies a bit, fixing the -DskipDoclet option
egonw authored
411
412 <target id="compile-init" name="compile-init"
b0f7700 Checks are really needed a bit more often to ensure that some variable a...
egonw authored
413 depends="init, check, runDoclet"/>
9012143 Reworked dependencies a bit, fixing the -DskipDoclet option
egonw authored
414
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
415 <target id="compile-module" name="compile-module"
b0f7700 Checks are really needed a bit more often to ensure that some variable a...
egonw authored
416 depends="check, dist.init, compile-needed-test"
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
417 unless="module-uptodate">
418
bd36ed1 Trial for new build system
egonw authored
419 <echo message="Compiling classes for CDK's ${module} module." />
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
420
421 <!-- check for availability for meta info files -->
422 <available file="${metainf}/${module}.datafiles" property="module.datafiles.present"/>
cd4dbe5 Added hook for extra files outside the src/ directory, solving the remai...
egonw authored
423 <available file="${metainf}/${module}.extrafiles" property="module.extrafiles.present"/>
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
424 <available file="${metainf}/${module}.cdkdepends" property="module.cdkdepends.present"/>
425 <available file="${metainf}/${module}.libdepends" property="module.libdepends.present"/>
ea39d29 More dependency clean up... A lot is working now, but the cyclic depende...
egonw authored
426 <available file="${metainf}/${module}.devellibdepends" property="module.devellibdepends.present"/>
bd36ed1 Trial for new build system
egonw authored
427
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
428 <!-- be somewhat informative -->
429 <echo message="Datafiles defined: ${module.datafiles.present}"/>
cd4dbe5 Added hook for extra files outside the src/ directory, solving the remai...
egonw authored
430 <echo message="Extra files defined: ${module.extrafiles.present}"/>
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
431 <echo message="CDK dependencies defined: ${module.cdkdepends.present}"/>
432 <echo message="Library dependencies defined: ${module.libdepends.present}"/>
ea39d29 More dependency clean up... A lot is working now, but the cyclic depende...
egonw authored
433 <echo message="Developer Library dependencies defined: ${module.devellibdepends.present}"/>
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
434
bd36ed1 Trial for new build system
egonw authored
435 <!-- normally javac compiles not just the given files, but also missing
436 classes that are in the same src/ directory. By making a copy first,
437 we explicitely make it impossible to compile files that are not
438 marked for a specific module -->
51ac13a Also delete .class files as they mess up CDK dependency cleanless too
egonw authored
439 <delete dir="${build}"/>
440 <mkdir dir="${build}"/>
bd36ed1 Trial for new build system
egonw authored
441 <mkdir dir="${build.src}"/>
442 <copy todir="${build.src}">
443 <fileset dir="${src}">
927c067 Don't copy files it cannot compile either, fixing another set of build d...
egonw authored
444 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
b534185 More fixes: ../lib in both required places, and commented out java1.4 be...
egonw authored
445 <!-- excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/ -->
6ceda47 Make sure to exclude java sources that depend on Java 1.5 if not compili...
egonw authored
446 <excludesfile name="${src}/java1.5.javafiles" unless="isJava15"/>
927c067 Don't copy files it cannot compile either, fixing another set of build d...
egonw authored
447 <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
448 <excludesfile name="${src}/r-project.javafiles" unless="rispresent"/>
6e04e94 Conditionally compile JAI depending classes.
egonw authored
449 <excludesfile name="${src}/jai.javafiles" unless="jai.present"/>
5370376 Conditionally compile DADML depending classes.
egonw authored
450 <excludesfile name="${src}/dadml.javafiles" unless="dadml.present"/>
41cb46c Conditionally compile JavaHelp depending classes.
egonw authored
451 <excludesfile name="${src}/javahelp.javafiles" unless="javahelp.present"/>
cd7c194 Conditionally compile XIndice depending classes.
egonw authored
452 <excludesfile name="${src}/xindice.javafiles" unless="xindice.present"/>
927c067 Don't copy files it cannot compile either, fixing another set of build d...
egonw authored
453
bd36ed1 Trial for new build system
egonw authored
454 <includesfile name="${src}/${module}.javafiles"/>
455 </fileset>
456 </copy>
457
458 <!-- ok, now that we have a copy, compile this copy -->
459 <javac srcdir="${build.src}" destdir="${build}" optimize="${optimization}"
03a7837 merge with jcp21
shk3 authored
460 debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3">
bd36ed1 Trial for new build system
egonw authored
461 <classpath>
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
462 <fileset dir="${lib}" >
463 <exclude name="**/*" unless="module.libdepends.present" />
464 <includesfile name="${metainf}/${module}.libdepends" if="module.libdepends.present" />
bd36ed1 Trial for new build system
egonw authored
465 </fileset>
ea39d29 More dependency clean up... A lot is working now, but the cyclic depende...
egonw authored
466 <fileset dir="${devellib}">
467 <exclude name="**/*" unless="module.devellibdepends.present" />
468 <includesfile name="${metainf}/${module}.devellibdepends" if="module.devellibdepends.present" />
469 </fileset>
bd36ed1 Trial for new build system
egonw authored
470 <fileset dir="${dist}/jar">
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
471 <exclude name="**/*" unless="module.cdkdepends.present" />
472 <includesfile name="${metainf}/${module}.cdkdepends" if="module.cdkdepends.present" />
bd36ed1 Trial for new build system
egonw authored
473 </fileset>
474 </classpath>
475
476 <excludesfile name="${src}/java1.4+.javafiles" if="isJava13"/>
b534185 More fixes: ../lib in both required places, and commented out java1.4 be...
egonw authored
477 <!-- excludesfile name="${src}/java1.4.javafiles" unless="isJava14"/ -->
6ceda47 Make sure to exclude java sources that depend on Java 1.5 if not compili...
egonw authored
478 <excludesfile name="${src}/java1.5.javafiles" unless="isJava15"/>
bd36ed1 Trial for new build system
egonw authored
479 <excludesfile name="${src}/ant1.6.javafiles" unless="hasAnt16"/>
676c95b Cleaned up more of the build file
egonw authored
480 <excludesfile name="${src}/r-project.javafiles" unless="rispresent"/>
5370376 Conditionally compile DADML depending classes.
egonw authored
481 <excludesfile name="${src}/jai.javafiles" unless="jai.present"/>
482 <excludesfile name="${src}/dadml.javafiles" unless="dadml.present"/>
41cb46c Conditionally compile JavaHelp depending classes.
egonw authored
483 <excludesfile name="${src}/javahelp.javafiles" unless="javahelp.present"/>
cd7c194 Conditionally compile XIndice depending classes.
egonw authored
484 <excludesfile name="${src}/xindice.javafiles" unless="xindice.present"/>
bd36ed1 Trial for new build system
egonw authored
485
486 <includesfile name="${src}/${module}.javafiles"/>
487 </javac>
488
489 <!-- and then jar things up into the module jar -->
490 <jar jarfile="${dist}/jar/cdk-${module}.jar">
491 <fileset dir="${build}">
492 <includesfile name="${src}/${module}.classes" />
493 <excludesfile name="${src}/java1.4+.classes" if="isJava13"/>
b534185 More fixes: ../lib in both required places, and commented out java1.4 be...
egonw authored
494 <!-- excludesfile name="${src}/java1.4.classes" unless="isJava14"/ -->
6ceda47 Make sure to exclude java sources that depend on Java 1.5 if not compili...
egonw authored
495 <excludesfile name="${src}/java1.5.classes" unless="isJava15"/>
bd36ed1 Trial for new build system
egonw authored
496 <excludesfile name="${src}/ant1.6.classes" unless="hasAnt16"/>
5370376 Conditionally compile DADML depending classes.
egonw authored
497 <excludesfile name="${src}/r-project.javafiles" unless="rispresent"/>
498 <excludesfile name="${src}/jai.javafiles" unless="jai.present"/>
499 <excludesfile name="${src}/dadml.javafiles" unless="dadml.present"/>
41cb46c Conditionally compile JavaHelp depending classes.
egonw authored
500 <excludesfile name="${src}/javahelp.javafiles" unless="javahelp.present"/>
cd7c194 Conditionally compile XIndice depending classes.
egonw authored
501 <excludesfile name="${src}/xindice.javafiles" unless="xindice.present"/>
bd36ed1 Trial for new build system
egonw authored
502 </fileset>
503 <fileset dir="${src}">
504 <include name="${module}.javafiles" />
505 </fileset>
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
506 <fileset dir="${src}">
141cf36 Fixed problem with including data files in the module jars
egonw authored
507 <exclude name="**/*" unless="module.datafiles.present"/>
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
508 <includesfile name="${metainf}/${module}.datafiles" if="module.datafiles.present" />
509 </fileset>
ddebad1 Modified to match new dir struct
egonw authored
510 <fileset dir="${src}">
cd4dbe5 Added hook for extra files outside the src/ directory, solving the remai...
egonw authored
511 <exclude name="**/*" unless="module.extrafiles.present"/>
512 <includesfile name="${metainf}/${module}.extrafiles" if="module.extrafiles.present" />
513 </fileset>
bd36ed1 Trial for new build system
egonw authored
514 </jar>
515 </target>
516
6dc5408 Added stuff for qsar module
egonw authored
517 <!-- 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
518 <target id="javacc" name="javacc" depends="init, check" if="hasAnt16" unless="dotjjfiles.uptodate">
5ad21a8 Fixed building CDK with Ant 1.5.x
egonw authored
519 <echo message="Compiling Ant 1.6 depending classes." />
cd49d3a A bit of comment
egonw authored
520 <!-- the IUPAC name parser -->
1dd9647 Added IUPAC name parser
stomkinson authored
521 <delete>
522 <fileset id="javacc-generated"
cd49d3a A bit of comment
egonw authored
523 dir="${src}/org/openscience/cdk/iupac/parser/"
524 includes="NomParser*.java,ParseException.java,SimpleCharStream.java,Token.java,TokenMgrError.java"/>
1dd9647 Added IUPAC name parser
stomkinson authored
525 </delete>
526 <javacc target="${src}/org/openscience/cdk/iupac/parser/NomParser.jj"
026da28 Removed last trace of patch system: compile errors in IDE tools work aga...
egonw authored
527 outputdirectory="${src}/org/openscience/cdk/iupac/parser/"
1dd9647 Added IUPAC name parser
stomkinson authored
528 javacchome="${lib}"/>
2fa9ba9 Forgot to upload the updated build.xml
egonw authored
529 <delete>
530 <fileset id="javacc-generated"
531 dir="${src}/org/openscience/cdk/smiles/smarts/"
532 includes="*.java"/>
533 </delete>
534 <javacc target="${src}/org/openscience/cdk/smiles/smarts/SMARTSParser.jj"
535 outputdirectory="${src}/org/openscience/cdk/smiles/smarts/"
536 javacchome="${lib}"/>
1dd9647 Added IUPAC name parser
stomkinson authored
537 </target>
8095921 Added rendering of wedged bonds.
egonw authored
538
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
539 <target id="dist.init" name="dist.init">
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
540 <mkdir dir="${dist}/jar" />
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
541 </target>
d313d03 Also include cml.dtd in normal jar.
egonw authored
542
81cab20 Added Ant target for compiling 'optional' modules
egonw authored
543 <target id="dist-joelib" name="dist-joelib" depends="nocompile-joelib, compile-joelib"/>
544 <target id="nocompile-joelib" name="nocompile-joelib" unless="${joelib.present}">
545 <echo message="JOELib is not found. Removed depending functionality. JOELib can be downloaded from http://joelib.sf.net/."/>
546 </target>
547 <target id="compile-joelib" name="compile-joelib" if="${joelib.present}">
548 <antcall target="compile-module"><param name="module" value="libio-joelib"/></antcall>
549 </target>
550
551 <target id="dist-jmol" name="dist-jmol" depends="nocompile-jmol, compile-jmol"/>
552 <target id="nocompile-jmol" name="nocompile-jmol" unless="${jmol.present}">
553 <echo message="Jmol is not found. Removed depending functionality. Jmol can be downloaded from http://www.jmol.org/."/>
554 </target>
555 <target id="compile-jmol" name="compile-jmol" if="${jmol.present}">
556 <antcall target="compile-module"><param name="module" value="io-jmol"/></antcall>
557 </target>
558
559 <target id="dist-java3d" name="dist-java3d" depends="nocompile-java3d, compile-java3d"/>
560 <target id="nocompile-java3d" name="nocompile-java3d" unless="${java3d.present}">
561 <echo message="Java3d is not found. Removed depending functionality. Java3d can be downloaded from http://java.sun.com/."/>
562 </target>
563 <target id="compile-java3d" name="compile-java3d" if="${java3d.present}">
564 <antcall target="compile-module"><param name="module" value="java3d"/></antcall>
565 </target>
566
567 <target id="dist-optional" name="dist-optional" depends="dist-all"
568 description="Compile CDK modules that require optional libraries">
569 <antcall target="dist-java3d"/>
570 <antcall target="dist-jmol"/>
571 <antcall target="dist-joelib"/>
572 </target>
fe65a98 Fixed dependencies
egonw authored
573
574 <target id="dist-all" name="dist-all" description="dist-all">
9012143 Reworked dependencies a bit, fixing the -DskipDoclet option
egonw authored
575 <antcall target="compile-init"/>
bfe0e17 Build interfaces before data
egonw authored
576 <antcall target="compile-module"><param name="module" value="interfaces"/></antcall>
c378f2b Synched indentation
egonw authored
577 <antcall target="compile-module"><param name="module" value="core"/></antcall>
676c95b Cleaned up more of the build file
egonw authored
578 <antcall target="compile-module"><param name="module" value="standard"/></antcall>
d5e83b5 Made CDK build system aware of the new data-debug module.
egonw authored
579 <antcall target="compile-module"><param name="module" value="data"/></antcall>
7269de8 OK, added test suite for NoNotify classes
egonw authored
580 <antcall target="compile-module"><param name="module" value="datadebug"/></antcall>
581 <antcall target="compile-module"><param name="module" value="nonotify"/></antcall>
676c95b Cleaned up more of the build file
egonw authored
582 <antcall target="compile-module"><param name="module" value="render"/></antcall>
583 <antcall target="compile-module"><param name="module" value="io"/></antcall>
206145b Added a new module 'pdb' with a new class PDBAtom; PDB fields are now re...
egonw authored
584 <antcall target="compile-module"><param name="module" value="pdb"/></antcall>
865fa00 Setup a valencycheck module with our crappy 'find bond order' algorithms
egonw authored
585 <antcall target="compile-module"><param name="module" value="valencycheck"/></antcall>
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
586 <antcall target="compile-module"><param name="module" value="extra"/></antcall>
6e91a8e Created the test-smiles module
egonw authored
587 <antcall target="compile-module"><param name="module" value="smiles"/></antcall>
ea39d29 More dependency clean up... A lot is working now, but the cyclic depende...
egonw authored
588 <antcall target="compile-module"><param name="module" value="libio-cml"/></antcall>
5df2c32 new package for weka libio. And tests
miguelrojasch authored
589 <antcall target="compile-module"><param name="module" value="libio-weka"/></antcall>
29687ca Added a CML Customizer interface which reduces the CDK module dependency...
egonw authored
590 <antcall target="compile-module"><param name="module" value="pdb-cml"/></antcall>
3bdf862 clear the conflicts between charges and reactions
miguelrojasch authored
591 <antcall target="compile-module"><param name="module" value="reaction"/></antcall>
592 <antcall target="compile-module"><param name="module" value="charges"/></antcall>
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
593 <antcall target="compile-module"><param name="module" value="qsar"/></antcall>
29687ca Added a CML Customizer interface which reduces the CDK module dependency...
egonw authored
594 <antcall target="compile-module"><param name="module" value="qsar-cml"/></antcall>
6270665 Some build fixes
egonw authored
595 <antcall target="compile-module"><param name="module" value="qsar-pdb"/></antcall>
f86e117 Created the smiles module
egonw authored
596 <antcall target="compile-module"><param name="module" value="forcefield"/></antcall>
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
597 <antcall target="compile-module"><param name="module" value="builder3d"/></antcall>
3e84ce7 Setup a SVG module
egonw authored
598 <antcall target="compile-module"><param name="module" value="svg"/></antcall>
9ebdc29 Fixed build order.
egonw authored
599 <antcall target="compile-module"><param name="module" value="experimental"/></antcall>
6270665 Some build fixes
egonw authored
600 <antcall target="compile-module"><param name="module" value="applications"/></antcall>
38401bd Put applications in separate jar.
egonw authored
601 </target>
602
7511417 Fixed a dependency problem.
egonw authored
603 <target id="test-dist-all" name="test-dist-all" description="test-dist-all">
604 <antcall target="compile-init"/>
3f7319a First step in modularized testing
egonw authored
605 <antcall target="compile-module"><param name="module" value="test-core"/></antcall>
28b1d67 Mega patch: test-standard now exists, and tests for test-reaction can be...
egonw authored
606 <antcall target="compile-module"><param name="module" value="test-standard"/></antcall>
0f12eb5 Made a test-data module
egonw authored
607 <antcall target="compile-module"><param name="module" value="test-data"/></antcall>
f05b101 Renamed module and made separate test module
egonw authored
608 <antcall target="compile-module"><param name="module" value="test-datadebug"/></antcall>
7269de8 OK, added test suite for NoNotify classes
egonw authored
609 <antcall target="compile-module"><param name="module" value="test-nonotify"/></antcall>
407c234 Made a test-io module
egonw authored
610 <antcall target="compile-module"><param name="module" value="test-io"/></antcall>
7511417 Fixed a dependency problem.
egonw authored
611 <antcall target="compile-module"><param name="module" value="test-extra"/></antcall>
6e91a8e Created the test-smiles module
egonw authored
612 <antcall target="compile-module"><param name="module" value="test-smiles"/></antcall>
5df2c32 new package for weka libio. And tests
miguelrojasch authored
613 <antcall target="compile-module"><param name="module" value="test-libio-weka"/></antcall>
39b2a26 new test-module: test-reaction
miguelrojasch authored
614 <antcall target="compile-module"><param name="module" value="test-reaction"/></antcall>
6e91a8e Created the test-smiles module
egonw authored
615 <antcall target="compile-module"><param name="module" value="test-forcefield"/></antcall>
865fa00 Setup a valencycheck module with our crappy 'find bond order' algorithms
egonw authored
616 <antcall target="compile-module"><param name="module" value="test-valencycheck"/></antcall>
908a364 Added missing build statement.
egonw authored
617 <antcall target="compile-module"><param name="module" value="test-experimental"/></antcall>
913abbb Setup test module for the pdb module
egonw authored
618 <antcall target="compile-module"><param name="module" value="test-qsar"/></antcall>
619 <antcall target="compile-module"><param name="module" value="test-pdb"/></antcall>
28b1d67 Mega patch: test-standard now exists, and tests for test-reaction can be...
egonw authored
620 <antcall target="compile-module"><param name="module" value="test-osjvmts"/></antcall>
7511417 Fixed a dependency problem.
egonw authored
621 </target>
622
623 <target id="dist-large" name="dist-large" depends="dist-all"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
624 description="Builds on big jar file for the CDK, including experimental classes.">
c660505 Reworked dist-large target
egonw authored
625
626 <!-- first unjar the CDK and other jars we need -->
627 <delete dir="${build}"/>
628 <mkdir dir="${build}"/>
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -jar ...
egonw authored
629 <mkdir dir="${appjars.dir}"/>
c660505 Reworked dist-large target
egonw authored
630 <unjar dest="${appjars.dir}">
631 <fileset dir="${lib}">
632 <includesfile name="${metainf}/applications.libdepends"/>
633 <includesfile name="${metainf}/builder3d.libdepends"/>
3673f87 Added missing jar in dist-large target
egonw authored
634 <includesfile name="${metainf}/charges.libdepends"/>
c660505 Reworked dist-large target
egonw authored
635 <includesfile name="${metainf}/core.libdepends"/>
9db2505 Added missing jars to dist-large target
egonw authored
636 <includesfile name="${metainf}/datadebug.libdepends"/>
c660505 Reworked dist-large target
egonw authored
637 <includesfile name="${metainf}/data.libdepends"/>
638 <includesfile name="${metainf}/experimental.libdepends"/>
639 <includesfile name="${metainf}/extra.libdepends"/>
640 <includesfile name="${metainf}/io-jmol.libdepends"/>
9db2505 Added missing jars to dist-large target
egonw authored
641 <includesfile name="${metainf}/io.libdepends"/>
c660505 Reworked dist-large target
egonw authored
642 <includesfile name="${metainf}/libio-cml.libdepends"/>
5df2c32 new package for weka libio. And tests
miguelrojasch authored
643 <includesfile name="${metainf}/libio-weka.libdepends"/>
9db2505 Added missing jars to dist-large target
egonw authored
644 <includesfile name="${metainf}/nonotify.libdepends"/>
645 <includesfile name="${metainf}/pdb-cml.libdepends"/>
646 <includesfile name="${metainf}/pdb.libdepends"/>
c660505 Reworked dist-large target
egonw authored
647 <includesfile name="${metainf}/qsar.libdepends"/>
9db2505 Added missing jars to dist-large target
egonw authored
648 <includesfile name="${metainf}/qsar-cml.libdepends"/>
649 <includesfile name="${metainf}/qsar-pdb.libdepends"/>
41766ae new reaction type class which contains reaction processes
miguelrojasch authored
650 <includesfile name="${metainf}/reaction.libdepends"/>
c660505 Reworked dist-large target
egonw authored
651 <includesfile name="${metainf}/render.libdepends"/>
652 <includesfile name="${metainf}/standard.libdepends"/>
9db2505 Added missing jars to dist-large target
egonw authored
653 <includesfile name="${metainf}/svg.libdepends"/>
654 <includesfile name="${metainf}/valencycheck.libdepends"/>
6270665 Some build fixes
egonw authored
655 <includesfile name="${metainf}/forcefield.libdepends"/>
c660505 Reworked dist-large target
egonw authored
656 </fileset>
657 <fileset dir="${dist}/jar">
658 <include name="cdk-applications.jar"/>
659 <include name="cdk-builder3d.jar"/>
3673f87 Added missing jar in dist-large target
egonw authored
660 <include name="cdk-charges.jar"/>
c660505 Reworked dist-large target
egonw authored
661 <include name="cdk-core.jar"/>
9db2505 Added missing jars to dist-large target
egonw authored
662 <include name="cdk-datadebug.jar"/>
c660505 Reworked dist-large target
egonw authored
663 <include name="cdk-data.jar"/>
664 <include name="cdk-experimental.jar"/>
665 <include name="cdk-extra.jar"/>
666 <include name="cdk-interfaces.jar"/>
667 <include name="cdk-io.jar"/>
668 <include name="cdk-io-jmol.jar"/>
669 <include name="cdk-libio-cml.jar"/>
ab16058 new qsar model using weka library. Implemented linear regression and j48...
miguelrojasch authored
670 <include name="cdk-libio-weka.jar"/>
9db2505 Added missing jars to dist-large target
egonw authored
671 <include name="cdk-nonotify.jar"/>
672 <include name="cdk-pdb-cml.jar"/>
673 <include name="cdk-pdb.jar"/>
c660505 Reworked dist-large target
egonw authored
674 <include name="cdk-qsar.jar"/>
29687ca Added a CML Customizer interface which reduces the CDK module dependency...
egonw authored
675 <include name="cdk-qsar-cml.jar"/>
9db2505 Added missing jars to dist-large target
egonw authored
676 <include name="cdk-qsar-pdb.jar"/>
41766ae new reaction type class which contains reaction processes
miguelrojasch authored
677 <include name="cdk-reaction.jar"/>
c660505 Reworked dist-large target
egonw authored
678 <include name="cdk-render.jar"/>
679 <include name="cdk-standard.jar"/>
9db2505 Added missing jars to dist-large target
egonw authored
680 <include name="cdk-svg.jar"/>
9c7431a Fixed stupid typo
egonw authored
681 <include name="cdk-valencycheck.jar"/>
f86e117 Created the smiles module
egonw authored
682 <include name="cdk-forcefield.jar"/>
683 <include name="cdk-smiles.jar"/>
c660505 Reworked dist-large target
egonw authored
684 </fileset>
685 </unjar>
9db2505 Added missing jars to dist-large target
egonw authored
686
c660505 Reworked dist-large target
egonw authored
687 <!-- then zip up things -->
41cd367 Modified the filename for the dist-large target to include the current d...
rajarshi authored
688 <tstamp>
689 <format property="TODAY_SVN" pattern="yyyyMMdd" locale="en" />
690 </tstamp>
691 <jar jarfile="${dist}/jar/cdk-svn-${TODAY_SVN}.jar">
c660505 Reworked dist-large target
egonw authored
692 <manifest>
693 <attribute name="Main-Class" value="org.openscience.cdk.applications.DistLargeInfo"/>
694 <section name="org.openscience.cdk">
695 <attribute name="Specification-Title" value="The Chemistry Development Kit"/>
696 <attribute name="Specification-Version" value="1.0"/>
697 <attribute name="Specification-Vendor" value="The CDK Project"/>
698 <attribute name="Implementation-Title" value="org.openscience.cdk"/>
699 <attribute name="Implementation-Version" value="${version}"/>
700 <attribute name="Implementation-Vendor" value="The CDK Project"/>
701 </section>
702 </manifest>
703 <fileset dir="${appjars.dir}">
704 <include name="**/*" />
705 </fileset>
706 </jar>
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -jar ...
egonw authored
707 </target>
708
8c06c63 Fixed inclusion of .javafiles, .classes, and .set files for easy buildin...
egonw authored
709 <target id="sourcedist" name="sourcedist" depends="init, runDoclet"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
710 description="Builds the source packages.">
a0ba425 Updated sourcedist target so that it uses the current date for the final...
rajarshi authored
711 <tstamp>
712 <format property="TODAY_SVN" pattern="yyyyMMdd" locale="en" />
713 </tstamp>
714 <property name="package" value="cdk-source-${TODAY_SVN}"/>
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
715 <property name="sourcedist.dir" value="${sourcedist}/${package}"/>
716 <copy todir="${sourcedist.dir}/${src}">
36bec3a Make use of new class-is-in-module lists in src/
egonw authored
717 <fileset dir="${src}" includes="*.javafiles" />
ba078b3 Also include .classes file, otherwise I still won't compile :(
egonw authored
718 <fileset dir="${src}" includes="*.classes" />
8c06c63 Fixed inclusion of .javafiles, .classes, and .set files for easy buildin...
egonw authored
719 <fileset dir="${src}" includes="*.set" />
ad5a692 Included *.jj files in sourcedist (closes #888710)
egonw authored
720 <fileset dir="${src}" includes="**/*.java" />
721 <fileset dir="${src}" includes="**/*.jj" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
722 <fileset dir="${src}" includes="org/openscience/cdk/io/cml/data/**" />
723 </copy>
724 <copy todir="${sourcedist.dir}">
7447e16 Getting ready for release
egonw authored
725 <fileset dir="." includes="build.props" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
726 <fileset dir="." includes="build.xml" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
727 <fileset dir="." includes="javadoc.xml" />
728 <fileset dir="." includes="README" />
729 <fileset dir="." includes="CHANGELOG" />
730 </copy>
d6cda7b Distribute LGPL license with sourcecode
egonw authored
731 <copy todir="${sourcedist.dir}/jar">
fbf19c3 The source releases contained unnecessary libraries
egonw authored
732 <fileset dir="jar">
733 <exclude name="libio/*.jar"/>
734 <exclude name="pmd-1.8.jar"/>
735 <exclude name="xalan-2.0.1.jar"/>
736 <exclude name="doccheck.jar"/>
737 <exclude name="dbdoclet*.*"/>
738 </fileset>
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
739 </copy>
998ae6a Updated for current CVS.
egonw authored
740 <copy todir="${sourcedist.dir}/develjar">
741 <fileset dir="develjar">
742 <exclude name="pmd-1.8.jar"/>
743 <exclude name="doccheck.jar"/>
744 <exclude name="dbdoclet*.*"/>
745 </fileset>
746 </copy>
747 <copy todir="${sourcedist.dir}/src/data">
ddebad1 Modified to match new dir struct
egonw authored
748 <fileset dir="src/data" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
749 </copy>
998ae6a Updated for current CVS.
egonw authored
750 <copy todir="${sourcedist.dir}/src/META-INF">
751 <fileset dir="src/META-INF" />
752 </copy>
ad5a692 Included *.jj files in sourcedist (closes #888710)
egonw authored
753 <copy tofile="${sourcedist.dir}/doc/javadoc/source//MakeJavaFilesFilesDoclet.java"
754 file="doc/javadoc/source/MakeJavaFilesFilesDoclet.java"/>
7aa27da Make sure the config.data files get included in the source dist (closes ...
egonw authored
755 <copy todir="${sourcedist.dir}/${src}/org/openscience/cdk/config/data/">
756 <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
757 includes="*" />
758 </copy>
a289167 Minor tweak to get distribs working
egonw authored
759 <copy
760 file="${src}/org/openscience/cdk/iupac/generator/data/IUPACNames.properties"
761 tofile="${sourcedist.dir}/${src}/org/openscience/cdk/iupac/generator/data/IUPACNames.properties" />
762 <copy
763 file="${src}/org/openscience/cdk/dict/data/chemical.xml"
764 tofile="${sourcedist.dir}/${src}/org/openscience/cdk/dict/data/chemical.xml" />
765 <copy
766 file="${src}/org/openscience/cdk/dict/data/elements.xml"
767 tofile="${sourcedist.dir}/${src}/org/openscience/cdk/dict/data/elements.xml" />
e2623a3 Added some missing files to the sourcedist
egonw authored
768 <mkdir dir="${sourcedist.dir}/${src}/org/openscience/cdk/qsar/model/data/"/>
769 <copy todir="${sourcedist.dir}/${src}/org/openscience/cdk/qsar/model/data/">
770 <fileset dir="${src}/org/openscience/cdk/qsar/model/data/" includes="*.R"/>
771 </copy>
998ae6a Updated for current CVS.
egonw authored
772 <mkdir dir="${sourcedist.dir}/${src}/org/openscience/cdk/modeling/forcefield/data/"/>
773 <copy todir="${sourcedist.dir}/${src}/org/openscience/cdk/modeling/forcefield/data/">
b566a03 Fixed copying of .prm files.
egonw authored
774 <fileset dir="${src}/org/openscience/cdk/modeling/forcefield/data/" includes="*.prm"/>
998ae6a Updated for current CVS.
egonw authored
775 </copy>
00c2efc Added missing builder3d templates to sourcedist.
egonw authored
776 <mkdir dir="${sourcedist.dir}/${src}/org/openscience/cdk/modeling/builder3d/data/"/>
777 <copy todir="${sourcedist.dir}/${src}/org/openscience/cdk/modeling/builder3d/data/">
778 <fileset dir="${src}/org/openscience/cdk/modeling/builder3d/data/" includes="*.gz"/>
779 </copy>
9496005 Added missing manifest
egonw authored
780 <copy todir="${sourcedist.dir}/${src}/">
781 <fileset dir="${src}/" includes="*.manifest" />
782 </copy>
d6cda7b Distribute LGPL license with sourcecode
egonw authored
783 <mkdir dir="${sourcedist.dir}/doc/" />
784 <copy todir="${sourcedist.dir}/doc/">
785 <fileset dir="doc/" includes="lgpl.license" />
786 </copy>
7447e16 Getting ready for release
egonw authored
787 <mkdir dir="${sourcedist.dir}/doc/javadoc" />
788 <copy todir="${sourcedist.dir}/doc/javadoc">
789 <fileset dir="doc/javadoc" includes="MakeJavaFilesFilesDoclet.class" />
790 <fileset dir="doc/javadoc" includes="MakeCDKSetFilesDoclet.class" />
791 </copy>
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
792 <tar tarfile="${package}.tar" basedir="${sourcedist}/" includes="${package}/**" />
a0ba425 Updated sourcedist target so that it uses the current date for the final...
rajarshi authored
793 <gzip zipfile="${package}.tar.gz" src="${package}.tar" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
794 <delete file="${package}.tar" />
795 <zip zipfile="${package}.zip" basedir="${sourcedist}/" includes="${package}/**" />
998ae6a Updated for current CVS.
egonw authored
796 </target>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
797
6fa4411 Fail build process for test (etc) when JUnit is not installed in ANT_HOM...
egonw authored
798 <target id="noJunit" name="noJunit" depends="check" unless="junit.present">
32a84b3 Fixed location of junit.jar
egonw authored
799 <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_HOM...
egonw authored
800 </target>
801
a68b440 Moved a redundant dependency.
egonw authored
802 <target id="test-module" name="test-module" depends="noJunit"
bd190c6 Finished transition to modularized testing
egonw authored
803 description="Performs a full JUnit test for the CDK."
804 if="junit.present">
805
806 <echo message="Testing classes for CDK's ${module} module." />
807
808 <!-- check for availability for meta info files -->
809 <available file="${metainf}/test-${module}.cdkdepends" property="module.cdkdepends.present"/>
810 <available file="${metainf}/test-${module}.libdepends" property="module.libdepends.present"/>
811 <available file="${metainf}/test-${module}.devellibdepends" property="module.devellibdepends.present"/>
812
813 <!-- be somewhat informative -->
814 <echo message="CDK dependencies defined: ${module.cdkdepends.present}"/>
815 <echo message="Library dependencies defined: ${module.libdepends.present}"/>
816 <echo message="Developer Library dependencies defined: ${module.devellibdepends.present}"/>
817
818 <mkdir dir="${reports.tests}"/>
819 <junit printsummary="yes" haltonfailure="no" fork="yes" maxmemory="256m">
820 <classpath>
821 <fileset dir="${lib}" >
822 <exclude name="**/*" unless="module.libdepends.present" />
823 <includesfile name="${metainf}/test-${module}.libdepends" if="module.libdepends.present" />
824 </fileset>
825 <fileset dir="${devellib}">
826 <exclude name="**/*" unless="module.devellibdepends.present" />
827 <includesfile name="${metainf}/test-${module}.devellibdepends" if="module.devellibdepends.present" />
828 </fileset>
829 <fileset dir="${dist}/jar">
830 <exclude name="**/*" unless="module.cdkdepends.present" />
831 <includesfile name="${metainf}/test-${module}.cdkdepends" if="module.cdkdepends.present" />
832 <include name="cdk-test-${module}.jar" />
833 </fileset>
834 </classpath>
835 <test name="org.openscience.cdk.test.M${module}Tests"
836 haltonfailure="no"
837 todir="${reports.tests}"
838 outfile="result-${module}">
839 <formatter type="brief" />
840 </test>
841 </junit>
842 </target>
843
e44e207 Removed special ant target for experimental module
egonw authored
844 <target id="test-all" name="test-all" depends="noJunit, dist-all, test-dist-all"
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
845 description="Performs a full JUnit test for the CDK."
846 if="junit.present">
28b1d67 Mega patch: test-standard now exists, and tests for test-reaction can be...
egonw authored
847 <antcall target="test-module"><param name="module" value="core"/></antcall>
0f12eb5 Made a test-data module
egonw authored
848 <antcall target="test-module"><param name="module" value="data"/></antcall>
f05b101 Renamed module and made separate test module
egonw authored
849 <antcall target="test-module"><param name="module" value="datadebug"/></antcall>
7269de8 OK, added test suite for NoNotify classes
egonw authored
850 <antcall target="test-module"><param name="module" value="nonotify"/></antcall>
28b1d67 Mega patch: test-standard now exists, and tests for test-reaction can be...
egonw authored
851 <antcall target="test-module"><param name="module" value="standard"/></antcall>
407c234 Made a test-io module
egonw authored
852 <antcall target="test-module"><param name="module" value="io"/></antcall>
6e91a8e Created the test-smiles module
egonw authored
853 <antcall target="test-module"><param name="module" value="forcefield"/></antcall>
28b1d67 Mega patch: test-standard now exists, and tests for test-reaction can be...
egonw authored
854 <antcall target="test-module"><param name="module" value="extra"/></antcall>
865fa00 Setup a valencycheck module with our crappy 'find bond order' algorithms
egonw authored
855 <antcall target="test-module"><param name="module" value="valencycheck"/></antcall>
5df2c32 new package for weka libio. And tests
miguelrojasch authored
856 <antcall target="test-module"><param name="module" value="reaction"/></antcall>
cef30e4 added forgot class
miguelrojasch authored
857 <antcall target="test-module"><param name="module" value="libioweka"/></antcall>
6e91a8e Created the test-smiles module
egonw authored
858 <antcall target="test-module"><param name="module" value="smiles"/></antcall>
e44e207 Removed special ant target for experimental module
egonw authored
859 <antcall target="test-module"><param name="module" value="experimental"/></antcall>
1d5576d added new test-model:qsar
miguelrojasch authored
860 <antcall target="test-module"><param name="module" value="qsar"/></antcall>
913abbb Setup test module for the pdb module
egonw authored
861 <antcall target="test-module"><param name="module" value="pdb"/></antcall>
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
862 </target>
3790797 Splitted tests which are supposed to fail from those which are supposed ...
egonw authored
863
40c31d0 Fixed more dependency problems: ant clean test-all now works
egonw authored
864 <target id="limitations" name="limitations" depends="noJunit, dist-all"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
865 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 supposed ...
egonw authored
866 <junit printsummary="yes" haltonfailure="yes" fork="yes">
867 <classpath>
40c31d0 Fixed more dependency problems: ant clean test-all now works
egonw authored
868 <fileset dir="${dist}/jar">
869 <include name="cdk-*.jar" />
870 </fileset>
3790797 Splitted tests which are supposed to fail from those which are supposed ...
egonw authored
871 <fileset dir="${lib}">
872 <include name="*.jar" />
873 </fileset>
9e95b7b Finished splitting devel from user jars
egonw authored
874 <fileset dir="${devellib}">
875 <include name="*.jar" />
876 </fileset>
3790797 Splitted tests which are supposed to fail from those which are supposed ...
egonw authored
877 <fileset dir="${lib}/libio">
878 <include name="*.jar" />
879 </fileset>
880 </classpath>
881 <test name="org.openscience.cdk.test.limitations.AlgorithmLimitations"
882 haltonfailure="no"
883 todir="${reports.tests}"
884 outfile="limitations">
885 <formatter type="brief" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
886 </test>
887 </junit>
40c31d0 Fixed more dependency problems: ant clean test-all now works
egonw authored
888 </target>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
889
6029346 Added missing dependencies
egonw authored
890 <target id="run-test" name="run-test" depends="dist-all,test-dist-all"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
891 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
892 <echo message="Running test class: testclass=${testclass}"/>
03a7837 merge with jcp21
shk3 authored
893 <java classname="org.openscience.cdk.test.${testclass}" fork="yes" maxmemory="512m">
3d88ed4 Turn on CDK debugging while running JUnit test
egonw authored
894 <jvmarg value="-Dcdk.debugging=true"/>
756bd80 When running a specific test (e.g. 'ant -Dtestclass=ringsearch.RingSearc...
egonw authored
895 <classpath>
bd397e8 Run test target should be working too now
egonw authored
896 <fileset dir="${dist}/jar/">
897 <include name="*.jar" />
898 </fileset>
756bd80 When running a specific test (e.g. 'ant -Dtestclass=ringsearch.RingSearc...
egonw authored
899 <fileset dir="${lib}">
900 <include name="*.jar" />
901 </fileset>
9e95b7b Finished splitting devel from user jars
egonw authored
902 <fileset dir="${devellib}">
903 <include name="*.jar" />
904 </fileset>
756bd80 When running a specific test (e.g. 'ant -Dtestclass=ringsearch.RingSearc...
egonw authored
905 <fileset dir="${lib}/libio">
906 <include name="*.jar" />
907 </fileset>
908 </classpath>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
909 </java>
bd397e8 Run test target should be working too now
egonw authored
910 </target>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
911
6029346 Added missing dependencies
egonw authored
912 <target id="junit-test" name="junit-test" depends="dist-all,test-dist-all,noJunit"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
913 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
914 <echo message="JUnit tests class: testclass=${testclass}"/>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
915 <junit printsummary="yes" haltonfailure="no" fork="yes">
79f7451 Switch debugging on in run-test target
steinbeck authored
916 <jvmarg value="-Dcdk.debugging=true"/>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
917 <jvmarg value="-Dcdk.debug.stdout=true"/>
918 <classpath>
5b2a8d2 Reintroduced the junit-test target
egonw authored
919 <fileset dir="${dist}/jar/">
920 <include name="*.jar" />
921 </fileset>
58425b9 Added use of properties to run target
steinbeck authored
922 <pathelement path="${java.class.path}" />
923 <pathelement location="." />
924 <fileset dir="${lib}">
925 <include name="*.jar" />
926 </fileset>
9e95b7b Finished splitting devel from user jars
egonw authored
927 <fileset dir="${devellib}">
928 <include name="*.jar" />
929 </fileset>
58425b9 Added use of properties to run target
steinbeck authored
930 <fileset dir="${lib}/libio">
931 <include name="*.jar" />
932 </fileset>
933 </classpath>
3af98a0 Added target for running one JUnit test *with* debug info
egonw authored
934 <test name="org.openscience.cdk.test.${testclass}"
935 haltonfailure="no"
936 todir="${reports.tests}"
937 outfile="result.${testclass}">
938 <formatter type="brief" />
939 </test>
940 </junit>
5b2a8d2 Reintroduced the junit-test target
egonw authored
941 </target>
58425b9 Added use of properties to run target
steinbeck authored
942
676c95b Cleaned up more of the build file
egonw authored
943 <target id="run" name="run" depends="dist-all"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
944 description="Runs an application (org.openscience.cdk.&lt;class>) with -Drunclass=&lt;class>.">
58425b9 Added use of properties to run target
steinbeck authored
945 <java classname="org.openscience.cdk.${runclass}" fork="yes" >
21cfa9b More documentation in AllRingsFinder and FingerPrinter on recent timeout...
steinbeck authored
946 <!--jvmarg value="-Dcdk.debugging=true"/>
947 <jvmarg value="-Dcdk.debug.stdout=true"/-->
5d724f3 Fix and test for bug 931608
steinbeck authored
948
949 <arg value="${arg1}" />
8cdb861 Extended build/test system to conditionally build/test non-Java5 stuff w...
egonw authored
950 <arg value="${arg2}" />
951 <arg value="${arg3}" />
952 <arg value="${arg4}" />
ac448e9 Nothing happend here.
steinbeck authored
953 <classpath>
40c31d0 Fixed more dependency problems: ant clean test-all now works
egonw authored
954 <fileset dir="${dist}/jar">
955 <include name="*.jar" />
956 </fileset>
8095921 Added rendering of wedged bonds.
egonw authored
957 <fileset dir="${lib}">
958 <include name="*.jar" />
959 </fileset>
960 <fileset dir="${lib}/libio">
961 <include name="*.jar" />
962 </fileset>
963 </classpath>
8713d91 Finished work on basic JOELib <-> CDK convertor.
egonw authored
964 </java>
965 </target>
966
c5eb7ec Added Ant build file.
egonw authored
967 </project>
Something went wrong with that request. Please try again.