Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100755 1208 lines (1134 sloc) 77.434 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" />
3eac543 Added a parallel task for compiling the test modules too now
egonw authored
11 <property name="threadCount" value="4" />
3a26de3 Made compilation with debug=on customizable.
egonw authored
12
2f3eee0 Adapted to provide for a customizable patch scheme
egonw authored
13 <!-- patches to apply -->
14
10a9acb Updated build script to include the ant contrib tasks
rajarshi authored
15 <!-- directories -->
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
16 <property name="build" value="build" />
bd36ed1 Trial for new build system
egonw authored
17 <property name="build.src" value="${build}/src" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
18 <property name="sourcedist" value="sourcedist" />
19 <property name="dist" value="dist" />
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
20 <property name="doc" value="doc" />
bd0b7db Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
egonw authored
21 <property name="src" value="src" />
22 <property name="lib" value="jar" />
9e95b7b Finished splitting devel from user jars
egonw authored
23 <property name="devellib" value="develjar" />
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
24 <property name="src.tests" value="${src}/test/org/openscience/cdk/test" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
25 <property name="reports.tests" value="reports" />
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -jar ...
egonw authored
26 <property name="appjars.dir" value="${dist}/appjars" />
bd36ed1 Trial for new build system
egonw authored
27 <property name="metainf" value="${src}/META-INF" />
f7be51f Removed alternative core classes patch offering more detailed debug info
egonw authored
28
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar which ...
egonw authored
29 <!-- class to run for testing-->
30 <property name="testclass" value="CDKTests" />
9bcd183 Fixed default executed application
egonw authored
31 <property name="runclass" value="applications.FileConvertor" />
6fa86d2 Added task dist core-debug which will create a cdk-core-debug.jar which ...
egonw authored
32 <property name="arg1" value="" />
33 <property name="arg2" value="" />
34 <property name="arg3" value="" />
35 <property name="arg4" value="" />
5c40bcf Removed the check for rJava as we don't strictly need it. Also added a p...
rajarshi authored
36
37 <property environment="env" />
38
10a9acb Updated build script to include the ant contrib tasks
rajarshi authored
39
40 <!-- Inlcude the ant-contrib goodies -->
41 <taskdef resource="net/sf/antcontrib/antlib.xml">
42 <classpath>
43 <pathelement location="${basedir}/develjar/ant-contrib-1.0b3.jar"/>
44 </classpath>
45 </taskdef>
46
47
48
5c40bcf Removed the check for rJava as we don't strictly need it. Also added a p...
rajarshi authored
49 <target id="info" name="info" depends="check">
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
50 <!-- Gives information about the building process. -->
8f6d674 Fixed after breaking it earlier today
egonw authored
51 <echo message="Platform:" />
7cd4ff8 Added R/SJava found to info target
egonw authored
52 <echo message=" OS: ${os.name}" />
53 <echo message=" Architecture: ${os.arch}" />
54 <echo message=" Version: ${os.version}" />
55 <echo message=" Mac OS/X found: ${isMacOsX}" />
8f6d674 Fixed after breaking it earlier today
egonw authored
56 <echo message="" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info fee...
egonw authored
57 <echo message="Java/Ant Environment:" />
7cd4ff8 Added R/SJava found to info target
egonw authored
58 <echo message=" Java version: ${java.version}" />
59 <echo message=" Java vendor: ${java.vendor}" />
60 <echo message=" Java dir: ${java.home}" />
61 <echo message=" Java ext dir: ${java.ext.dirs}" />
62 <echo message=" Ant version: ${ant.version}" />
63 <echo message=" ${ANT_HOME}: ${ant.home}" />
cf9ad35 Ant1.7 is required because we now use JUnit4
egonw authored
64 <echo message=" hasAnt17: ${hasAnt17}" />
679cde7 Third attempt to fix the Mac OS/X compile problem (and extended info fee...
egonw authored
65 <echo message="" />
66 <echo message="CDK Environment:" />
7cd4ff8 Added R/SJava found to info target
egonw authored
67 <echo message=" CDK version: ${version}" />
68 <echo message=" build.xml: $Id$" />
5a470af Added detection of Jmol, and added comments on optionality of libs
egonw authored
69 <echo message=" Junit found: ${junit.present}" />
cc68a07 Added detection of more third party libraries
egonw authored
70 <echo message=" --- required libraries ---" />
71 <echo message=" Vecmath found: ${vecmath.present}" />
72 <echo message=" Log4j found: ${log4j.present}" />
73 <echo message=" JGraphT found: ${jgrapht.present}" />
c1c3a3b Removed outdated optional compile checks
egonw authored
74 <echo message=" --- distributed (but optional) libraries ---" />
cc68a07 Added detection of more third party libraries
egonw authored
75 <echo message=" Batik found: ${batik.present}" />
7cd4ff8 Added R/SJava found to info target
egonw authored
76 <echo message=" CMLDOM found: ${cmllibs.present}" />
cc68a07 Added detection of more third party libraries
egonw authored
77 <echo message=" DADML found: ${dadml.present}" />
78 <echo message=" JAI found: ${jai.present}" />
79 <echo message=" XIndice found: ${xindice.present}"/>
5a470af Added detection of Jmol, and added comments on optionality of libs
egonw authored
80 <echo message=" --- optional libraries ---" />
2f3eee0 Adapted to provide for a customizable patch scheme
egonw authored
81 <echo message="" />
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
82 <echo message="Compiling:" />
7cd4ff8 Added R/SJava found to info target
egonw authored
83 <echo message=" for: ${build.compiler}" />
84 <echo message=" debug: ${debug}" />
85 <echo message=" deprecation: ${deprecation}" />
86 <echo message=" optimization: ${optimization}" />
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
87 </target>
88
8f6d674 Fixed after breaking it earlier today
egonw authored
89 <target id="checkPlatforms" name="checkPlatforms">
58405cf Fixed build.xml to allow compile of doclets on MacOS/X (closes #1001497)
egonw authored
90 <condition property="isMacOsX">
91 <and>
92 <os family="mac"/>
93 <os family="unix"/>
94 </and>
95 </condition>
96 </target>
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
97
8f6d674 Fixed after breaking it earlier today
egonw authored
98 <target id="check" name="check" depends="checkPlatforms">
cc68a07 Added detection of more third party libraries
egonw authored
99 <!-- Check wether Doclets are compiled and output is generated -->
100 <uptodate property="dotjavafiles.uptodate"
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
101 targetfile="${build}/core.javafiles">
cc68a07 Added detection of more third party libraries
egonw authored
102 <srcfiles dir="${src}" includes="**/*.java" />
103 </uptodate>
104 <condition property="dotjjfiles.uptodate">
105 <and>
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
106 <uptodate property="NomParserJavafiles.uptodate"
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
107 targetfile="${src}/main/org/openscience/cdk/iupac/parser/NomParser.java">
108 <srcfiles dir="${src}/main/" includes="org/openscience/cdk/iupac/parser/NomParser.jj" />
cc68a07 Added detection of more third party libraries
egonw authored
109 </uptodate>
65b6106 Added compatibility with ant1.7. Added building process for JJTree imple...
djiao authored
110 <uptodate property="SMARTSParserJJTJavafiles.uptodate"
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
111 targetfile="${src}/main/org/openscience/cdk/smiles/smarts/parser/SMARTSParser.java">
112 <srcfiles dir="${src}/main/" includes="org/openscience/cdk/smiles/smarts/parser/SMARTSParser.jj" />
65b6106 Added compatibility with ant1.7. Added building process for JJTree imple...
djiao authored
113 </uptodate>
cc68a07 Added detection of more third party libraries
egonw authored
114 </and>
115 </condition>
116
117 <!-- Checks which parts of CDK can be build. -->
118
119 <!-- test for optional jars -->
120 <available property="vecmath.present"
121 file="${lib}/vecmath1.2-1.14.jar"/>
122 <available property="log4j.present"
123 file="${lib}/log4j.jar"/>
124 <available property="jgrapht.present"
152e213 Updated for recent upgrades to Jumbo 5.2 and JGraphT 0.6.0
egonw authored
125 file="${lib}/jgrapht-0.6.0.jar"/>
cc68a07 Added detection of more third party libraries
egonw authored
126
127 <!-- test for optional jars -->
128 <condition property="batik.present">
129 <and>
130 <available file="${lib}/batik-awt-util.jar"/>
131 <available file="${lib}/batik-dom.jar"/>
132 <available file="${lib}/batik-svggen.jar"/>
133 <available file="${lib}/batik-util.jar"/>
134 <available file="${lib}/batik-xml.jar"/>
135 </and>
136 </condition>
137 <condition property="cmllibs.present">
138 <or>
152e213 Updated for recent upgrades to Jumbo 5.2 and JGraphT 0.6.0
egonw authored
139 <available file="${lib}/jumbo52.jar"/>
cc68a07 Added detection of more third party libraries
egonw authored
140 </or>
141 </condition>
142 <available property="dadml.present"
143 file="${lib}/dadml.jar"/>
144 <condition property="jai.present">
145 <and>
146 <available file="${lib}/jai_codec.jar"/>
147 <available file="${lib}/jai_core.jar"/>
148 </and>
149 </condition>
150 <available property="junit.present"
151 classname="junit.framework.TestCase"
152 classpath="${ant.home}/lib/junit.jar"/>
153 <condition property="xindice.present">
154 <and>
155 <available file="${lib}/xindice.jar"/>
156 <available file="${lib}/xmldb.jar"/>
157 </and>
158 </condition>
159
160 <!-- test Ant version -->
cf9ad35 Ant1.7 is required because we now use JUnit4
egonw authored
161 <condition property="hasAnt17">
65b6106 Added compatibility with ant1.7. Added building process for JJTree imple...
djiao authored
162 <contains string="${ant.version}" substring="1.7"/>
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
163 </condition>
cc68a07 Added detection of more third party libraries
egonw authored
164
165 <!-- test Java version -->
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
166 <condition property="isJava13">
167 <contains string="${java.version}" substring="1.3"/>
168 </condition>
169 <condition property="isJava14">
170 <contains string="${java.version}" substring="1.4"/>
171 </condition>
866bc72 CML is now available for Java1.5 too
egonw authored
172 <condition property="isJava15">
173 <contains string="${java.version}" substring="1.5"/>
174 </condition>
c77a2ac Should now work with the Sun Java 1.6.0 beta2
egonw authored
175 <condition property="isJava16">
176 <contains string="${java.version}" substring="1.6."/>
177 </condition>
3f17ad0 Added detection of Java 1.7
egonw authored
178 <condition property="isJava17">
179 <contains string="${java.version}" substring="1.7."/>
180 </condition>
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
181 <condition property="isJava14+">
182 <or>
183 <contains string="${java.version}" substring="1.4"/>
184 <contains string="${java.version}" substring="1.5"/>
c77a2ac Should now work with the Sun Java 1.6.0 beta2
egonw authored
185 <contains string="${java.version}" substring="1.6"/>
3f17ad0 Added detection of Java 1.7
egonw authored
186 <contains string="${java.version}" substring="1.7"/>
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
187 </or>
188 </condition>
c77a2ac Should now work with the Sun Java 1.6.0 beta2
egonw authored
189 <condition property="isJava15+">
190 <or>
191 <contains string="${java.version}" substring="1.5"/>
192 <contains string="${java.version}" substring="1.6"/>
3f17ad0 Added detection of Java 1.7
egonw authored
193 <contains string="${java.version}" substring="1.7"/>
c77a2ac Should now work with the Sun Java 1.6.0 beta2
egonw authored
194 </or>
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
195 </condition>
b836e8e Some tweaks and now CDK compiles with 1.6 too
egonw authored
196 <condition property="isNotJava15+">
197 <not>
198 <or>
199 <contains string="${java.version}" substring="1.5"/>
200 <contains string="${java.version}" substring="1.6"/>
3f17ad0 Added detection of Java 1.7
egonw authored
201 <contains string="${java.version}" substring="1.7"/>
b836e8e Some tweaks and now CDK compiles with 1.6 too
egonw authored
202 </or>
203 </not>
204 </condition>
cf9ad35 Ant1.7 is required because we now use JUnit4
egonw authored
205 <fail if="isNotJava15+" message="This CDK release requires Java5 or better."/>
206 <fail unless="hasAnt17" message="This CDK release requires Ant 1.7 or better."/>
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
207 </target>
208
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
209
d2ed020 Reworked dependencies
egonw authored
210 <target id="init" name="init" depends="check, setupBuildDir"/>
4302fbf Updated for Jumbo50 transition.
egonw authored
211 <target id="customize" name="customize" depends="javacc"/>
866bc72 CML is now available for Java1.5 too
egonw authored
212
44a4466 Now detects Java1.3 and makes changes to have it succesfully compile
egonw authored
213 <target id="setupBuildDir" name="setupBuildDir">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
214 <tstamp />
215 <mkdir dir="${build}" />
216 <mkdir dir="${sourcedist}" />
217 <mkdir dir="${dist}" />
218 <mkdir dir="${reports.tests}" />
219 </target>
220
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
221 <target id="clean" name="clean" description="Removes autogenerated files.">
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
222 <delete>
24af772 Delete autogenerated .javafiles in clean target
egonw authored
223 <fileset dir="." includes="**/*~" />
224 <fileset dir="." includes="*.tar.gz" />
225 <fileset dir="." includes="*.zip" />
06ee5d1 Modified the clean target to remove .rda files generated during testing ...
rajarshi authored
226 <fileset dir="." includes="*.rda" />
bfe0e17 Build interfaces before data
egonw authored
227 <fileset dir="${src}" includes="*.entitylist" />
5ad21a8 Fixed building CDK with Ant 1.5.x
egonw authored
228 <!-- remove java files generated with JavaCC -->
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
229 <fileset dir="${src}/main/org/openscience/cdk/smiles/smarts" includes="*.java">
a6a496c Updated build script so that it does not delete the smarts query tool cl...
rajarshi authored
230 <exclude name="SMARTSQueryTool.java" />
231 </fileset>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
232 <fileset dir="${src}/main/org/openscience/cdk/smiles/smarts/parser"
65b6106 Added compatibility with ant1.7. Added building process for JJTree imple...
djiao authored
233 includes="SMARTSParser.java,SMARTSParserConstants.java,ParseException.java,SimpleCharStream.java,Token.java,TokenMgrError.java"/>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
234 <fileset dir="${src}/main/org/openscience/cdk/iupac/parser" includes="*.java">
5ad21a8 Fixed building CDK with Ant 1.5.x
egonw authored
235 <!-- the next are from CVS -->
236 <exclude name="AttachedGroup.java" />
237 <exclude name="MoleculeBuilder.java" />
238 </fileset>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
239 <fileset dir="${src}/main/">
31994c5 Fixed deleting the doclet class files
egonw authored
240 <include name="net/sf/cdk/tools/*.class" />
2b81a22 Fixed a problem with deleting the doclet classes
egonw authored
241 </fileset>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
242 </delete>
243
244 <delete dir="${build}" />
245 <delete dir="${sourcedist}" />
4784091 New module: cdk-io. It only depends on cdk-core.
egonw authored
246 <delete dir="${dist}" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
247 <delete dir="${reports.tests}" />
248 </target>
bfe9294 Some changes to make a CML lib jar for Jmol.
egonw authored
249
07f21f7 New preprocessing build system: no longer uses JavaDoc, but a small cust...
egonw authored
250 <target name="runDoclet" id="runDoclet" depends="check, customize">
251 <echo>Not skipping doclet run...</echo>
54a21b6 The .javafiles now get created in build/ instead of src/
egonw authored
252 <mkdir dir="${build}" />
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
253 <javac includes="net/sf/cdk/tools/MakeJavafilesFiles.java"
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
254 srcdir="${src}/main/" destdir="${build}" optimize="${optimization}"
07f21f7 New preprocessing build system: no longer uses JavaDoc, but a small cust...
egonw authored
255 debug="${debug}" deprecation="${deprecation}"/>
256 <java classpath="${build}" classname="net.sf.cdk.tools.MakeJavafilesFiles">
20a1056 Fixed a patch from the branch that got lost in the branch merge
egonw authored
257 <arg value="${src}/META-INF"/>
258 <arg value="${src}/main"/>
259 <arg value="${build}"/>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
260 </java>
261 <java classpath="${build}" classname="net.sf.cdk.tools.MakeJavafilesFiles">
20a1056 Fixed a patch from the branch that got lost in the branch merge
egonw authored
262 <arg value="${src}/META-INF"/>
263 <arg value="${src}/test"/>
264 <arg value="${build}"/>
07f21f7 New preprocessing build system: no longer uses JavaDoc, but a small cust...
egonw authored
265 </java>
ca98ea5 Refactored build process (closes #883519)
egonw authored
266 </target>
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
267
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
268 <target id="compile-needed-test" name="compile-needed-test">
269 <uptodate property="module-uptodate" targetfile="${dist}/jar/cdk-${module}.jar">
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
270 <srcfiles dir="${src}/main/">
54a21b6 The .javafiles now get created in build/ instead of src/
egonw authored
271 <includesfile name="${build}/${module}.javafiles"/>
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
272 </srcfiles>
273 </uptodate>
274 </target>
9012143 Reworked dependencies a bit, fixing the -DskipDoclet option
egonw authored
275
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
276 <target id="compile-init" name="compile-init"
b0f7700 Checks are really needed a bit more often to ensure that some variable a...
egonw authored
277 depends="init, check, runDoclet"/>
9012143 Reworked dependencies a bit, fixing the -DskipDoclet option
egonw authored
278
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
279 <target id="compile-module" name="compile-module"
b0f7700 Checks are really needed a bit more often to ensure that some variable a...
egonw authored
280 depends="check, dist.init, compile-needed-test"
aa26775 Ok, ant clean test works again. With 300-ish problems, but it runs :)
egonw authored
281 unless="module-uptodate">
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
282
6153fc1 Report from which source tree files are copied
egonw authored
283 <echo message="Compiling classes for CDK's ${module} module from ${source}..." />
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
284
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
285 <!-- check for availability for meta info files -->
286 <available file="${metainf}/${module}.datafiles" property="module.datafiles.present"/>
cd4dbe5 Added hook for extra files outside the src/ directory, solving the remai...
egonw authored
287 <available file="${metainf}/${module}.extrafiles" property="module.extrafiles.present"/>
c094513 Make sure the .set files end up in the right jars
egonw authored
288 <available file="${metainf}/${module}.buildfiles" property="module.buildfiles.present"/>
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
289 <available file="${metainf}/${module}.cdkdepends" property="module.cdkdepends.present"/>
290 <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
291 <available file="${metainf}/${module}.devellibdepends" property="module.devellibdepends.present"/>
0863077 Added infrastructure for putting autogenerated files in a non-extra modu...
egonw authored
292 <available file="${metainf}/${module}.autogenerated" property="module.autogenerated.present"/>
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
293
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
294 <!-- be somewhat informative -->
295 <echo message="Datafiles defined: ${module.datafiles.present}"/>
cd4dbe5 Added hook for extra files outside the src/ directory, solving the remai...
egonw authored
296 <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
297 <echo message="CDK dependencies defined: ${module.cdkdepends.present}"/>
298 <echo message="Library dependencies defined: ${module.libdepends.present}"/>
ea39d29 More dependency clean up... A lot is working now, but the cyclic depende...
egonw authored
299 <echo message="Developer Library dependencies defined: ${module.devellibdepends.present}"/>
0863077 Added infrastructure for putting autogenerated files in a non-extra modu...
egonw authored
300 <echo message="Autogenerated files specified: ${module.autogenerated.present}"/>
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
301
bd36ed1 Trial for new build system
egonw authored
302 <!-- normally javac compiles not just the given files, but also missing
303 classes that are in the same src/ directory. By making a copy first,
304 we explicitely make it impossible to compile files that are not
305 marked for a specific module -->
b868e9e Put source and class in module dependent build/ dirs, allowing compiling...
egonw authored
306 <mkdir dir="${build.src}/${module}"/>
307 <mkdir dir="${build}/${module}"/>
308 <copy todir="${build.src}/${module}">
365a4d7 Fix to use the proper source folder, now passed via a target argument
egonw authored
309 <fileset dir="${source}">
54a21b6 The .javafiles now get created in build/ instead of src/
egonw authored
310 <excludesfile name="${build}/java1.4+.javafiles" if="isJava13"/>
311 <!-- excludesfile name="${build}/java1.4.javafiles" unless="isJava14"/ -->
312 <!-- excludesfile name="${build}/java1.5.javafiles" unless="isJava15"/ -->
313 <excludesfile name="${build}/java1.5+.javafiles" if="isNotJava15"/>
cf9ad35 Ant1.7 is required because we now use JUnit4
egonw authored
314 <excludesfile name="${build}/ant1.6.javafiles" unless="hasAnt17"/>
54a21b6 The .javafiles now get created in build/ instead of src/
egonw authored
315 <excludesfile name="${build}/jai.javafiles" unless="jai.present"/>
316 <excludesfile name="${build}/dadml.javafiles" unless="dadml.present"/>
317 <excludesfile name="${build}/xindice.javafiles" unless="xindice.present"/>
318
319 <includesfile name="${build}/${module}.javafiles"/>
0863077 Added infrastructure for putting autogenerated files in a non-extra modu...
egonw authored
320 <includesfile name="${metainf}/${module}.autogenerated" if="module.autogenerated.present"/>
bd36ed1 Trial for new build system
egonw authored
321 </fileset>
322 </copy>
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
323
bd36ed1 Trial for new build system
egonw authored
324 <!-- ok, now that we have a copy, compile this copy -->
b868e9e Put source and class in module dependent build/ dirs, allowing compiling...
egonw authored
325 <javac srcdir="${build.src}/${module}" destdir="${build}/${module}" optimize="${optimization}"
e531e6e Java5 List<IAtom> like constructs in the interfaces. trunk/cdk/ now offi...
egonw authored
326 debug="${debug}" deprecation="${deprecation}" target="1.5" source="1.5">
bd36ed1 Trial for new build system
egonw authored
327 <classpath>
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
328 <fileset dir="${lib}" >
329 <exclude name="**/*" unless="module.libdepends.present" />
330 <includesfile name="${metainf}/${module}.libdepends" if="module.libdepends.present" />
bd36ed1 Trial for new build system
egonw authored
331 </fileset>
ea39d29 More dependency clean up... A lot is working now, but the cyclic depende...
egonw authored
332 <fileset dir="${devellib}">
333 <exclude name="**/*" unless="module.devellibdepends.present" />
334 <includesfile name="${metainf}/${module}.devellibdepends" if="module.devellibdepends.present" />
335 </fileset>
bd36ed1 Trial for new build system
egonw authored
336 <fileset dir="${dist}/jar">
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
337 <exclude name="**/*" unless="module.cdkdepends.present" />
338 <includesfile name="${metainf}/${module}.cdkdepends" if="module.cdkdepends.present" />
bd36ed1 Trial for new build system
egonw authored
339 </fileset>
340 </classpath>
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
341
54a21b6 The .javafiles now get created in build/ instead of src/
egonw authored
342 <excludesfile name="${build}/java1.4+.javafiles" if="isJava13"/>
343 <!-- excludesfile name="${build}/java1.4.javafiles" unless="isJava14"/ -->
344 <!-- excludesfile name="${build}/java1.5.javafiles" unless="isJava15"/ -->
345 <excludesfile name="${build}/java1.5+.javafiles" if="isNotJava15"/>
cf9ad35 Ant1.7 is required because we now use JUnit4
egonw authored
346 <excludesfile name="${build}/ant1.6.javafiles" unless="hasAnt17"/>
54a21b6 The .javafiles now get created in build/ instead of src/
egonw authored
347 <excludesfile name="${build}/jai.javafiles" unless="jai.present"/>
348 <excludesfile name="${build}/dadml.javafiles" unless="dadml.present"/>
349 <excludesfile name="${build}/xindice.javafiles" unless="xindice.present"/>
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
350
54a21b6 The .javafiles now get created in build/ instead of src/
egonw authored
351 <includesfile name="${build}/${module}.javafiles"/>
0863077 Added infrastructure for putting autogenerated files in a non-extra modu...
egonw authored
352 <includesfile name="${metainf}/${module}.autogenerated" if="module.autogenerated.present"/>
bd36ed1 Trial for new build system
egonw authored
353 </javac>
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
354
0863077 Added infrastructure for putting autogenerated files in a non-extra modu...
egonw authored
355 <!-- create a autogenerated.classes file, if applicable, so that these files can be included in the jar -->
f1360a2 Cleaned up handling of presence/absence of autogenerated files, so no mo...
rajarshi authored
356 <if>
357 <istrue value="${module.autogenerated.present}"/>
358 <then>
359 <copy file="${metainf}/${module}.autogenerated" tofile="${build}/${module}.autogenerated.classes"
360 failonerror="false"/>
361 <replace dir="${build}" token=".java" value="*.class">
362 <include name="*.autogenerated.classes"/>
363 </replace>
364 </then>
365 </if>
366
367
bd36ed1 Trial for new build system
egonw authored
368 <!-- and then jar things up into the module jar -->
369 <jar jarfile="${dist}/jar/cdk-${module}.jar">
b868e9e Put source and class in module dependent build/ dirs, allowing compiling...
egonw authored
370 <fileset dir="${build}/${module}">
54a21b6 The .javafiles now get created in build/ instead of src/
egonw authored
371 <includesfile name="${build}/${module}.classes" />
0863077 Added infrastructure for putting autogenerated files in a non-extra modu...
egonw authored
372 <includesfile name="${build}/${module}.autogenerated.classes" if="module.autogenerated.present"/>
54a21b6 The .javafiles now get created in build/ instead of src/
egonw authored
373 <excludesfile name="${build}/java1.4+.classes" if="isJava13"/>
374 <!-- excludesfile name="${build}/java1.4.classes" unless="isJava14"/ -->
375 <!-- excludesfile name="${build}/java1.5.javafiles" unless="isJava15"/ -->
376 <excludesfile name="${build}/java1.5+.javafiles" if="isNotJava15"/>
cf9ad35 Ant1.7 is required because we now use JUnit4
egonw authored
377 <excludesfile name="${build}/ant1.6.classes" unless="hasAnt17"/>
54a21b6 The .javafiles now get created in build/ instead of src/
egonw authored
378 <excludesfile name="${build}/jai.javafiles" unless="jai.present"/>
379 <excludesfile name="${build}/dadml.javafiles" unless="dadml.present"/>
380 <excludesfile name="${build}/xindice.javafiles" unless="xindice.present"/>
bd36ed1 Trial for new build system
egonw authored
381 </fileset>
54a21b6 The .javafiles now get created in build/ instead of src/
egonw authored
382 <fileset dir="${build}">
bd36ed1 Trial for new build system
egonw authored
383 <include name="${module}.javafiles" />
384 </fileset>
174804f Fixed root location of .datafiles content
egonw authored
385 <fileset dir="${source}">
141cf36 Fixed problem with including data files in the module jars
egonw authored
386 <exclude name="**/*" unless="module.datafiles.present"/>
666b237 Ok, next step... getting extra and apps to the new system; lot's of unre...
egonw authored
387 <includesfile name="${metainf}/${module}.datafiles" if="module.datafiles.present" />
388 </fileset>
7a673b7 Point to the correct root folder for datafiles and extrafiles
egonw authored
389 <fileset dir="${src}">
cd4dbe5 Added hook for extra files outside the src/ directory, solving the remai...
egonw authored
390 <exclude name="**/*" unless="module.extrafiles.present"/>
391 <includesfile name="${metainf}/${module}.extrafiles" if="module.extrafiles.present" />
392 </fileset>
c8f144a Point to correct .set location.
egonw authored
393 <fileset dir="${build}">
c094513 Make sure the .set files end up in the right jars
egonw authored
394 <exclude name="**/*" unless="module.buildfiles.present"/>
c8f144a Point to correct .set location.
egonw authored
395 <includesfile name="${metainf}/${module}.buildfiles" if="module.buildfiles.present" />
c094513 Make sure the .set files end up in the right jars
egonw authored
396 </fileset>
bd36ed1 Trial for new build system
egonw authored
397 </jar>
b868e9e Put source and class in module dependent build/ dirs, allowing compiling...
egonw authored
398
399 <!-- clean up afterwards -->
4ecbc9a Added a task for parallelized compiling the CDK libs
egonw authored
400 <delete dir="${build.src}/${module}"/>
b868e9e Put source and class in module dependent build/ dirs, allowing compiling...
egonw authored
401 <delete dir="${build}/${module}"/>
bd36ed1 Trial for new build system
egonw authored
402 </target>
403
6dc5408 Added stuff for qsar module
egonw authored
404 <!-- Convert the JavaCC .jj file to the correct .java files for the IUPAC parser -->
cf9ad35 Ant1.7 is required because we now use JUnit4
egonw authored
405 <target id="javacc" name="javacc" depends="init, check" if="hasAnt17" unless="dotjjfiles.uptodate">
5ad21a8 Fixed building CDK with Ant 1.5.x
egonw authored
406 <echo message="Compiling Ant 1.6 depending classes." />
cd49d3a A bit of comment
egonw authored
407 <!-- the IUPAC name parser -->
1dd9647 Added IUPAC name parser
stomkinson authored
408 <delete>
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
409 <fileset id="javacc-generated"
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
410 dir="${src}/main/org/openscience/cdk/iupac/parser/"
cd49d3a A bit of comment
egonw authored
411 includes="NomParser*.java,ParseException.java,SimpleCharStream.java,Token.java,TokenMgrError.java"/>
1dd9647 Added IUPAC name parser
stomkinson authored
412 </delete>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
413 <javacc target="${src}/main/org/openscience/cdk/iupac/parser/NomParser.jj"
414 outputdirectory="${src}/main/org/openscience/cdk/iupac/parser/"
d9680ff Removed compilation steps for the old SMARTS parser
rajarshi authored
415 javacchome="${lib}"/>
65b6106 Added compatibility with ant1.7. Added building process for JJTree imple...
djiao authored
416 <delete>
417 <fileset id="javacc-generated"
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
418 dir="${src}/main/org/openscience/cdk/smiles/smarts/parser/"
65b6106 Added compatibility with ant1.7. Added building process for JJTree imple...
djiao authored
419 includes="SMARTSParser.java,SMARTSParserConstants.java,ParseException.java,SimpleCharStream.java,Token.java,TokenMgrError.java"/>
420 </delete>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
421 <javacc target="${src}/main/org/openscience/cdk/smiles/smarts/parser/SMARTSParser.jj"
65b6106 Added compatibility with ant1.7. Added building process for JJTree imple...
djiao authored
422 javacchome="${lib}"
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
423 outputdirectory="${src}/main/org/openscience/cdk/smiles/smarts/parser/"/>
1dd9647 Added IUPAC name parser
stomkinson authored
424 </target>
8095921 Added rendering of wedged bonds.
egonw authored
425
86b1231 Added id's to target for easy browsing with jEdit's StructureBrowser
egonw authored
426 <target id="dist.init" name="dist.init">
246601c Added a test to check for the presence of R and thus prevent compilation...
rajarshi authored
427 <mkdir dir="${dist}/jar" />
43d9399 Splitted cdk.jar into cdk-core.jar and cdk-extra.jar.
egonw authored
428 </target>
d313d03 Also include cml.dtd in normal jar.
egonw authored
429
81cab20 Added Ant target for compiling 'optional' modules
egonw authored
430 <target id="dist-java3d" name="dist-java3d" depends="nocompile-java3d, compile-java3d"/>
431 <target id="nocompile-java3d" name="nocompile-java3d" unless="${java3d.present}">
432 <echo message="Java3d is not found. Removed depending functionality. Java3d can be downloaded from http://java.sun.com/."/>
433 </target>
434 <target id="compile-java3d" name="compile-java3d" if="${java3d.present}">
435 <antcall target="compile-module"><param name="module" value="java3d"/></antcall>
436 </target>
437
438 <target id="dist-optional" name="dist-optional" depends="dist-all"
439 description="Compile CDK modules that require optional libraries">
440 <antcall target="dist-java3d"/>
441 </target>
4ecbc9a Added a task for parallelized compiling the CDK libs
egonw authored
442
443 <target id="parallel-all" name="parallel-all" description="dist-all in parallel mode">
444 <sequential>
445 <antcall target="compile-init"/>
446 <antcall target="compile-module"><param name="module" value="interfaces"/><param name="source" value="${src}/main"/></antcall>
447 <antcall target="compile-module"><param name="module" value="core"/><param name="source" value="${src}/main"/></antcall>
448 <parallel>
449 <antcall target="compile-module"><param name="module" value="data"/><param name="source" value="${src}/main"/></antcall>
450 <antcall target="compile-module"><param name="module" value="atomtype"/><param name="source" value="${src}/main"/></antcall>
c4d127b Introduced a dict module, to lower the number of deps on the extra modul...
egonw authored
451 <antcall target="compile-module"><param name="module" value="dict"/><param name="source" value="${src}/main"/></antcall>
4ecbc9a Added a task for parallelized compiling the CDK libs
egonw authored
452 </parallel>
453 <parallel>
454 <antcall target="compile-module"><param name="module" value="datadebug"/><param name="source" value="${src}/main"/></antcall>
455 <antcall target="compile-module"><param name="module" value="nonotify"/><param name="source" value="${src}/main"/></antcall>
456 <antcall target="compile-module"><param name="module" value="standard"/><param name="source" value="${src}/main"/></antcall>
457 <antcall target="compile-module"><param name="module" value="isomorphism"/><param name="source" value="${src}/main"/></antcall>
458 </parallel>
459 <parallel>
460 <antcall target="compile-module"><param name="module" value="io"/><param name="source" value="${src}/main"/></antcall>
461 <antcall target="compile-module"><param name="module" value="render"/><param name="source" value="${src}/main"/></antcall>
462 <antcall target="compile-module"><param name="module" value="formula"/><param name="source" value="${src}/main"/></antcall>
6f3c77f Some more dependency cleanup: now we have one sequential compile step le...
egonw authored
463 <antcall target="compile-module"><param name="module" value="valencycheck"/><param name="source" value="${src}/main"/></antcall>
4ecbc9a Added a task for parallelized compiling the CDK libs
egonw authored
464 </parallel>
465 <parallel>
466 <antcall target="compile-module"><param name="module" value="pdb"/><param name="source" value="${src}/main"/></antcall>
467 <antcall target="compile-module"><param name="module" value="svg"/><param name="source" value="${src}/main"/></antcall>
468 <antcall target="compile-module"><param name="module" value="structgen"/><param name="source" value="${src}/main"/></antcall>
469 <antcall target="compile-module"><param name="module" value="extra"/><param name="source" value="${src}/main"/></antcall>
470 <antcall target="compile-module"><param name="module" value="sdg"/><param name="source" value="${src}/main"/></antcall>
471 <antcall target="compile-module"><param name="module" value="inchi"/><param name="source" value="${src}/main"/></antcall>
c4d127b Introduced a dict module, to lower the number of deps on the extra modul...
egonw authored
472 <antcall target="compile-module"><param name="module" value="libiocml"/><param name="source" value="${src}/main"/></antcall>
4ecbc9a Added a task for parallelized compiling the CDK libs
egonw authored
473 </parallel>
474 <parallel>
475 <antcall target="compile-module"><param name="module" value="control"/><param name="source" value="${src}/main"/></antcall>
476 <antcall target="compile-module"><param name="module" value="smiles"/><param name="source" value="${src}/main"/></antcall>
477 <antcall target="compile-module"><param name="module" value="smarts"/><param name="source" value="${src}/main"/></antcall>
c4d127b Introduced a dict module, to lower the number of deps on the extra modul...
egonw authored
478 <antcall target="compile-module"><param name="module" value="reaction"/><param name="source" value="${src}/main"/></antcall>
479 <antcall target="compile-module"><param name="module" value="pdb-cml"/><param name="source" value="${src}/main"/></antcall>
480 <antcall target="compile-module"><param name="module" value="libiomd"/><param name="source" value="${src}/main"/></antcall>
4ecbc9a Added a task for parallelized compiling the CDK libs
egonw authored
481 </parallel>
482 <parallel>
483 <antcall target="compile-module"><param name="module" value="pcore"/><param name="source" value="${src}/main"/></antcall>
484 <antcall target="compile-module"><param name="module" value="progzjcp"/><param name="source" value="${src}/main"/></antcall>
485 <antcall target="compile-module"><param name="module" value="charges"/><param name="source" value="${src}/main"/></antcall>
486 </parallel>
487 <parallel>
488 <antcall target="compile-module"><param name="module" value="qsar"/><param name="source" value="${src}/main"/></antcall>
489 </parallel>
490 <parallel>
491 <antcall target="compile-module"><param name="module" value="qsaratomic"/><param name="source" value="${src}/main"/></antcall>
492 <antcall target="compile-module"><param name="module" value="qsarbond"/><param name="source" value="${src}/main"/></antcall>
493 <antcall target="compile-module"><param name="module" value="qsarprotein"/><param name="source" value="${src}/main"/></antcall>
494 <antcall target="compile-module"><param name="module" value="qsar-cml"/><param name="source" value="${src}/main"/></antcall>
495 <antcall target="compile-module"><param name="module" value="experimental"/><param name="source" value="${src}/main"/></antcall>
496 </parallel>
497 <parallel>
498 <antcall target="compile-module"><param name="module" value="qsarmolecular"/><param name="source" value="${src}/main"/></antcall>
499 <antcall target="compile-module"><param name="module" value="forcefield"/><param name="source" value="${src}/main"/></antcall>
500 </parallel>
501 <parallel>
502 <antcall target="compile-module"><param name="module" value="builder3d"/><param name="source" value="${src}/main"/></antcall>
503 <antcall target="compile-module"><param name="module" value="builder3dtools"/><param name="source" value="${src}/main"/></antcall>
504 <antcall target="compile-module"><param name="module" value="applications"/><param name="source" value="${src}/main"/></antcall>
505 </parallel>
506 </sequential>
507 </target>
fe65a98 Fixed dependencies
egonw authored
508
509 <target id="dist-all" name="dist-all" description="dist-all">
9012143 Reworked dependencies a bit, fixing the -DskipDoclet option
egonw authored
510 <antcall target="compile-init"/>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
511 <antcall target="compile-module"><param name="module" value="interfaces"/><param name="source" value="${src}/main"/></antcall>
512 <antcall target="compile-module"><param name="module" value="core"/><param name="source" value="${src}/main"/></antcall>
513 <antcall target="compile-module"><param name="module" value="atomtype"/><param name="source" value="${src}/main"/></antcall>
514 <antcall target="compile-module"><param name="module" value="standard"/><param name="source" value="${src}/main"/></antcall>
c4d127b Introduced a dict module, to lower the number of deps on the extra modul...
egonw authored
515 <antcall target="compile-module"><param name="module" value="dict"/><param name="source" value="${src}/main"/></antcall>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
516 <antcall target="compile-module"><param name="module" value="data"/><param name="source" value="${src}/main"/></antcall>
517 <antcall target="compile-module"><param name="module" value="render"/><param name="source" value="${src}/main"/></antcall>
518 <antcall target="compile-module"><param name="module" value="io"/><param name="source" value="${src}/main"/></antcall>
519 <antcall target="compile-module"><param name="module" value="valencycheck"/><param name="source" value="${src}/main"/></antcall>
520 <antcall target="compile-module"><param name="module" value="sdg"/><param name="source" value="${src}/main"/></antcall>
521 <antcall target="compile-module"><param name="module" value="control"/><param name="source" value="${src}/main"/></antcall>
522 <antcall target="compile-module"><param name="module" value="datadebug"/><param name="source" value="${src}/main"/></antcall>
523 <antcall target="compile-module"><param name="module" value="nonotify"/><param name="source" value="${src}/main"/></antcall>
524 <antcall target="compile-module"><param name="module" value="formula"/><param name="source" value="${src}/main"/></antcall>
525 <antcall target="compile-module"><param name="module" value="structgen"/><param name="source" value="${src}/main"/></antcall>
526 <antcall target="compile-module"><param name="module" value="pdb"/><param name="source" value="${src}/main"/></antcall>
75524f4 Set up a new module to get this code well tested
egonw authored
527 <antcall target="compile-module"><param name="module" value="isomorphism"/><param name="source" value="${src}/main"/></antcall>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
528 <antcall target="compile-module"><param name="module" value="extra"/><param name="source" value="${src}/main"/></antcall>
529 <antcall target="compile-module"><param name="module" value="smiles"/><param name="source" value="${src}/main"/></antcall>
530 <antcall target="compile-module"><param name="module" value="libiocml"/><param name="source" value="${src}/main"/></antcall>
531 <antcall target="compile-module"><param name="module" value="libiomd"/><param name="source" value="${src}/main"/></antcall>
532 <antcall target="compile-module"><param name="module" value="pdb-cml"/><param name="source" value="${src}/main"/></antcall>
533 <antcall target="compile-module"><param name="module" value="reaction"/><param name="source" value="${src}/main"/></antcall>
534 <antcall target="compile-module"><param name="module" value="charges"/><param name="source" value="${src}/main"/></antcall>
535 <antcall target="compile-module"><param name="module" value="qsar"/><param name="source" value="${src}/main"/></antcall>
536 <antcall target="compile-module"><param name="module" value="qsaratomic"/><param name="source" value="${src}/main"/></antcall>
537 <antcall target="compile-module"><param name="module" value="qsarbond"/><param name="source" value="${src}/main"/></antcall>
538 <antcall target="compile-module"><param name="module" value="qsarmolecular"/><param name="source" value="${src}/main"/></antcall>
539 <antcall target="compile-module"><param name="module" value="qsarprotein"/><param name="source" value="${src}/main"/></antcall>
540 <antcall target="compile-module"><param name="module" value="qsar-cml"/><param name="source" value="${src}/main"/></antcall>
541 <antcall target="compile-module"><param name="module" value="forcefield"/><param name="source" value="${src}/main"/></antcall>
542 <antcall target="compile-module"><param name="module" value="builder3d"/><param name="source" value="${src}/main"/></antcall>
543 <antcall target="compile-module"><param name="module" value="builder3dtools"/><param name="source" value="${src}/main"/></antcall>
544 <antcall target="compile-module"><param name="module" value="svg"/><param name="source" value="${src}/main"/></antcall>
545 <antcall target="compile-module"><param name="module" value="smarts"/><param name="source" value="${src}/main"/></antcall>
546 <antcall target="compile-module"><param name="module" value="experimental"/><param name="source" value="${src}/main"/></antcall>
547 <antcall target="compile-module"><param name="module" value="pcore"/><param name="source" value="${src}/main"/></antcall>
548 <antcall target="compile-module"><param name="module" value="applications"/><param name="source" value="${src}/main"/></antcall>
ed41c5a The build.xml fix in r10230 uncovered many missing dependencies. This co...
egonw authored
549 <antcall target="compile-module"><param name="module" value="inchi"/><param name="source" value="${src}/main"/></antcall>
550 <antcall target="compile-module"><param name="module" value="progzjcp"/><param name="source" value="${src}/main"/></antcall>
38401bd Put applications in separate jar.
egonw authored
551 </target>
552
3eac543 Added a parallel task for compiling the test modules too now
egonw authored
553 <target id="test-parallel-all" name="test-parallel-all" description="test-dist-all in parallel mode">
554 <sequential>
555 <antcall target="compile-init"/>
556 <antcall target="compile-module"><param name="module" value="test"/><param name="source" value="${src}/test"/></antcall>
557 <parallel threadCount="${threadCount}">
558 <antcall target="compile-module"><param name="module" value="test-core"/><param name="source" value="${src}/test"/></antcall>
559 <antcall target="compile-module"><param name="module" value="test-data"/><param name="source" value="${src}/test"/></antcall>
c4d127b Introduced a dict module, to lower the number of deps on the extra modul...
egonw authored
560 <antcall target="compile-module"><param name="module" value="test-dict"/><param name="source" value="${src}/test"/></antcall>
3eac543 Added a parallel task for compiling the test modules too now
egonw authored
561 <antcall target="compile-module"><param name="module" value="test-qsar"/><param name="source" value="${src}/test"/></antcall>
562 <antcall target="compile-module"><param name="module" value="test-libiocml"/><param name="source" value="${src}/test"/></antcall>
563 <antcall target="compile-module"><param name="module" value="test-valencycheck"/><param name="source" value="${src}/test"/></antcall>
564 <antcall target="compile-module"><param name="module" value="test-pdb"/><param name="source" value="${src}/test"/></antcall>
565 <antcall target="compile-module"><param name="module" value="test-structgen"/><param name="source" value="${src}/test"/></antcall>
566 <antcall target="compile-module"><param name="module" value="test-charges"/><param name="source" value="${src}/test"/></antcall>
567 <antcall target="compile-module"><param name="module" value="test-smarts"/><param name="source" value="${src}/test"/></antcall>
568 <antcall target="compile-module"><param name="module" value="test-builder3d"/><param name="source" value="${src}/test"/></antcall>
569 <antcall target="compile-module"><param name="module" value="test-reaction"/><param name="source" value="${src}/test"/></antcall>
570 <antcall target="compile-module"><param name="module" value="test-inchi"/><param name="source" value="${src}/test"/></antcall>
571 <antcall target="compile-module"><param name="module" value="test-pcore"/><param name="source" value="${src}/test"/></antcall>
572 <antcall target="compile-module"><param name="module" value="test-forcefield"/><param name="source" value="${src}/test"/></antcall>
573 <antcall target="compile-module"><param name="module" value="test-isomorphism"/><param name="source" value="${src}/test"/></antcall>
574 <antcall target="compile-module"><param name="module" value="test-formula"/><param name="source" value="${src}/test"/></antcall>
575 <antcall target="compile-module"><param name="module" value="test-libiomd"/><param name="source" value="${src}/test"/></antcall>
576 </parallel>
577 <parallel threadCount="${threadCount}">
578 <antcall target="compile-module"><param name="module" value="test-datadebug"/><param name="source" value="${src}/test"/></antcall>
579 <antcall target="compile-module"><param name="module" value="test-nonotify"/><param name="source" value="${src}/test"/></antcall>
580 <antcall target="compile-module"><param name="module" value="test-io"/><param name="source" value="${src}/test"/></antcall>
581 <antcall target="compile-module"><param name="module" value="test-standard"/><param name="source" value="${src}/test"/></antcall>
582 <antcall target="compile-module"><param name="module" value="test-extra"/><param name="source" value="${src}/test"/></antcall>
583 <antcall target="compile-module"><param name="module" value="test-qsarprotein"/><param name="source" value="${src}/test"/></antcall>
584 <antcall target="compile-module"><param name="module" value="test-qsaratomic"/><param name="source" value="${src}/test"/></antcall>
585 <antcall target="compile-module"><param name="module" value="test-smiles"/><param name="source" value="${src}/test"/></antcall>
586 <antcall target="compile-module"><param name="module" value="test-qsarbond"/><param name="source" value="${src}/test"/></antcall>
587 <antcall target="compile-module"><param name="module" value="test-atomtype"/><param name="source" value="${src}/test"/></antcall>
588 </parallel>
589 <antcall target="compile-module"><param name="module" value="test-qsarmolecular"/><param name="source" value="${src}/test"/></antcall>
590 <antcall target="compile-module"><param name="module" value="test-experimental"/><param name="source" value="${src}/test"/></antcall>
591 </sequential>
592 </target>
593
7511417 Fixed a dependency problem.
egonw authored
594 <target id="test-dist-all" name="test-dist-all" description="test-dist-all">
595 <antcall target="compile-init"/>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
596 <antcall target="compile-module"><param name="module" value="test"/><param name="source" value="${src}/test"/></antcall>
597 <antcall target="compile-module"><param name="module" value="test-core"/><param name="source" value="${src}/test"/></antcall>
598 <antcall target="compile-module"><param name="module" value="test-atomtype"/><param name="source" value="${src}/test"/></antcall>
599 <antcall target="compile-module"><param name="module" value="test-standard"/><param name="source" value="${src}/test"/></antcall>
600 <antcall target="compile-module"><param name="module" value="test-data"/><param name="source" value="${src}/test"/></antcall>
c4d127b Introduced a dict module, to lower the number of deps on the extra modul...
egonw authored
601 <antcall target="compile-module"><param name="module" value="test-dict"/><param name="source" value="${src}/test"/></antcall>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
602 <antcall target="compile-module"><param name="module" value="test-datadebug"/><param name="source" value="${src}/test"/></antcall>
603 <antcall target="compile-module"><param name="module" value="test-nonotify"/><param name="source" value="${src}/test"/></antcall>
604 <antcall target="compile-module"><param name="module" value="test-io"/><param name="source" value="${src}/test"/></antcall>
605 <antcall target="compile-module"><param name="module" value="test-structgen"/><param name="source" value="${src}/test"/></antcall>
e2a6ffe Set up a test module for 'isomorphism'
egonw authored
606 <antcall target="compile-module"><param name="module" value="test-isomorphism"/><param name="source" value="${src}/test"/></antcall>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
607 <antcall target="compile-module"><param name="module" value="test-extra"/><param name="source" value="${src}/test"/></antcall>
608 <antcall target="compile-module"><param name="module" value="test-smiles"/><param name="source" value="${src}/test"/></antcall>
609 <antcall target="compile-module"><param name="module" value="test-reaction"/><param name="source" value="${src}/test"/></antcall>
610 <antcall target="compile-module"><param name="module" value="test-builder3d"/><param name="source" value="${src}/test"/></antcall>
611 <antcall target="compile-module"><param name="module" value="test-forcefield"/><param name="source" value="${src}/test"/></antcall>
612 <antcall target="compile-module"><param name="module" value="test-valencycheck"/><param name="source" value="${src}/test"/></antcall>
613 <antcall target="compile-module"><param name="module" value="test-charges"/><param name="source" value="${src}/test"/></antcall>
614 <antcall target="compile-module"><param name="module" value="test-qsar"/><param name="source" value="${src}/test"/></antcall>
615 <antcall target="compile-module"><param name="module" value="test-qsaratomic"/><param name="source" value="${src}/test"/></antcall>
616 <antcall target="compile-module"><param name="module" value="test-qsarbond"/><param name="source" value="${src}/test"/></antcall>
617 <antcall target="compile-module"><param name="module" value="test-qsarmolecular"/><param name="source" value="${src}/test"/></antcall>
8fe5eea Fixed last few dependency problems
egonw authored
618 <antcall target="compile-module"><param name="module" value="test-experimental"/><param name="source" value="${src}/test"/></antcall>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
619 <antcall target="compile-module"><param name="module" value="test-qsarprotein"/><param name="source" value="${src}/test"/></antcall>
620 <antcall target="compile-module"><param name="module" value="test-pdb"/><param name="source" value="${src}/test"/></antcall>
621 <antcall target="compile-module"><param name="module" value="test-inchi"/><param name="source" value="${src}/test"/></antcall>
622 <antcall target="compile-module"><param name="module" value="test-libiomd"/><param name="source" value="${src}/test"/></antcall>
623 <antcall target="compile-module"><param name="module" value="test-libiocml"/><param name="source" value="${src}/test"/></antcall>
624 <antcall target="compile-module"><param name="module" value="test-smarts"/><param name="source" value="${src}/test"/></antcall>
625 <antcall target="compile-module"><param name="module" value="test-pcore"/><param name="source" value="${src}/test"/></antcall>
626 <antcall target="compile-module"><param name="module" value="test-formula"/><param name="source" value="${src}/test"/></antcall>
7511417 Fixed a dependency problem.
egonw authored
627 </target>
628
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
629 <target id="dist-large" name="dist-large" depends="dist-all"
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
630 description="Builds one big jar file for the CDK, including experimental classes and third-party libraries.">
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
631
c660505 Reworked dist-large target
egonw authored
632 <!-- first unjar the CDK and other jars we need -->
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -jar ...
egonw authored
633 <mkdir dir="${appjars.dir}"/>
c660505 Reworked dist-large target
egonw authored
634 <unjar dest="${appjars.dir}">
635 <fileset dir="${lib}">
636 <includesfile name="${metainf}/applications.libdepends"/>
afac743 Set up the atomtype module
egonw authored
637 <includesfile name="${metainf}/atomtype.libdepends"/>
c660505 Reworked dist-large target
egonw authored
638 <includesfile name="${metainf}/builder3d.libdepends"/>
161b318 Put the helper tool into a separate module, to solve dependency issues.
egonw authored
639 <includesfile name="${metainf}/builder3dtools.libdepends"/>
3673f87 Added missing jar in dist-large target
egonw authored
640 <includesfile name="${metainf}/charges.libdepends"/>
c660505 Reworked dist-large target
egonw authored
641 <includesfile name="${metainf}/core.libdepends"/>
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
642 <includesfile name="${metainf}/control.libdepends"/>
9db2505 Added missing jars to dist-large target
egonw authored
643 <includesfile name="${metainf}/datadebug.libdepends"/>
c660505 Reworked dist-large target
egonw authored
644 <includesfile name="${metainf}/data.libdepends"/>
645 <includesfile name="${metainf}/experimental.libdepends"/>
646 <includesfile name="${metainf}/extra.libdepends"/>
9db2505 Added missing jars to dist-large target
egonw authored
647 <includesfile name="${metainf}/io.libdepends"/>
7e20d83 Fixed libiocml module: remove '-' and added a test suite for the module ...
egonw authored
648 <includesfile name="${metainf}/libiocml.libdepends"/>
9db2505 Added missing jars to dist-large target
egonw authored
649 <includesfile name="${metainf}/nonotify.libdepends"/>
650 <includesfile name="${metainf}/pdb-cml.libdepends"/>
651 <includesfile name="${metainf}/pdb.libdepends"/>
c660505 Reworked dist-large target
egonw authored
652 <includesfile name="${metainf}/qsar.libdepends"/>
03c62ba Set up the modules qsaratomic, qsarbond and qsarprotein
egonw authored
653 <includesfile name="${metainf}/qsaratomic.libdepends"/>
654 <includesfile name="${metainf}/qsarbond.libdepends"/>
5b57bad Forgot to upload the changed build.xml to reflect the new qsarmolecular ...
egonw authored
655 <includesfile name="${metainf}/qsarmolecular.libdepends"/>
03c62ba Set up the modules qsaratomic, qsarbond and qsarprotein
egonw authored
656 <includesfile name="${metainf}/qsarprotein.libdepends"/>
9db2505 Added missing jars to dist-large target
egonw authored
657 <includesfile name="${metainf}/qsar-cml.libdepends"/>
41766ae new reaction type class which contains reaction processes
miguelrojasch authored
658 <includesfile name="${metainf}/reaction.libdepends"/>
c660505 Reworked dist-large target
egonw authored
659 <includesfile name="${metainf}/render.libdepends"/>
660 <includesfile name="${metainf}/standard.libdepends"/>
9db2505 Added missing jars to dist-large target
egonw authored
661 <includesfile name="${metainf}/svg.libdepends"/>
662 <includesfile name="${metainf}/valencycheck.libdepends"/>
41a8981 Created unit tests for cdk-inchi module
sea36 authored
663 <includesfile name="${metainf}/sdg.libdepends"/>
be50e2b Added new structgen module to dist-large.
egonw authored
664 <includesfile name="${metainf}/forcefield.libdepends"/>
0bf100d Added InChI module to regular compile setup
egonw authored
665 <includesfile name="${metainf}/inchi.libdepends"/>
cd11a7e Updated build script so that dist-large includes the smarts module
rajarshi authored
666 <includesfile name="${metainf}/smarts.libdepends"/>
71ce329 Updated build.xml to include the pcore module in the big jar file
rajarshi authored
667 <includesfile name="${metainf}/pcore.libdepends"/>
bf6d69c Applied the mf/ branch to trunk/
egonw authored
668 <includesfile name="${metainf}/formula.libdepends"/>
e10f59a Add the isomorphism module to dist-large tag
thomaskuhn authored
669 <includesfile name="${metainf}/isomorphism.libdepends"/>
c660505 Reworked dist-large target
egonw authored
670 </fileset>
671 <fileset dir="${dist}/jar">
672 <include name="cdk-applications.jar"/>
afac743 Set up the atomtype module
egonw authored
673 <include name="cdk-atomtype.jar"/>
c660505 Reworked dist-large target
egonw authored
674 <include name="cdk-builder3d.jar"/>
161b318 Put the helper tool into a separate module, to solve dependency issues.
egonw authored
675 <include name="cdk-builder3dtools.jar"/>
3673f87 Added missing jar in dist-large target
egonw authored
676 <include name="cdk-charges.jar"/>
c660505 Reworked dist-large target
egonw authored
677 <include name="cdk-core.jar"/>
0a739e8 Updted to include cdk-dict.jar in the big jar
rajarshi authored
678 <include name="cdk-dict.jar"/>
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
679 <include name="cdk-control.jar"/>
9db2505 Added missing jars to dist-large target
egonw authored
680 <include name="cdk-datadebug.jar"/>
c660505 Reworked dist-large target
egonw authored
681 <include name="cdk-data.jar"/>
682 <include name="cdk-experimental.jar"/>
683 <include name="cdk-extra.jar"/>
684 <include name="cdk-interfaces.jar"/>
685 <include name="cdk-io.jar"/>
7e20d83 Fixed libiocml module: remove '-' and added a test suite for the module ...
egonw authored
686 <include name="cdk-libiocml.jar"/>
8459c22 Included the libiomd module
egonw authored
687 <include name="cdk-libiomd.jar"/>
9db2505 Added missing jars to dist-large target
egonw authored
688 <include name="cdk-nonotify.jar"/>
689 <include name="cdk-pdb-cml.jar"/>
690 <include name="cdk-pdb.jar"/>
c660505 Reworked dist-large target
egonw authored
691 <include name="cdk-qsar.jar"/>
03c62ba Set up the modules qsaratomic, qsarbond and qsarprotein
egonw authored
692 <include name="cdk-qsaratomic.jar"/>
693 <include name="cdk-qsarbond.jar"/>
5b57bad Forgot to upload the changed build.xml to reflect the new qsarmolecular ...
egonw authored
694 <include name="cdk-qsarmolecular.jar"/>
03c62ba Set up the modules qsaratomic, qsarbond and qsarprotein
egonw authored
695 <include name="cdk-qsarprotein.jar"/>
29687ca Added a CML Customizer interface which reduces the CDK module dependency...
egonw authored
696 <include name="cdk-qsar-cml.jar"/>
41766ae new reaction type class which contains reaction processes
miguelrojasch authored
697 <include name="cdk-reaction.jar"/>
c660505 Reworked dist-large target
egonw authored
698 <include name="cdk-render.jar"/>
699 <include name="cdk-standard.jar"/>
be50e2b Added new structgen module to dist-large.
egonw authored
700 <include name="cdk-structgen.jar"/>
9db2505 Added missing jars to dist-large target
egonw authored
701 <include name="cdk-svg.jar"/>
9c7431a Fixed stupid typo
egonw authored
702 <include name="cdk-valencycheck.jar"/>
f86e117 Created the smiles module
egonw authored
703 <include name="cdk-forcefield.jar"/>
704 <include name="cdk-smiles.jar"/>
cd11a7e Updated build script so that dist-large includes the smarts module
rajarshi authored
705 <include name="cdk-smarts.jar"/>
41a8981 Created unit tests for cdk-inchi module
sea36 authored
706 <include name="cdk-sdg.jar"/>
0bf100d Added InChI module to regular compile setup
egonw authored
707 <include name="cdk-inchi.jar"/>
71ce329 Updated build.xml to include the pcore module in the big jar file
rajarshi authored
708 <include name="cdk-pcore.jar"/>
bf6d69c Applied the mf/ branch to trunk/
egonw authored
709 <include name="cdk-formula.jar"/>
e10f59a Add the isomorphism module to dist-large tag
thomaskuhn authored
710 <include name="cdk-isomorphism.jar"/>
c660505 Reworked dist-large target
egonw authored
711 </fileset>
712 </unjar>
9db2505 Added missing jars to dist-large target
egonw authored
713
c660505 Reworked dist-large target
egonw authored
714 <!-- then zip up things -->
169e29a Updated build.xml to remove usage of a date stamp and rather use what ev...
rajarshi authored
715 <jar jarfile="${dist}/jar/cdk-${version}.jar">
c660505 Reworked dist-large target
egonw authored
716 <manifest>
717 <attribute name="Main-Class" value="org.openscience.cdk.applications.DistLargeInfo"/>
718 <section name="org.openscience.cdk">
719 <attribute name="Specification-Title" value="The Chemistry Development Kit"/>
720 <attribute name="Specification-Version" value="1.0"/>
721 <attribute name="Specification-Vendor" value="The CDK Project"/>
722 <attribute name="Implementation-Title" value="org.openscience.cdk"/>
723 <attribute name="Implementation-Version" value="${version}"/>
724 <attribute name="Implementation-Vendor" value="The CDK Project"/>
725 </section>
726 </manifest>
727 <fileset dir="${appjars.dir}">
728 <include name="**/*" />
729 </fileset>
730 </jar>
af5b768 cdk-all is now a self containing one-jar big CDK library (try java -jar ...
egonw authored
731 </target>
732
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
733 <target id="dist-pure" name="dist-pure" depends="dist-all"
734 description="Builds one big jar file for the CDK, including experimental classes, but excluding third party libraries.">
735
736 <!-- first unjar the CDK and other jars we need -->
737 <mkdir dir="${appjars.dir}"/>
738 <unjar dest="${appjars.dir}">
739 <fileset dir="${dist}/jar">
740 <include name="cdk-applications.jar"/>
741 <include name="cdk-builder3d.jar"/>
742 <include name="cdk-builder3dtools.jar"/>
743 <include name="cdk-charges.jar"/>
744 <include name="cdk-core.jar"/>
745 <include name="cdk-control.jar"/>
746 <include name="cdk-datadebug.jar"/>
747 <include name="cdk-data.jar"/>
748 <include name="cdk-experimental.jar"/>
749 <include name="cdk-extra.jar"/>
750 <include name="cdk-interfaces.jar"/>
751 <include name="cdk-io.jar"/>
7e20d83 Fixed libiocml module: remove '-' and added a test suite for the module ...
egonw authored
752 <include name="cdk-libiocml.jar"/>
8459c22 Included the libiomd module
egonw authored
753 <include name="cdk-libiomd.jar"/>
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
754 <include name="cdk-nonotify.jar"/>
755 <include name="cdk-pdb-cml.jar"/>
756 <include name="cdk-pdb.jar"/>
757 <include name="cdk-qsar.jar"/>
03c62ba Set up the modules qsaratomic, qsarbond and qsarprotein
egonw authored
758 <include name="cdk-qsaratomic.jar"/>
759 <include name="cdk-qsarbond.jar"/>
5b57bad Forgot to upload the changed build.xml to reflect the new qsarmolecular ...
egonw authored
760 <include name="cdk-qsarmolecular.jar"/>
03c62ba Set up the modules qsaratomic, qsarbond and qsarprotein
egonw authored
761 <include name="cdk-qsarprotein.jar"/>
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
762 <include name="cdk-qsar-cml.jar"/>
763 <include name="cdk-reaction.jar"/>
764 <include name="cdk-render.jar"/>
765 <include name="cdk-standard.jar"/>
766 <include name="cdk-structgen.jar"/>
767 <include name="cdk-svg.jar"/>
768 <include name="cdk-valencycheck.jar"/>
769 <include name="cdk-forcefield.jar"/>
45c8c0c Added smarts to JUnit testing
egonw authored
770 <include name="cdk-smarts.jar"/>
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
771 <include name="cdk-smiles.jar"/>
772 <include name="cdk-sdg.jar"/>
773 <include name="cdk-inchi.jar"/>
9c15cf9 Updated scripts so that testing is performed on the pcore module
rajarshi authored
774 <include name="cdk-pcore.jar"/>
bf6d69c Applied the mf/ branch to trunk/
egonw authored
775 <include name="cdk-formula.jar"/>
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
776 </fileset>
777 </unjar>
778
779 <!-- then zip up things -->
169e29a Updated build.xml to remove usage of a date stamp and rather use what ev...
rajarshi authored
780 <jar jarfile="${dist}/jar/cdk-pure-${version}.jar">
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
781 <manifest>
782 <attribute name="Main-Class" value="org.openscience.cdk.applications.DistLargeInfo"/>
783 <section name="org.openscience.cdk">
784 <attribute name="Specification-Title" value="The Chemistry Development Kit"/>
785 <attribute name="Specification-Version" value="1.0"/>
786 <attribute name="Specification-Vendor" value="The CDK Project"/>
787 <attribute name="Implementation-Title" value="org.openscience.cdk"/>
788 <attribute name="Implementation-Version" value="${version}"/>
789 <attribute name="Implementation-Vendor" value="The CDK Project"/>
790 </section>
791 </manifest>
792 <fileset dir="${appjars.dir}">
793 <include name="**/*" />
794 </fileset>
795 </jar>
796 </target>
797
88311e5 Added target for a jar with all the test stuff
egonw authored
798 <target id="dist-test-large" name="dist-test-large" depends="test-dist-all"
799 description="Builds on big jar file for the CDK test classes.">
800
801 <!-- first unjar the CDK and other jars we need -->
802 <mkdir dir="${appjars.dir}"/>
803 <unjar dest="${appjars.dir}">
804 <fileset dir="${lib}">
805 <includesfile name="${metainf}/test-core.libdepends"/>
806 <includesfile name="${metainf}/test-data.libdepends"/>
807 <includesfile name="${metainf}/test-datadebug.libdepends"/>
808 <includesfile name="${metainf}/test-experimental.libdepends"/>
809 <includesfile name="${metainf}/test-extra.libdepends"/>
d31ee42 New module: test-builder3d
egonw authored
810 <includesfile name="${metainf}/test-builder3d.libdepends"/>
88311e5 Added target for a jar with all the test stuff
egonw authored
811 <includesfile name="${metainf}/test-forcefield.libdepends"/>
812 <includesfile name="${metainf}/test-inchi.libdepends"/>
813 <includesfile name="${metainf}/test-io.libdepends"/>
814 <includesfile name="${metainf}/test-nonotify.libdepends"/>
815 <includesfile name="${metainf}/test-pdb.libdepends"/>
03c62ba Set up the modules qsaratomic, qsarbond and qsarprotein
egonw authored
816 <includesfile name="${metainf}/test-qsaratomic.libdepends"/>
817 <includesfile name="${metainf}/test-qsarbond.libdepends"/>
5b57bad Forgot to upload the changed build.xml to reflect the new qsarmolecular ...
egonw authored
818 <includesfile name="${metainf}/test-qsarmolecular.libdepends"/>
03c62ba Set up the modules qsaratomic, qsarbond and qsarprotein
egonw authored
819 <includesfile name="${metainf}/test-qsarprotein.libdepends"/>
820 <includesfile name="${metainf}/test-qsar.libdepends"/>
88311e5 Added target for a jar with all the test stuff
egonw authored
821 <includesfile name="${metainf}/test-reaction.libdepends"/>
45c8c0c Added smarts to JUnit testing
egonw authored
822 <includesfile name="${metainf}/test-smarts.libdepends"/>
88311e5 Added target for a jar with all the test stuff
egonw authored
823 <includesfile name="${metainf}/test-smiles.libdepends"/>
824 <includesfile name="${metainf}/test-standard.libdepends"/>
be50e2b Added new structgen module to dist-large.
egonw authored
825 <includesfile name="${metainf}/test-structgen.libdepends"/>
88311e5 Added target for a jar with all the test stuff
egonw authored
826 <includesfile name="${metainf}/test-valencycheck.libdepends"/>
cb52b54 Hooked in stuff for the charges module
egonw authored
827 <includesfile name="${metainf}/test-charges.libdepends"/>
8459c22 Included the libiomd module
egonw authored
828 <includesfile name="${metainf}/test-libiomd.libdepends"/>
9c15cf9 Updated scripts so that testing is performed on the pcore module
rajarshi authored
829 <includesfile name="${metainf}/test-pcore.libdepends"/>
bf6d69c Applied the mf/ branch to trunk/
egonw authored
830 <includesfile name="${metainf}/test-formula.libdepends"/>
88311e5 Added target for a jar with all the test stuff
egonw authored
831 </fileset>
832 <fileset dir="${dist}/jar">
833 <include name="cdk-test-core.jar"/>
834 <include name="cdk-test-data.jar"/>
835 <include name="cdk-test-datadebug.jar"/>
836 <include name="cdk-test-experimental.jar"/>
837 <include name="cdk-test-extra.jar"/>
d31ee42 New module: test-builder3d
egonw authored
838 <include name="cdk-test-builder3d.jar"/>
88311e5 Added target for a jar with all the test stuff
egonw authored
839 <include name="cdk-test-forcefield.jar"/>
840 <include name="cdk-test-inchi.jar"/>
841 <include name="cdk-test-io.jar"/>
842 <include name="cdk-test-nonotify.jar"/>
843 <include name="cdk-test-pdb.jar"/>
03c62ba Set up the modules qsaratomic, qsarbond and qsarprotein
egonw authored
844 <include name="cdk-test-qsaratomic.jar"/>
845 <include name="cdk-test-qsarbond.jar"/>
5b57bad Forgot to upload the changed build.xml to reflect the new qsarmolecular ...
egonw authored
846 <include name="cdk-test-qsarmolecular.jar"/>
03c62ba Set up the modules qsaratomic, qsarbond and qsarprotein
egonw authored
847 <include name="cdk-test-qsarprotein.jar"/>
848 <include name="cdk-test-qsar.jar"/>
88311e5 Added target for a jar with all the test stuff
egonw authored
849 <include name="cdk-test-reaction.jar"/>
45c8c0c Added smarts to JUnit testing
egonw authored
850 <include name="cdk-test-smarts.jar"/>
88311e5 Added target for a jar with all the test stuff
egonw authored
851 <include name="cdk-test-smiles.jar"/>
852 <include name="cdk-test-standard.jar"/>
be50e2b Added new structgen module to dist-large.
egonw authored
853 <include name="cdk-test-structgen.jar"/>
88311e5 Added target for a jar with all the test stuff
egonw authored
854 <include name="cdk-test-valencycheck.jar"/>
cb52b54 Hooked in stuff for the charges module
egonw authored
855 <include name="cdk-test-charges.jar"/>
8459c22 Included the libiomd module
egonw authored
856 <include name="cdk-test-libiomd.jar"/>
9c15cf9 Updated scripts so that testing is performed on the pcore module
rajarshi authored
857 <include name="cdk-test-pcore.jar"/>
bf6d69c Applied the mf/ branch to trunk/
egonw authored
858 <include name="cdk-test-formula.jar"/>
88311e5 Added target for a jar with all the test stuff
egonw authored
859 </fileset>
860 </unjar>
861
862 <!-- then zip up things -->
169e29a Updated build.xml to remove usage of a date stamp and rather use what ev...
rajarshi authored
863 <jar jarfile="${dist}/jar/cdk-test-${version}.jar">
88311e5 Added target for a jar with all the test stuff
egonw authored
864 <manifest>
0ed56fa Fixed with respect to cdk.test now being cdk (together with src/test)
egonw authored
865 <attribute name="Main-Class" value="org.openscience.cdk.CDKTests"/>
88311e5 Added target for a jar with all the test stuff
egonw authored
866 <section name="org.openscience.cdk">
867 <attribute name="Specification-Title" value="The Chemistry Development Kit"/>
868 <attribute name="Specification-Version" value="1.0"/>
869 <attribute name="Specification-Vendor" value="The CDK Project"/>
870 <attribute name="Implementation-Title" value="org.openscience.cdk"/>
871 <attribute name="Implementation-Version" value="${version}"/>
872 <attribute name="Implementation-Vendor" value="The CDK Project"/>
873 </section>
874 </manifest>
875 <fileset dir="${appjars.dir}">
876 <include name="**/*" />
877 </fileset>
878 </jar>
879 </target>
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
880
8c06c63 Fixed inclusion of .javafiles, .classes, and .set files for easy buildin...
egonw authored
881 <target id="sourcedist" name="sourcedist" depends="init, runDoclet"
7d866cb Updated and synched descriptions: try ant -projecthelp
egonw authored
882 description="Builds the source packages.">
218de5b Release Candidate 1 for the CDK: 0.99.1. Now on SourceForge! Happy bug r...
egonw authored
883 <property name="package" value="cdk-src+libs-${version}"/>
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
884 <property name="sourcedist.dir" value="${sourcedist}/${package}"/>
218de5b Release Candidate 1 for the CDK: 0.99.1. Now on SourceForge! Happy bug r...
egonw authored
885 <delete dir="${sourcedist.dir}"/>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
886 <copy todir="${sourcedist.dir}/${${src}/main/org/}">
54a21b6 The .javafiles now get created in build/ instead of src/
egonw authored
887 <fileset dir="${build}" includes="*.javafiles" />
888 <fileset dir="${build}" includes="*.classes" />
889 <fileset dir="${build}" includes="*.set" />
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
890 <fileset dir="${src}/main/" includes="**/*.java" />
891 <fileset dir="${src}/main/" includes="**/*.jj" />
892 <fileset dir="${src}/main/" includes="org/openscience/cdk/io/cml/data/**" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
893 </copy>
894 <copy todir="${sourcedist.dir}">
7447e16 Getting ready for release
egonw authored
895 <fileset dir="." includes="build.props" />
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
896 <fileset dir="." includes="build.xml" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
897 <fileset dir="." includes="javadoc.xml" />
898 <fileset dir="." includes="README" />
e99a32a Preparing for a release
egonw authored
899 <fileset dir="." includes="changelog*" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
900 </copy>
d6cda7b Distribute LGPL license with sourcecode
egonw authored
901 <copy todir="${sourcedist.dir}/jar">
fbf19c3 The source releases contained unnecessary libraries
egonw authored
902 <fileset dir="jar">
903 <exclude name="libio/*.jar"/>
904 </fileset>
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
905 </copy>
998ae6a Updated for current CVS.
egonw authored
906 <copy todir="${sourcedist.dir}/develjar">
907 <fileset dir="develjar">
908 <exclude name="pmd-1.8.jar"/>
909 <exclude name="doccheck.jar"/>
910 <exclude name="dbdoclet*.*"/>
911 </fileset>
912 </copy>
913 <copy todir="${sourcedist.dir}/src/META-INF">
914 <fileset dir="src/META-INF" />
915 </copy>
7aa27da Make sure the config.data files get included in the source dist (closes ...
egonw authored
916 <copy todir="${sourcedist.dir}/${src}/org/openscience/cdk/config/data/">
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
917 <fileset dir="${src}/main/org/openscience/cdk/config/data/"
e1f7ebb Do not try to build classes that depend on classes that depend on Java3D
egonw authored
918 includes="*" />
919 </copy>
a289167 Minor tweak to get distribs working
egonw authored
920 <copy
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
921 file="${src}/main/org/openscience/cdk/dict/data/chemical.xml"
922 tofile="${sourcedist.dir}/${src}/main/org/openscience/cdk/dict/data/chemical.xml" />
dece975 Fixed the build script to properly incldue the control module and its li...
rajarshi authored
923 <copy
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
924 file="${src}/main/org/openscience/cdk/dict/data/elements.xml"
925 tofile="${sourcedist.dir}/${src}/main/org/openscience/cdk/dict/data/elements.xml" />
926 <mkdir dir="${sourcedist.dir}/${src}/main/org/openscience/cdk/qsar/model/data/"/>
927 <copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/qsar/model/data/">
928 <fileset dir="${src}/main/org/openscience/cdk/qsar/model/data/" includes="*.R"/>
e2623a3 Added some missing files to the sourcedist
egonw authored
929 </copy>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
930 <mkdir dir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/forcefield/data/"/>
931 <copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/forcefield/data/">
932 <fileset dir="${src}/main/org/openscience/cdk/modeling/forcefield/data/" includes="*.prm"/>
998ae6a Updated for current CVS.
egonw authored
933 </copy>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
934 <mkdir dir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/builder3d/data/"/>
935 <copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/builder3d/data/">
936 <fileset dir="${src}/main/org/openscience/cdk/modeling/builder3d/data/" includes="*.gz"/>
00c2efc Added missing builder3d templates to sourcedist.
egonw authored
937 </copy>
9496005 Added missing manifest
egonw authored
938 <copy todir="${sourcedist.dir}/${src}/">
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
939 <fileset dir="${src}/main/" includes="*.manifest" />
9496005 Added missing manifest
egonw authored
940 </copy>
d6cda7b Distribute LGPL license with sourcecode
egonw authored
941 <mkdir dir="${sourcedist.dir}/doc/" />
942 <copy todir="${sourcedist.dir}/doc/">
943 <fileset dir="doc/" includes="lgpl.license" />
944 </copy>
7447e16 Getting ready for release
egonw authored
945 <mkdir dir="${sourcedist.dir}/doc/javadoc" />
218de5b Release Candidate 1 for the CDK: 0.99.1. Now on SourceForge! Happy bug r...
egonw authored
946 <!-- the below deteles are a workaround, because the above should not have copied
947 in the src/data and src/org/openscience/cdk/test dirs -->
948 <delete dir="${sourcedist.dir}/src/data"/>
949
950 <!-- now package things up -->
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
951 <tar tarfile="${package}.tar" basedir="${sourcedist}/" includes="${package}/**" />
a0ba425 Updated sourcedist target so that it uses the current date for the final...
rajarshi authored
952 <gzip zipfile="${package}.tar.gz" src="${package}.tar" />
24c8548 Fixed building of sourcedist. Now can be compiled.
egonw authored
953 <delete file="${package}.tar" />
954 <zip zipfile="${package}.zip" basedir="${sourcedist}/" includes="${package}/**" />
998ae6a Updated for current CVS.
egonw authored
955 </target>
5e15181 The class org.openscience.cdk.structgen.SingleStructureRandomGenerator
steinbeck authored
956
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
957 <target id="puredist" name="puredist" depends="init, runDoclet"
958 description="Builds the source packages without third-party libaries.">
218de5b Release Candidate 1 for the CDK: 0.99.1. Now on SourceForge! Happy bug r...
egonw authored
959 <property name="package" value="cdk-${version}"/>
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
960 <property name="sourcedist.dir" value="${sourcedist}/${package}"/>
218de5b Release Candidate 1 for the CDK: 0.99.1. Now on SourceForge! Happy bug r...
egonw authored
961 <delete dir="${sourcedist.dir}"/>
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
962 <copy todir="${sourcedist.dir}/${src}">
963 <fileset dir="${build}" includes="*.javafiles" />
964 <fileset dir="${build}" includes="*.classes" />
965 <fileset dir="${build}" includes="*.set" />
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
966 <fileset dir="${src}/main/" includes="**/*.java" />
967 <fileset dir="${src}/main/" includes="**/*.jj" />
968 <fileset dir="${src}/main/" includes="org/openscience/cdk/io/cml/data/**" />
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
969 </copy>
970 <copy todir="${sourcedist.dir}">
971 <fileset dir="." includes="build.props" />
972 <fileset dir="." includes="build.xml" />
973 <fileset dir="." includes="javadoc.xml" />
974 <fileset dir="." includes="README" />
975 <fileset dir="." includes="changelog*" />
976 </copy>
977 <copy todir="${sourcedist.dir}/src/data">
978 <fileset dir="src/data" />
979 </copy>
980 <copy todir="${sourcedist.dir}/src/META-INF">
981 <fileset dir="src/META-INF" />
982 </copy>
983 <copy todir="${sourcedist.dir}/${src}/org/openscience/cdk/config/data/">
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
984 <fileset dir="${src}/main/org/openscience/cdk/config/data/"
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
985 includes="*" />
986 </copy>
987 <copy
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
988 file="${src}/main/org/openscience/cdk/dict/data/chemical.xml"
989 tofile="${sourcedist.dir}/${src}/main/org/openscience/cdk/dict/data/chemical.xml" />
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
990 <copy
991 file="${src}/org/openscience/cdk/dict/data/elements.xml"
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
992 tofile="${sourcedist.dir}/${src}/main/org/openscience/cdk/dict/data/elements.xml" />
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
993 <mkdir dir="${sourcedist.dir}/${src}/org/openscience/cdk/qsar/model/data/"/>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
994 <copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/qsar/model/data/">
995 <fileset dir="${src}/main/org/openscience/cdk/qsar/model/data/" includes="*.R"/>
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
996 </copy>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
997 <mkdir dir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/forcefield/data/"/>
998 <copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/forcefield/data/">
999 <fileset dir="${src}/main/org/openscience/cdk/modeling/forcefield/data/" includes="*.prm"/>
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
1000 </copy>
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
1001 <mkdir dir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/builder3d/data/"/>
1002 <copy todir="${sourcedist.dir}/${src}/main/org/openscience/cdk/modeling/builder3d/data/">
1003 <fileset dir="${src}/main/org/openscience/cdk/modeling/builder3d/data/" includes="*.gz"/>
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
1004 </copy>
1005 <copy todir="${sourcedist.dir}/${src}/">
7c5c872 Merged the branch egonw/maintest: sets up src/main and src/test for spli...
egonw authored
1006 <fileset dir="${src}/main/" includes="*.manifest" />
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
1007 </copy>
1008 <mkdir dir="${sourcedist.dir}/doc/" />
1009 <copy todir="${sourcedist.dir}/doc/">
1010 <fileset dir="doc/" includes="lgpl.license" />
1011 </copy>
1012 <mkdir dir="${sourcedist.dir}/doc/javadoc" />
218de5b Release Candidate 1 for the CDK: 0.99.1. Now on SourceForge! Happy bug r...
egonw authored
1013 <!-- the below deteles are a workaround, because the above should not have copied
1014 in the src/data and src/org/openscience/cdk/test dirs -->
1015 <delete dir="${sourcedist.dir}/src/data"/>
1016 <delete dir="${sourcedist.dir}/src/org/openscience/cdk/test"/>
1017
1018 <!-- now package things up -->
e423642 Added 'pure' variants of sourcedist and dist-large, for situations where...
egonw authored
1019 <tar tarfile="${package}.tar" basedir="${sourcedist}/" includes="${package}/**" />
1020 <gzip zipfile="${package}.tar.gz" src="${package}.tar" />
1021 <delete file="${package}.tar" />
1022 </target>
1023
6fa4411 Fail build process for test (etc) when JUnit is not installed in ANT_HOM...
egonw authored
1024 <target id="noJunit" name="noJunit" depends="check" unless="junit.present">
0f66d81 Better solution for missing JUnit; does not require super cow powers
egonw authored
1025 <fail message="JUnit is not installed in Ant. Please run ant with the option '-lib develjar/junit-4.3.1.jar'."/>
6fa4411 Fail build process for test (etc) when JUnit is not installed in ANT_HOM...
egonw authored
1026 </target>
1027
a68b440 Moved a redundant dependency.
egonw authored
1028 <target id="test-module" name="test-module" depends="noJunit"
bd190c6 Finished transition to modularized testing
egonw authored
1029 description="Performs a full JUnit test for the CDK."
1030 if="junit.present">
1031
1032 <echo message="Testing classes for CDK's ${module} module." />
1033
1034 <!-- check for availability for meta info files -->
1035 <available file="${metainf}/test-${module}.cdkdepends" property="module.cdkdepends.present"/>
1036 <available file="${metainf}/test-${module}.libdepends" property="module.libdepends.present"/>
1037 <available file="${metainf}/test-${module}.devellibdepends" property="module.devellibdepends.present"/>
1038
1039 <!-- be somewhat informative -->
1040 <echo message="CDK dependencies defined: ${module.cdkdepends.present}"/>
1041 <echo message="Library dependencies defined: ${module.libdepends.present}"/>
1042 <echo message="Developer Library dependencies defined: ${module.devellibdepends.present}"/>
1043
1044 <mkdir dir="${reports.tests}"/>
1045 <junit printsummary="yes" haltonfailure="no" fork="yes" maxmemory="256m">
1046 <classpath>
1047 <fileset