Ubuntu
jmol package

Merge lp:~james-page/ubuntu/oneiric/jmol/ftbfs into lp:ubuntu/oneiric/jmol

  1. Oneiric (11.10)
  2. ftbfs
  3. Merge into oneiric
Proposed by James Page
Status: Merged
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp:~james-page/ubuntu/oneiric/jmol/ftbfs
Merge into: lp:ubuntu/oneiric/jmol
Diff against target: 1666 lines (+1601/-2)
7 files modified
.pc/applied-patches (+1/-0)
.pc/fix-icedtea-web-plugin.patch/build.xml (+1554/-0)
build.xml (+6/-0)
debian/changelog (+9/-0)
debian/control (+3/-2)
debian/patches/fix-icedtea-web-plugin.patch (+27/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~james-page/ubuntu/oneiric/jmol/ftbfs
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+75521@code.launchpad.net

Description of the change

Fixup FTBFS - resync from Debian next release once new revision hits testing.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.pc/applied-patches'
--- .pc/applied-patches 2011-04-11 22:04:43 +0000
+++ .pc/applied-patches 2011-09-15 11:23:35 +0000
@@ -3,3 +3,4 @@
3chime2jmol_binary.patch3chime2jmol_binary.patch
4right_cgi_diretory.patch4right_cgi_diretory.patch
5cgi_fix_shebang.patch5cgi_fix_shebang.patch
6fix-icedtea-web-plugin.patch
67
=== added directory '.pc/fix-icedtea-web-plugin.patch'
=== added file '.pc/fix-icedtea-web-plugin.patch/build.xml'
--- .pc/fix-icedtea-web-plugin.patch/build.xml 1970-01-01 00:00:00 +0000
+++ .pc/fix-icedtea-web-plugin.patch/build.xml 2011-09-15 11:23:35 +0000
@@ -0,0 +1,1554 @@
1<project name="Jmol" default="main" basedir=".">
2 <!--
3 DocumentId $Id: build.xml 15069 2011-01-29 21:08:48Z nicove $
4 -->
5
6 <!-- Contributions -->
7 <!-- <for list ...> construct needs ant-contrib.jar -->
8 <taskdef resource="net/sf/antcontrib/antlib.xml">
9 <classpath>
10 <pathelement location="${lib.dir}/ant-contrib.jar" />
11 </classpath>
12 </taskdef>
13
14 <!-- pull developer-specific settings from their home directory -->
15 <property file="${user.home}/.jmol.build.properties" />
16 <!-- compile options -->
17 <property name="build.sysclasspath" value="ignore" />
18 <property name="build.compiler" value="javac1.5" />
19 <!-- for some reason, I can't get ant to use this ${java.version}
20 property as the value of the source parameter -->
21 <property name="java.version" value="1.5" />
22 <property name="debug" value="off" />
23 <property name="deprecation" value="off" />
24 <property name="optimization" value="off" />
25
26 <property file="src/org/jmol/viewer/Jmol.properties" prefix="Jmol.properties" />
27 <property name="version" value="${Jmol.properties.version}" />
28 <property name="jvxl_version" value="0.1" />
29
30 <property name="tests.source.dir" value="source-tests" />
31 <property name="lib.dir" value="jars" />
32 <property name="plugin.dir" value="plugin-jars" />
33 <property name="appjars.dir" value="build/appjars" />
34 <property name="classes.dir" value="build/classes" />
35 <property name="test-classes.dir" value="build/test-classes" />
36 <property name="appletjars.dir" value="build/appletjars" />
37 <property name="applet.classes.dir" value="build/applet-classes" />
38 <property name="apisio.classes.dir" value="build/apisio-classes" />
39 <property name="tests.dir" value="build/unit.tests" />
40 <property name="javadoc.dir" value="build/javadoc" />
41 <property name="jmol.applet.build.dir" value="build" />
42 <property name="jmol.build.dir" value="build" />
43 <property name="docbook-xsl" value="docbook-xsl-1.75.2" />
44 <property name="docbook-xml" value="docbook-xml-4.4" />
45 <property name="vecmath.jar" value="vecmath1.2-1.14.jar" />
46 <property name="itext.jar" value="itext-1.4.5.jar" />
47 <property name="commons-cli.jar" value="commons-cli-1.0.jar" />
48
49 <!-- you can set this by defining it in ~/.jmol.build.properties -->
50 <property name="keystore.name" value="Must be set by user." />
51
52 <property file="proxy.properties" />
53
54 <import file="tools/build-i18n.xml"/>
55
56 <path id="project.class.path">
57 <fileset dir="${lib.dir}">
58 <include name="*.jar" />
59 </fileset>
60 </path>
61
62 <path id="applet-project.class.path">
63 <fileset dir="${lib.dir}">
64 <include name="*.jar" />
65 </fileset>
66 </path>
67
68 <path id="apisio-project.class.path">
69 <fileset dir="${lib.dir}">
70 <include name="${vecmath.jar}" />
71 <include name="netscape.jar" />
72 <include name="gnujaxp.jar" />
73 </fileset>
74 </path>
75
76 <target name="main" id="main" depends="init,jar,applet-jar,signed-applet,smiles-applet-jar"/>
77
78 <target name="all" id="all" depends="doc,main"/>
79
80 <target name="init" id="init">
81 <tstamp/>
82 </target>
83
84 <target name="initFailure" id="initFailure">
85 <fail message="Init failed. See messages above." />
86 </target>
87
88 <target name="setup" id="setup">
89 <condition property="docbook-xsl.uptodate">
90 <and>
91 <uptodate targetfile="build/${docbook-xsl}"
92 srcfile="doc/${docbook-xsl}.tar.gz" />
93 <uptodate targetfile="build/${docbook-xsl}.timestamp"
94 srcfile="build/${docbook-xsl}" />
95 </and>
96 </condition>
97
98 <condition property="docbook-xml.uptodate">
99 <and>
100 <uptodate targetfile="build/docbook-xml"
101 srcfile="doc/${docbook-xml}.zip" />
102 <uptodate targetfile="build/docbook-xml.timestamp"
103 srcfile="build/docbook-xml" />
104 </and>
105 </condition>
106
107 <condition property="jmolGuide.uptodate">
108 <and>
109 <uptodate targetfile="build/doc/JmolUserGuide/index.html">
110 <srcfiles dir="doc/source"
111 includes="JmolGuide.docbook.xml, guide/*.docbook.xml"/>
112 </uptodate>
113 <uptodate targetfile="build/doc/JmolUserGuide_fr/index.html">
114 <srcfiles dir="doc/source"
115 includes="JmolGuide_fr.docbook.xml, guide/*_fr.docbook.xml"/>
116 </uptodate>
117 </and>
118 </condition>
119
120 <condition property="jmolHistory.uptodate">
121 <and>
122 <uptodate targetfile="build/doc/JmolHistory/ChangeLog.html">
123 <srcfiles dir="doc/source"
124 includes="JmolHistory.xml,JmolHistoryToHtml.xsl,history/changes.xml" />
125 </uptodate>
126 <uptodate targetfile="build/doc/JmolHistory/ChangeLog_fr.html">
127 <srcfiles dir="doc/source"
128 includes="JmolHistory_fr.xml,JmolHistoryToHtml.xsl,history/changes_fr.xml" />
129 </uptodate>
130 <uptodate targetfile="build/doc/JmolHistory/ChangeLog_nl.html">
131 <srcfiles dir="doc/source"
132 includes="JmolHistory_nl.xml,JmolHistoryToHtml.xsl,history/changes_nl.xml" />
133 </uptodate>
134 </and>
135 </condition>
136
137 <condition property="jmolDevelopersGuide.uptodate">
138 <and>
139 <uptodate targetfile="build/doc/JmolDevelopersGuide.html">
140 <srcfiles dir="doc/source"
141 includes="JmolDevelopersGuide.docbook.xml"/>
142 </uptodate>
143 <uptodate targetfile="build/doc/JmolDevelopersGuide_fr.html">
144 <srcfiles dir="doc/source"
145 includes="JmolDevelopersGuide_fr.docbook.xml"/>
146 </uptodate>
147 <uptodate targetfile="build/doc/JmolDevelopersGuide_de.html">
148 <srcfiles dir="doc/source"
149 includes="JmolDevelopersGuide_de.docbook.xml"/>
150 </uptodate>
151 </and>
152 </condition>
153
154 <condition property="jmolAppletGuide.uptodate">
155 <and>
156 <uptodate targetfile="build/doc/JmolAppletGuide.html">
157 <srcfiles dir="doc/source"
158 includes="JmolAppletGuide.docbook.xml, applet/*.docbook.xml"/>
159 </uptodate>
160 <uptodate targetfile="build/doc/JmolAppletGuide_fr.html">
161 <srcfiles dir="doc/source"
162 includes="JmolAppletGuide_fr.docbook.xml, applet/*_fr.docbook.xml"/>
163 </uptodate>
164 <uptodate targetfile="build/doc/JmolAppletGuide_de.html">
165 <srcfiles dir="doc/source"
166 includes="JmolAppletGuide_de.docbook.xml"/>
167 </uptodate>
168 </and>
169 </condition>
170
171 <available classname="com.icl.saxon.StyleSheet"
172 classpath="${lib.dir}/saxon.jar"
173 property="xsl.available"/>
174 <uptodate property="javadoc.uptodate" targetfile="${javadoc.dir}/index.html">
175 <srcfiles dir="src" includes="**/*.java, **/*.html" />
176 </uptodate>
177 <available file="${keystore.name}" property="keystore.present" />
178 <!-- Optional proxy settings (if defined) -->
179 <condition property="proxyHost"
180 value="-Dhttp.proxyHost=${http.proxyHost}" >
181 <not>
182 <equals arg1="http.proxyHost" arg2="" />
183 </not>
184 </condition>
185 <condition property="proxyPort"
186 value="-Dhttp.proxyPort=${http.proxyPort}" >
187 <not>
188 <equals arg1="http.proxyPort" arg2="" />
189 </not>
190 </condition>
191 </target>
192
193 <target id="classes" name="classes" depends="init">
194 <mkdir dir="${classes.dir}"/>
195 <javac srcdir="src" destdir="${classes.dir}"
196 debug="${debug}" deprecation="${deprecation}"
197 optimize="${optimization}" source="1.5" target="1.5">
198 <classpath refid="project.class.path" />
199 <!-- removed all CDK based code, use BioClipse instead -->
200 <exclude name="org/openscience/jmol/app/JmolEditBus.java"/>
201 <exclude name="org/openscience/jmol/io/ShelXReader.java"/>
202 <exclude name="org/jmol/adapter/cdk/CdkJmolAdapter.java"/>
203 <!-- removed all JCamp code, not finished -->
204 <exclude name="org/jmol/jcamp/**/*.java"/>
205 </javac>
206 <copy todir="${classes.dir}" >
207 <fileset dir="src">
208 <include name="**/*.jpg" />
209 <include name="**/*.gif" />
210 <include name="**/*.png" />
211 <include name="**/*.html" />
212 <include name="**/*.js" />
213 <include name="**/*.dtd" />
214 <include name="**/*.properties" />
215 <include name="**/Properties/*" />
216 <!-- for testing internationalisation only:
217 comment out the 2 lines above and uncomment the following 3 lines -->
218 <!--
219 <include name="**/JmolPop*.properties" />
220 <include name="**/Properties/Jmol.properties" />
221 <include name="**/Properties/Jmol-resources.properties" />
222 -->
223 <include name="**/Data/*" />
224 <include name="**/*.txt" />
225 </fileset>
226 </copy>
227 </target>
228
229 <target name="applet-classes" id="applet-classes" depends="init">
230 <mkdir dir="${applet.classes.dir}"/>
231 <copy todir="${applet.classes.dir}" >
232 <fileset dir="src">
233 <include name="org/jmol/modelkit/images/*" />
234 </fileset>
235 </copy>
236
237 <property name="build.compiler" value="javac1.4" />
238 <!-- mth 20040713 ... with the Sun Java 1.5 compiler the default
239 source code version is 1.5. And one cannot generate code for
240 a 1.1 virtual machine from 1.5 source. Therefore, in order to
241 compile for the 1.1 jvm, we need to specify that the source
242 version is 1.3. (Note that we cannot use source=1.4 because
243 of assertions)
244
245miguel 20041121
246I do not know recall exactly what I meant by the statement
247in (parentheses) above. I *think* that what I was saying
248is that if you say 'source=1.4' then one also cannot
249generate code for a 1.1 jvm, because of the special
250support for assertions (which were introduced in 1.4).
251
252bob 2010.02.01
253
254changed source="1.3" target="1.1"
255 to source="1.4" target="1.4"
256
257bob 2010.04.29
258
259in order to allow for faster BitSet methods
260
261changed source="1.4" target="1.4"
262 to source="1.5" target="1.5"
263
264bob 2010.05.19
265
266changed just the applet classes back to:
267
268 source="1.4" target="1.4"
269
270all support for previous versions removed
271
272 -->
273 <javac srcdir="src" destdir="${applet.classes.dir}"
274 debug="${debug}" deprecation="${deprecation}"
275 optimize="${optimization}"
276 source="1.4" target="1.4"
277 includesfile="applet.classes"
278 classpathref="applet-project.class.path" />
279
280 <copy todir="${applet.classes.dir}" >
281 <fileset dir="src">
282 <include name="org/jmol/minimize/forcefield/*.txt" />
283 <include name="jmol75x29x8.gif" />
284 </fileset>
285 </copy>
286 <copy todir="${applet.classes.dir}" >
287 <fileset dir="src">
288 <include name="org/jmol/viewer/Jmol.properties" />
289 </fileset>
290 <filterchain>
291 <striplinecomments>
292 <comment value="#" />
293 </striplinecomments>
294 <linecontains>
295 <contains value="=" />
296 </linecontains>
297 </filterchain>
298 </copy>
299 <copy todir="${applet.classes.dir}" >
300 <fileset dir="${classes.dir}">
301 <include name="**/JmolApplet/*/*.class" />
302 </fileset>
303 </copy>
304 </target>
305
306 <target name="apisio-classes" id="apisio-classes" depends="init">
307 <mkdir dir="${apisio.classes.dir}"/>
308 <javac srcdir="src" destdir="${apisio.classes.dir}"
309 debug="${debug}" deprecation="${deprecation}"
310 optimize="${optimization}" source="1.5"
311 includesfile="apisio.classes"
312 classpathref="apisio-project.class.path" />
313 <copy todir="${apisio.classes.dir}" >
314 <fileset dir="src">
315 <include name="**/g3d/*.html" />
316 </fileset>
317 </copy>
318 </target>
319
320 <target name="check.cdkjars" id="check.cdkjars">
321 <condition property="cdkjars.uptodate">
322 <and>
323 <uptodate targetfile="${appjars.dir}/org/openscience/cdk">
324 <srcfiles dir="${lib.dir}" includes="jmol2cdk.jar"/>
325 </uptodate>
326 <uptodate targetfile="build/cdkjars.timestamp"
327 srcfile="${appjars.dir}/org/openscience/cdk"/>
328 </and>
329 </condition>
330 </target>
331
332 <target name="check.pluginjars" id="check.pluginjars">
333 <condition property="pluginjars.uptodate">
334 <and>
335 <uptodate targetfile="${appjars.dir}/org/openscience/cdkplugin">
336 <srcfiles dir="${plugin.dir}" includes="dirbrowser.jar"/>
337 <srcfiles dir="${plugin.dir}" includes="dadmlbrowser.jar"/>
338 </uptodate>
339 <uptodate targetfile="build/pluginjars.timestamp"
340 srcfile="${appjars.dir}/org/openscience/cdkplugin"/>
341 </and>
342 </condition>
343 </target>
344
345 <target name="check.libjars" id="check.libjars">
346 <condition property="libjars.uptodate">
347 <and>
348 <uptodate targetfile="${appjars.dir}">
349 <srcfiles dir="${lib.dir}" includes="${vecmath.jar}"/>
350 <!-- srcfiles dir="${lib.dir}" includes="Acme.jar"/ -->
351 <srcfiles dir="${lib.dir}" includes="${itext.jar}"/>
352 <srcfiles dir="${lib.dir}" includes="${commons-cli.jar}"/>
353 </uptodate>
354 <uptodate targetfile="build/libjars.timestamp"
355 srcfile="${appjars.dir}"/>
356 </and>
357 </condition>
358 </target>
359
360 <!-- target name="appjars" id="appjars" depends="libjars, cdkjars, pluginjars"/>
361
362 <target name="cdkjars" id="cdkjars" depends="check.cdkjars" unless="cdkjars.uptodate">
363 <delete file="build/cdkjars.timestamp"/>
364 <mkdir dir="${appjars.dir}"/>
365 <unjar dest="${appjars.dir}" src="${lib.dir}/jmol2cdk.jar"/>
366 <touch file="build/cdkjars.timestamp"/>
367 </target>
368
369 <target name="pluginjars" id="pluginjars" depends="check.pluginjars" unless="pluginjars.uptodate">
370 <delete file="build/pluginjars.timestamp"/>
371 <mkdir dir="${appjars.dir}"/>
372 <unjar dest="${appjars.dir}" src="${plugin.dir}/dirbrowser.jar"/>
373 <unjar dest="${appjars.dir}" src="${plugin.dir}/dadmlbrowser.jar"/>
374 <touch file="build/pluginjars.timestamp"/>
375 </target -->
376
377 <target name="libjars" id="libjars" depends="check.libjars" unless="libjars.uptodate">
378 <delete file="build/libjars.timestamp"/>
379 <mkdir dir="${appjars.dir}"/>
380 <unjar dest="${appjars.dir}" src="${lib.dir}/${vecmath.jar}"/>
381 <!-- unjar dest="${appjars.dir}" src="${lib.dir}/Acme.jar"/ -->
382 <unjar dest="${appjars.dir}" src="${lib.dir}/${itext.jar}"/>
383 <unjar dest="${appjars.dir}" src="${lib.dir}/${commons-cli.jar}"/>
384 <touch file="build/libjars.timestamp"/>
385 </target>
386
387 <target name="jar" id="jar"
388 depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars,main-i18n">
389 <copy todir="${classes.dir}/org/openscience/jmol/Data/guide" >
390 <fileset dir="build/doc/JmolUserGuide">
391 <include name="**/*.html" />
392 </fileset>
393 </copy>
394 <copy todir="${classes.dir}/org/openscience/jmol/Data/guide_fr" >
395 <fileset dir="build/doc/JmolUserGuide_fr">
396 <include name="**/*.html" />
397 </fileset>
398 </copy>
399 <copy todir="${classes.dir}/org/openscience/jmol/Data" >
400 <fileset dir="build/doc/JmolHistory">
401 <include name="**/*.html" />
402 </fileset>
403 </copy>
404 <jar destfile="${jmol.build.dir}/JmolUnsigned.jar"
405 manifest="manifest/application.txt">
406 <fileset dir="${classes.dir}" >
407 <exclude name="**/.*" />
408 <exclude name="**/*.dx" />
409 <exclude name="ant/**" />
410 <include name="com/**" />
411 <exclude name="**/Test*.class" />
412 <exclude name="**/jmol/jcamp/**" />
413 <exclude name="**/jmol/applet/*" />
414 <exclude name="**/jmol/appletwrapper/*" />
415 <include name="**/jmol/**" />
416 <exclude name="**/app/JmolData.class" />
417 </fileset>
418 <fileset dir="${appjars.dir}" includes="**/*"/>
419 <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
420 </jar>
421 <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
422 signedjar="${jmol.build.dir}/Jmol.jar"
423 keystore="selfSignedCertificate/selfSignedCertificate.store"
424 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
425 <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
426
427 <delete file="${jmol.build.dir}/JmolUnsigned.jar"/>
428 <jar destfile="${jmol.build.dir}/JmolUnsignedF.jar"
429 manifest="manifest/applicationData.txt">
430 <fileset dir="${classes.dir}" >
431 <exclude name="**/.*" />
432 <exclude name="**/*.dx" />
433 <exclude name="**/Test*.class" />
434 <exclude name="ant/**" />
435 <exclude name="com/**" />
436 <include name="**/jmol/**" />
437 <exclude name="**/jmol/_documents/**" />
438 <exclude name="**/jmol/jcamp/**" />
439 <exclude name="**/jmol/applet/**" />
440 <exclude name="**/jmol/appletwrapper/**" />
441 <exclude name="**/jmol/console/**" />
442 <exclude name="**/jmol/export/**" />
443 <exclude name="**/jmol/shapebio/**" />
444 <exclude name="**/jmol/shapespecial/**" />
445 <exclude name="**/jmol/shapesurface/**" />
446 <exclude name="**/jmol/popup/**" />
447 <exclude name="**/openscience/jmol/Data/**" />
448 <exclude name="**/openscience/jmol/app/Jmol.class" />
449 <exclude name="**/openscience/jmol/app/images/**" />
450 <exclude name="**/openscience/jmol/app/jmolpanel/**" />
451 <exclude name="**/openscience/jmol/app/webexport/**" />
452 </fileset>
453 <fileset dir="${appjars.dir}" includes="**/cli/** **/vecmath/**" />
454 <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
455 </jar>
456 <signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
457 signedjar="${jmol.build.dir}/JmolData.jar"
458 keystore="selfSignedCertificate/selfSignedCertificate.store"
459 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
460 <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
461
462 <delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>
463 <copy todir="${jmol.build.dir}">
464 <fileset dir=".">
465 <include name="jmol" />
466 <include name="jmol.bat" />
467 <include name="jmol.sh" />
468 </fileset>
469 </copy>
470
471 <jar destfile="${jmol.build.dir}/JvxlUnsigned.jar"
472 manifest="manifest/jvxl.txt">
473 <fileset dir="${classes.dir}" >
474 <exclude name="**/.*" />
475 <exclude name="**/*.dx" />
476 <exclude name="**/Test*.class" />
477 <include name="org/openscience/jvxl/*" />
478 <include name="org/jmol/jvxl/**" />
479 <include name="org/jmol/util/**" />
480 <include name="org/jmol/g3d/**" />
481 <include name="org/jmol/api/**" />
482 <include name="org/jmol/atomdata/**" />
483 <include name="org/jmol/viewer/JmolConstants.class" />
484 </fileset>
485 <fileset dir="${appjars.dir}" includes="**/*"/>
486 </jar>
487
488 <signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
489 signedjar="${jmol.build.dir}/Jvxl.jar"
490 keystore="selfSignedCertificate/selfSignedCertificate.store"
491 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
492 <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>
493
494 </target>
495
496 <target name="apis-jar" id="apis-jar" depends="init,apisio-classes">
497 <jar destfile="jmolApis.jar">
498 <fileset dir="${apisio.classes.dir}" >
499 <include name="org/jmol/api/**" />
500 </fileset>
501 <fileset dir="." >
502 <include name="LICENSE.txt"/>
503 </fileset>
504 </jar>
505 </target>
506
507 <target name="io-jar" id="io-jar" depends="init,apisio-classes">
508 <jar destfile="jmolIO.jar">
509 <fileset dir="${apisio.classes.dir}" >
510 <include name="org/jmol/adapter/smarter/**" />
511 </fileset>
512 <fileset dir="." >
513 <include name="LICENSE.txt"/>
514 </fileset>
515 </jar>
516 </target>
517
518 <target name="check.appletjars" id="check.appletjars">
519 <condition property="appletjars.uptodate">
520 <and>
521 <uptodate targetfile="${appletjars.dir}">
522 <srcfiles dir="${lib.dir}"
523 includes="jmolappletcdk.jar,${vecmath.jar}"/>
524 </uptodate>
525 <uptodate targetfile="build/appletjars.timestamp"
526 srcfile="${appletjars.dir}"/>
527 </and>
528 </condition>
529 </target>
530
531 <target name="appletjars" id="appletjars" depends="check.appletjars"
532 unless="appletjars.uptodate">
533 <delete file="build/appletjars.timestamp"/>
534 <delete dir="${appletjars.dir}"/>
535 <mkdir dir="${appletjars.dir}"/>
536
537 <copy todir="${appletjars.dir}" >
538 <fileset dir="src">
539 <include name="com/obrador/license.txt" />
540 </fileset>
541 </copy>
542
543 <unjar dest="${appletjars.dir}" src="${lib.dir}/${vecmath.jar}">
544 <patternset>
545 <include name="**/Point3f.class"/>
546 <include name="**/Vector3f.class"/>
547 <include name="**/Matrix3f.class"/>
548 <include name="**/Matrix4f.class"/>
549 <include name="**/AxisAngle4f.class"/>
550 <include name="**/Quat4f.class"/>
551 <include name="**/Point3i.class"/>
552 <!-- the following are dependencies of the classes above -->
553 <include name="**/Tuple3i.class"/>
554 <include name="**/Tuple3f.class"/>
555 <include name="**/Tuple4f.class"/>
556 <include name="**/Vector4f.class"/>
557 <include name="**/Tuple3d.class"/>
558 <include name="**/Tuple4d.class"/>
559 <include name="**/Vector3d.class"/>
560 <include name="**/Quat4d.class"/>
561 <include name="**/Point4f.class"/>
562 <include name="**/Point3d.class"/>
563 <include name="**/Point4d.class"/>
564 <include name="**/Tuple2d.class"/>
565 <include name="**/Point2d.class"/>
566 <include name="**/Matrix3d.class"/>
567 <include name="**/Matrix4d.class"/>
568 <include name="**/AxisAngle4d.class"/>
569 <include name="**/SingularMatrixException.class"/>
570 </patternset>
571 </unjar>
572 <touch file="build/appletjars.timestamp"/>
573 </target>
574
575 <target name="applet-jar" id="applet-jar"
576 depends="applet-classes,appletjars">
577 <jar destfile="${jmol.applet.build.dir}/JmolApplet.jar"
578 manifest="manifest/appletMonolithic.txt" index="true" >
579 <fileset dir="${applet.classes.dir}" >
580 <include name="**/*" />
581 <exclude name="JmolSmiles*" />
582 <exclude name="org/jmol/export/**/*" />
583 <exclude name="org/jmol/multitouch/**/*" />
584 <exclude name="org/openscience/**/*" />
585 <exclude name="com/sparshui/**/*" />
586 </fileset>
587 <fileset dir="${appletjars.dir}" includes="**/*"/>
588 </jar>
589
590 <for list="${all.JmolApplet.languages}" delimiter=","
591 param="current.Jmol.language">
592 <sequential>
593 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"
594 manifest="manifest/applet_i18n.txt" >
595 <fileset dir="${applet.classes.dir}">
596 <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" />
597 </fileset>
598 </jar>
599 </sequential>
600 </for>
601
602 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">
603 <fileset dir="${applet.classes.dir}">
604 <include name="org/jmol/minimize/**" />
605 <include name="org/jmol/modelkit/images/**" />
606 <include name="org/jmol/modelkit/**" />
607 </fileset>
608 </jar>
609
610 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Console.jar" manifest="manifest/applet.txt">
611 <fileset dir="${applet.classes.dir}">
612 <include name="org/jmol/console/**" />
613 </fileset>
614 </jar>
615
616 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Popup.jar" manifest="manifest/applet.txt">
617 <fileset dir="${applet.classes.dir}">
618 <include name="org/jmol/popup/**" />
619 </fileset>
620 </jar>
621
622 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersMolXyz.jar" manifest="manifest/applet.txt">
623 <fileset dir="${applet.classes.dir}">
624 <include name="org/jmol/adapter/readers/molxyz/**" />
625 </fileset>
626 </jar>
627
628 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersCifPdb.jar" manifest="manifest/applet.txt">
629 <fileset dir="${applet.classes.dir}">
630 <include name="org/jmol/adapter/readers/cifpdb/**" />
631 </fileset>
632 </jar>
633
634 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersQuantum.jar" manifest="manifest/applet.txt">
635 <fileset dir="${applet.classes.dir}">
636 <include name="org/jmol/adapter/readers/quantum/**" />
637 <include name="org/jmol/quantum/**" />
638 </fileset>
639 </jar>
640
641 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersMore.jar" manifest="manifest/applet.txt">
642 <fileset dir="${applet.classes.dir}">
643 <include name="org/jmol/adapter/readers/more/**" />
644 </fileset>
645 </jar>
646
647 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersSimple.jar" manifest="manifest/applet.txt">
648 <fileset dir="${applet.classes.dir}">
649 <include name="org/jmol/adapter/readers/simple/**" />
650 </fileset>
651 </jar>
652
653 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersXtal.jar" manifest="manifest/applet.txt">
654 <fileset dir="${applet.classes.dir}">
655 <include name="org/jmol/adapter/readers/xtal/**" />
656 </fileset>
657 </jar>
658
659 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersXml.jar" manifest="manifest/applet.txt">
660 <fileset dir="${applet.classes.dir}">
661 <include name="org/jmol/adapter/readers/xml/**" />
662 </fileset>
663 </jar>
664
665 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ShapeBio.jar" manifest="manifest/applet.txt" >
666 <fileset dir="${applet.classes.dir}">
667 <include name="org/jmol/modelsetbio/**" />
668 <include name="org/jmol/shapebio/**" />
669 </fileset>
670 </jar>
671
672 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ShapeSpecial.jar" manifest="manifest/applet.txt" >
673 <fileset dir="${applet.classes.dir}">
674 <include name="org/jmol/shapespecial/**" />
675 </fileset>
676 </jar>
677
678 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" manifest="manifest/applet.txt" >
679 <fileset dir="${applet.classes.dir}">
680 <include name="org/jmol/jvxl/**" />
681 <include name="org/jmol/shapesurface/**" />
682 </fileset>
683 </jar>
684
685 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" manifest="manifest/applet.txt">
686 <fileset dir="${applet.classes.dir}">
687 <include name="org/jmol/smiles/**" />
688 </fileset>
689 </jar>
690
691 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" manifest="manifest/applet.txt">
692 <fileset dir="${applet.classes.dir}">
693 <include name="org/jmol/symmetry/**" />
694 </fileset>
695 </jar>
696
697
698 <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->
699 <!-- changes to this must be replicated below for the signed applet -->
700 <jar destfile="${jmol.applet.build.dir}/JmolApplet0.jar"
701 index="true" >
702 <!-- javax/vecmath -->
703 <fileset dir="${appletjars.dir}" includes="**/*"/>
704 <fileset dir="${applet.classes.dir}">
705 <include name="org/jmol/appletwrapper/*" />
706 <include name="JmolApplet*.class" />
707 <include name="jmol75x29x8.gif" />
708 <include name="org/jmol/adapter/smarter/**" />
709 <include name="org/jmol/api/**" />
710 <include name="org/jmol/applet/**" />
711 <include name="org/jmol/atomdata/**" />
712 <include name="org/jmol/bspt/**" />
713 <include name="org/jmol/g3d/**" />
714 <include name="org/jmol/geodesic/**" />
715 <include name="org/jmol/i18n/**" />
716 <include name="org/jmol/modelset/**" />
717 <include name="org/jmol/script/**" />
718 <include name="org/jmol/shape/**" />
719 <include name="org/jmol/util/**" />
720 <include name="org/jmol/viewer/**" />
721 </fileset>
722
723 <!-- changes to this must be replicated below for the signed applet -->
724 <indexjars>
725 <!-- no export or multitouch here - this is the unsigned applet -->
726 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Console.jar" />
727 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" />
728 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Popup.jar" />
729 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersCifPdb.jar" />
730 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersMolXyz.jar" />
731 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersMore.jar" />
732 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersQuantum.jar" />
733 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersSimple.jar" />
734 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersXml.jar" />
735 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersXtal.jar" />
736 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeBio.jar" />
737 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSpecial.jar" />
738 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" />
739 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" />
740 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" />
741 <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" />
742 </indexjars>
743 </jar>
744 <!-- changes to this must be replicated below for the signed applet -->
745 <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
746
747 </target>
748
749 <target name="signed-applet" id="signed-applet" depends="applet-jar">
750 <jar destfile="${jmol.applet.build.dir}/JmolAppletSigned.jar.temp"
751 manifest="manifest/appletMonolithic.txt" index="true" >
752 <fileset dir="${applet.classes.dir}" >
753 <include name="**/*" />
754 <exclude name="JmolSmiles*" />
755 <exclude name="org/openscience/**/*" />
756 </fileset>
757 <fileset dir="${appletjars.dir}" includes="**/*"/>
758 </jar>
759 <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned.jar.temp"
760 signedjar="${jmol.applet.build.dir}/JmolAppletSigned.jar"
761 keystore="selfSignedCertificate/selfSignedCertificate.store"
762 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
763 <delete file="${jmol.applet.build.dir}/JmolAppletSigned.jar.temp" />
764
765 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Console.jar"
766 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Console.jar"
767 keystore="selfSignedCertificate/selfSignedCertificate.store"
768 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
769
770 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar"
771 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Minimize.jar"
772 keystore="selfSignedCertificate/selfSignedCertificate.store"
773 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
774
775 <jar destfile="${jmol.applet.build.dir}/JmolApplet_MultiTouch.jar.temp"
776 manifest="manifest/appletMonolithic.txt" index="true" >
777 <fileset dir="${applet.classes.dir}" >
778 <include name="org/jmol/multitouch/**" />
779 <include name="com/sparshui/**" />
780 </fileset>
781 </jar>
782 <signjar jar="${jmol.applet.build.dir}/JmolApplet_MultiTouch.jar.temp"
783 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_MultiTouch.jar"
784 keystore="selfSignedCertificate/selfSignedCertificate.store"
785 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
786 <delete file="${jmol.applet.build.dir}/JmolApplet_MultiTouch.jar.temp" />
787
788 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Popup.jar"
789 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Popup.jar"
790 keystore="selfSignedCertificate/selfSignedCertificate.store"
791 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
792
793 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersCifPdb.jar"
794 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersCifPdb.jar"
795 keystore="selfSignedCertificate/selfSignedCertificate.store"
796 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
797
798 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersMolXyz.jar"
799 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersMolXyz.jar"
800 keystore="selfSignedCertificate/selfSignedCertificate.store"
801 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
802
803 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersMore.jar"
804 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersMore.jar"
805 keystore="selfSignedCertificate/selfSignedCertificate.store"
806 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
807
808 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersQuantum.jar"
809 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersQuantum.jar"
810 keystore="selfSignedCertificate/selfSignedCertificate.store"
811 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
812
813 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersSimple.jar"
814 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersSimple.jar"
815 keystore="selfSignedCertificate/selfSignedCertificate.store"
816 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
817
818 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersXtal.jar"
819 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersXtal.jar"
820 keystore="selfSignedCertificate/selfSignedCertificate.store"
821 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
822
823 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersXml.jar"
824 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersXml.jar"
825 keystore="selfSignedCertificate/selfSignedCertificate.store"
826 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
827
828 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ShapeBio.jar"
829 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeBio.jar"
830 keystore="selfSignedCertificate/selfSignedCertificate.store"
831 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
832
833
834 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ShapeSpecial.jar"
835 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSpecial.jar"
836 keystore="selfSignedCertificate/selfSignedCertificate.store"
837 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
838
839 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar"
840 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSurface.jar"
841 keystore="selfSignedCertificate/selfSignedCertificate.store"
842 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
843
844 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar"
845 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Smiles.jar"
846 keystore="selfSignedCertificate/selfSignedCertificate.store"
847 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
848
849 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar"
850 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Symmetry.jar"
851 keystore="selfSignedCertificate/selfSignedCertificate.store"
852 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
853
854 <for list="${all.JmolApplet.languages}" delimiter=","
855 param="current.Jmol.language">
856 <sequential>
857 <signjar jar="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"
858 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_i18n_@{current.Jmol.language}.jar"
859 keystore="selfSignedCertificate/selfSignedCertificate.store"
860 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
861 </sequential>
862 </for>
863
864 <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->
865 <!-- this one must be treated specially because of jar indexing
866 we cannot simply rename the jar file, because the index has
867 the old name (JmolApplet?.jar) inside it -->
868 <jar destfile="${jmol.applet.build.dir}/JmolAppletSigned0.jar"
869 manifest="manifest/applet0.txt"
870 index="true">
871 <!-- javax/vecmath -->
872 <fileset dir="${appletjars.dir}" includes="**/*"/>
873 <fileset dir="${applet.classes.dir}">
874 <include name="org/jmol/appletwrapper/*" />
875 <include name="JmolApplet*.class" />
876 <include name="jmol75x29x8.gif" />
877 <include name="org/jmol/adapter/smarter/**" />
878 <include name="org/jmol/api/**" />
879 <include name="org/jmol/applet/**" />
880 <include name="org/jmol/atomdata/**" />
881 <include name="org/jmol/bspt/**" />
882 <include name="org/jmol/export/**" />
883 <include name="org/jmol/g3d/**" />
884 <include name="org/jmol/geodesic/**" />
885 <include name="org/jmol/modelset/**" />
886 <include name="org/jmol/script/**" />
887 <include name="org/jmol/shape/**" />
888 <include name="org/jmol/viewer/**" />
889 <include name="org/jmol/util/**" />
890 <include name="org/jmol/i18n/**" />
891 </fileset>
892 <indexjars>
893 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Console.jar" />
894 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Minimize.jar" />
895 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_MultiTouch.jar" />
896 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Popup.jar" />
897 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersCifPdb.jar" />
898 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersMolXyz.jar" />
899 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersMore.jar" />
900 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersQuantum.jar" />
901 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersSimple.jar" />
902 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersXml.jar" />
903 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersXtal.jar" />
904 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeBio.jar" />
905 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSpecial.jar" />
906 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSurface.jar" />
907 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Smiles.jar" />
908 <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Symmetry.jar" />
909 <fileset dir="${jmol.applet.build.dir}" includes="JmolAppletSigned0_i18n_*.jar" />
910 </indexjars>
911 </jar>
912 <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar"
913 keystore="selfSignedCertificate/selfSignedCertificate.store"
914 storepass="selfSignedCertificate" alias="selfSignedCertificate" />
915 <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
916 </target>
917
918 <target name="smiles-applet-jar" id="smiles-applet-jar"
919 depends="applet-classes">
920 <jar destfile="${jmol.applet.build.dir}/JmolSmilesApplet.jar"
921 manifest="manifest/appletSmiles.txt" index="true" >
922 <fileset dir="${classes.dir}" >
923 <include name="JmolSmiles.class"/>
924 </fileset>
925 <fileset dir="${applet.classes.dir}" >
926 <include name="JmolSmiles*" />
927 <include name="org/jmol/smiles/**" />
928 <include name="org/jmol/api/JmolNode.class" />
929 <include name="org/jmol/api/JmolEdge.class" />
930 <include name="org/jmol/api/JmolMolecule.class" />
931 <include name="org/jmol/api/SmilesMatcherInterface.class" />
932 <include name="org/jmol/util/Elements.class" />
933 <include name="org/jmol/util/DefaultLogger.class" />
934 <include name="org/jmol/util/Logger.class" />
935 <include name="org/jmol/util/LoggerInterface.class" />
936 <include name="org/jmol/util/TextFormat.class" />
937 </fileset>
938 <fileset dir="${appletjars.dir}">
939 <include name="javax/vecmath/*3f*" />
940 <include name="javax/vecmath/*3d*" />
941 <include name="javax/vecmath/Point4f*" />
942 <include name="javax/vecmath/Tuple4f*" />
943 <exclude name="javax/vecmath/Matrix*" />
944 </fileset>
945 </jar>
946
947 <for list="${all.JmolApplet.languages}" delimiter=","
948 param="current.Jmol.language">
949 <sequential>
950 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"
951 manifest="manifest/applet_i18n.txt" >
952 <fileset dir="${applet.classes.dir}">
953 <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" />
954 </fileset>
955 </jar>
956 </sequential>
957 </for>
958
959 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">
960 <fileset dir="${applet.classes.dir}">
961 <include name="org/jmol/minimize/**" />
962 <include name="org/jmol/modelkit/**" />
963 <include name="org/jmol/modelkit/images/**" />
964 </fileset>
965 </jar>
966
967 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Console.jar" manifest="manifest/applet.txt">
968 <fileset dir="${applet.classes.dir}">
969 <include name="org/jmol/console/**" />
970 </fileset>
971 </jar>
972
973 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Popup.jar" manifest="manifest/applet.txt">
974 <fileset dir="${applet.classes.dir}">
975 <include name="org/jmol/popup/**" />
976 </fileset>
977 </jar>
978
979 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersMolXyz.jar" manifest="manifest/applet.txt">
980 <fileset dir="${applet.classes.dir}">
981 <include name="org/jmol/adapter/readers/molxyz/**" />
982 </fileset>
983 </jar>
984
985 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersCifPdb.jar" manifest="manifest/applet.txt">
986 <fileset dir="${applet.classes.dir}">
987 <include name="org/jmol/adapter/readers/cifpdb/**" />
988 </fileset>
989 </jar>
990
991 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersQuantum.jar" manifest="manifest/applet.txt">
992 <fileset dir="${applet.classes.dir}">
993 <include name="org/jmol/adapter/readers/quantum/**" />
994 <include name="org/jmol/quantum/**" />
995 </fileset>
996 </jar>
997
998 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersMore.jar" manifest="manifest/applet.txt">
999 <fileset dir="${applet.classes.dir}">
1000 <include name="org/jmol/adapter/readers/more/**" />
1001 </fileset>
1002 </jar>
1003
1004 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersSimple.jar" manifest="manifest/applet.txt">
1005 <fileset dir="${applet.classes.dir}">
1006 <include name="org/jmol/adapter/readers/simple/**" />
1007 </fileset>
1008 </jar>
1009
1010 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersXtal.jar" manifest="manifest/applet.txt">
1011 <fileset dir="${applet.classes.dir}">
1012 <include name="org/jmol/adapter/readers/xtal/**" />
1013 </fileset>
1014 </jar>
1015
1016 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersXml.jar" manifest="manifest/applet.txt">
1017 <fileset dir="${applet.classes.dir}">
1018 <include name="org/jmol/adapter/readers/xml/**" />
1019 </fileset>
1020 </jar>
1021
1022 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ShapeBio.jar" manifest="manifest/applet.txt" >
1023 <fileset dir="${applet.classes.dir}">
1024 <include name="org/jmol/modelsetbio/**" />
1025 <include name="org/jmol/shapebio/**" />
1026 </fileset>
1027 </jar>
1028
1029 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ShapeSpecial.jar" manifest="manifest/applet.txt" >
1030 <fileset dir="${applet.classes.dir}">
1031 <include name="org/jmol/shapespecial/**" />
1032 </fileset>
1033 </jar>
1034
1035 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" manifest="manifest/applet.txt" >
1036 <fileset dir="${applet.classes.dir}">
1037 <include name="org/jmol/jvxl/**" />
1038 <include name="org/jmol/shapesurface/**" />
1039 </fileset>
1040 </jar>
1041
1042 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" manifest="manifest/applet.txt">
1043 <fileset dir="${applet.classes.dir}">
1044 <include name="org/jmol/smiles/**" />
1045 </fileset>
1046 </jar>
1047
1048 <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" manifest="manifest/applet.txt">
1049 <fileset dir="${applet.classes.dir}">
1050 <include name="org/jmol/symmetry/**" />
1051 </fileset>
1052 </jar>
1053
1054
1055 <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->
1056 <!-- changes to this must be replicated below for the signed applet -->
1057 <jar destfile="${jmol.applet.build.dir}/JmolApplet0.jar"
1058 index="true" >
1059 <!-- javax/vecmath -->
1060 <fileset dir="${appletjars.dir}" includes="**/*"/>
1061 <fileset dir="${applet.classes.dir}">
1062 <include name="org/jmol/appletwrapper/*" />
1063 <include name="JmolApplet*.class" />
1064 <include name="jmol75x29x8.gif" />
1065 <include name="org/jmol/adapter/smarter/**" />
1066 <include name="org/jmol/api/**" />
1067 <include name="org/jmol/applet/**" />
1068 <include name="org/jmol/atomdata/**" />
1069 <include name="org/jmol/bspt/**" />
1070 <include name="org/jmol/g3d/**" />
1071 <include name="org/jmol/geodesic/**" />
1072 <include name="org/jmol/i18n/**" />
1073 <include name="org/jmol/modelset/**" />
1074 <include name="org/jmol/script/**" />
1075 <include name="org/jmol/shape/**" />
1076 <include name="org/jmol/util/**" />
1077 <include name="org/jmol/viewer/**" />
1078 </fileset>
1079
1080 <!-- changes to this must be replicated below for the signed applet -->
1081 <indexjars>
1082 <!-- no export or multitouch here - this is the unsigned applet -->
1083 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Console.jar" />
1084 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" />
1085 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Popup.jar" />
1086 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersCifPdb.jar" />
1087 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersMolXyz.jar" />
1088 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersMore.jar" />
1089 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersQuantum.jar" />
1090 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersSimple.jar" />
1091 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersXml.jar" />
1092 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersXtal.jar" />
1093 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeBio.jar" />
1094 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSpecial.jar" />
1095 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" />
1096 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" />
1097 <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" />
1098 <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" />
1099 </indexjars>
1100 </jar>
1101 <!-- changes to this must be replicated below for the signed applet -->
1102 <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
1103
1104 </target>
1105
1106 <target name="dist" id="dist"
1107 depends="doc,main-i18n,main,signed-applet">
1108 <!-- first build binary distribution -->
1109 <delete dir="build/dist/jmol-${version}"/>
1110 <mkdir dir="build/dist/jmol-${version}"/>
1111 <copy todir="build/dist/jmol-${version}" >
1112 <fileset dir="${jmol.applet.build.dir}">
1113 <include name="JmolApplet*.jar" />
1114 </fileset>
1115 <fileset dir="${jmol.build.dir}">
1116 <include name="Jmol.jar" />
1117 <include name="JmolData.jar" />
1118 <include name="JmolSmiles.jar" />
1119 </fileset>
1120 <fileset dir=".">
1121 <include name="jmol" />
1122 <include name="jmol.sh" />
1123 <include name="jmol.mac" />
1124 <include name="jmol.bat" />
1125 <include name="*.txt" />
1126 </fileset>
1127 </copy>
1128 <copy file="src/org/jmol/viewer/Jmol.properties" tofile="build/dist/jmol-${version}/CHANGES.txt" />
1129 <chmod perm="ugo+rx">
1130 <fileset dir="build/dist/jmol-${version}">
1131 <include name="jmol"/>
1132 <include name="jmol.sh"/>
1133 <include name="jmol.bat"/>
1134 </fileset>
1135 </chmod>
1136
1137 <copy todir="build/dist/jmol-${version}" >
1138 <fileset dir="./appletweb">
1139 <include name="Jmol.js" />
1140 </fileset>
1141 </copy>
1142
1143 <!--
1144 zip distributions to not retain file permissions ...
1145 miguel 2 feb 2006 but there have been requests for them anyway -->
1146
1147 <zip zipfile="build/dist/jmol-${version}-binary.zip" basedir="build/dist"
1148 includes="jmol-${version}/**" />
1149
1150 <tar tarfile="build/dist/jmol-${version}-binary.tar.gz"
1151 compression="gzip" >
1152 <tarfileset dir="build/dist"
1153 excludes="*/jmol,*/jmol.sh"
1154 includes="jmol-${version}/**" />
1155 <tarfileset dir="build/dist"
1156 mode="755"
1157 includes="*/jmol,*/jmol.sh" />
1158 </tar>
1159
1160 <!-- then build source distribution -->
1161
1162 <copy todir="build/dist/jmol-${version}" >
1163 <fileset dir=".">
1164 <include name="applet.classes" />
1165 <include name="build.xml" />
1166 <include name="build-i18n.xml" />
1167 </fileset>
1168 </copy>
1169
1170 <copy todir="build/dist/jmol-${version}/src" >
1171 <fileset dir="src" />
1172 </copy>
1173
1174 <copy todir="build/dist/jmol-${version}/${lib.dir}" >
1175 <fileset dir="${lib.dir}" />
1176 </copy>
1177
1178 <copy todir="build/dist/jmol-${version}/${plugin.dir}" >
1179 <fileset dir="${plugin.dir}" />
1180 </copy>
1181
1182 <copy todir="build/dist/jmol-${version}/appletweb" >
1183 <fileset dir="appletweb" />
1184 </copy>
1185
1186 <copy todir="build/dist/jmol-${version}/manifest" >
1187 <fileset dir="manifest" />
1188 </copy>
1189
1190 <copy todir="build/dist/jmol-${version}/doc" >
1191 <fileset dir="doc" />
1192 </copy>
1193
1194 <copy todir="build/dist/jmol-${version}/tools" >
1195 <fileset dir="tools" />
1196 </copy>
1197
1198 <!-- Jvxl -->
1199 <copy file="build/Jvxl.jar" tofile="build/dist/Jvxl-${jvxl_version}.jar" failonerror="false" />
1200
1201 <copy file="build/doc/JmolDevelopersGuide.html"
1202 tofile="build/dist/jmol-${version}/doc/JmolDevelopersGuide.html" />
1203 <copy file="build/doc/JmolHistory/ChangeLog.html"
1204 tofile="build/dist/jmol-${version}/ChangeLog.html" />
1205 <copy todir="build/dist/jmol-${version}/doc/JmolUserGuide">
1206 <fileset dir="build/doc/JmolUserGuide">
1207 <include name="**/*.html" />
1208 </fileset>
1209 </copy>
1210 <copy file="build/doc/JmolAppletGuide.html"
1211 tofile="build/dist/jmol-${version}/doc/JmolAppletGuide.html" />
1212
1213<!--
1214 zip distributions to not retain file permissions
1215 <zip zipfile="build/dist/jmol-${version}-full.zip" basedir="build/dist"
1216 includes="jmol-${version}/**" />
1217 -->
1218
1219 <tar tarfile="build/dist/jmol-${version}-full.tar.gz"
1220 compression="gzip" >
1221 <tarfileset dir="build/dist"
1222 excludes="*/jmol,*/jmol.sh"
1223 includes="jmol-${version}/**" />
1224 <tarfileset dir="build/dist"
1225 mode="755"
1226 includes="*/jmol,*/jmol.sh" />
1227 </tar>
1228 </target>
1229
1230 <target name="apisio-dist" id="apisio-dist"
1231 depends="apis-jar,io-jar">
1232 <!-- first build binary distribution -->
1233 <delete dir="build/dist/jmolapisio-${version}"/>
1234 <mkdir dir="build/dist/jmolapisio-${version}"/>
1235 <copy todir="build/dist/jmolapisio-${version}" >
1236 <fileset dir=".">
1237 <include name="jmolApis.jar" />
1238 <include name="jmolIO.jar" />
1239 <include name="*.txt" />
1240 </fileset>
1241 </copy>
1242
1243 <!-- build source distribution -->
1244
1245 <copy todir="build/dist/jmolapisio-${version}" >
1246 <fileset dir=".">
1247 <include name="apisio.classes" />
1248 <include name="build.xml" />
1249 <include name="build-i18n.xml" />
1250 </fileset>
1251 </copy>
1252
1253 <copy todir="build/dist/jmolapisio-${version}/src" >
1254 <fileset dir="src">
1255 <includesfile name="apisio.classes"/>
1256 </fileset>
1257 </copy>
1258
1259 <copy todir="build/dist/jmolapisio-${version}/${lib.dir}" >
1260 <fileset dir="${lib.dir}">
1261 <include name="${vecmath.jar}"/>
1262 <include name="netscape.jar"/>
1263 </fileset>
1264 </copy>
1265
1266 <tar tarfile="build/dist/jmolapisio-${version}.tar.gz"
1267 compression="gzip" >
1268 <tarfileset dir="build/dist"
1269 excludes="*/jmol,*/jmol.sh"
1270 includes="jmolapisio-${version}/**" />
1271 </tar>
1272 </target>
1273
1274 <target name="check.jws" id="check.jws" depends="setup" unless="keystore.present" >
1275 <echo message="Keystore '${keystore.name}' not found." />
1276 <echo message="Please set with the argument '-Dkeystore.name=file'." />
1277 <antcall target="initFailure" />
1278 </target>
1279
1280 <target name="dist-jws" id="dist-jws" depends="check.jws,dist" >
1281 <copy todir="build/dist/jmol-jws-${version}" >
1282 <fileset dir="src">
1283 <include name="jmol.jnlp" />
1284 </fileset>
1285 </copy>
1286 <mkdir dir="build/dist/jmol-jws-${version}/${lib.dir}" />
1287 <copy todir="build/dist/jmol-jws-${version}/${lib.dir}" >
1288 <fileset dir="${lib.dir}">
1289 <include name="*.jar" />
1290 <exclude name="junit.jar" />
1291 <exclude name="saxon.jar" />
1292 </fileset>
1293 </copy>
1294 <mkdir dir="build/dist/jmol-jws-${version}/images" />
1295 <copy todir="build/dist/jmol-jws-${version}/images" flatten="yes" >
1296 <fileset dir="src">
1297 <include name="**/icon.jpg" />
1298 </fileset>
1299 </copy>
1300 <ant antfile="../../../build.xml" dir="build/dist/jmol-jws-${version}"
1301 target="internal-dist-jws-sign" />
1302 </target>
1303
1304 <!--
1305 This target should be only used internally within the build.xml. It is a
1306 workaround for a bugs in the fileset feature of the signjar task. See bugs
1307 5230 and 6988.
1308 -->
1309 <target name="internal-dist-jws-sign" id="internal-dist-jws-sign">
1310 <signjar alias="${keystore.alias}"
1311 storepass="${keystore.password}"
1312 keystore="${keystore.name}" >
1313 <fileset dir="../jmol-jws-${version}">
1314 <include name="**/*.jar" />
1315 <exclude name="**/.AppleDouble/**" />
1316 </fileset>
1317 </signjar>
1318 </target>
1319
1320 <target name="clean" id="clean">
1321 <delete dir="${classes.dir}"/>
1322 <delete dir="${applet.classes.dir}"/>
1323 <delete dir="${apisio.classes.dir}"/>
1324 <delete dir="${test-classes.dir}"/>
1325 <delete dir="${appjars.dir}"/>
1326 <delete dir="${appletjars.dir}"/>
1327 <delete dir="build/dist"/>
1328 <delete>
1329 <fileset dir=".">
1330 <include name="Jmol.jar" />
1331 <include name="JmolData.jar" />
1332 <include name="JmolSmiles.jar" />
1333 <include name="JmolApplet*.jar" />
1334 <include name="${jmol.build.dir}/Jmol.jar" />
1335 <include name="${jmol.applet.build.dir}/JmolApplet*.jar" />
1336 <include name="${jmol.build.dir}/JmolData.jar" />
1337 <include name="${jmol.build.dir}/JmolSmiles.jar" />
1338 </fileset>
1339 </delete>
1340 </target>
1341
1342 <target name="xclean" id="xclean">
1343 </target>
1344
1345 <target name="spotless" id="spotless" depends="clean,spotless-i18n">
1346 <delete dir="build"/>
1347 <delete dir="${javadoc.dir}"/>
1348 <delete dir="packaging/rpm/dist"/>
1349 </target>
1350
1351 <target name="run" id="run" depends="main">
1352 <java fork="true" jar="${jmol.build.dir}/Jmol.jar" />
1353 </target>
1354
1355 <!-- ********************************
1356 Documentation Targets
1357 ******************************** -->
1358 <target name="doc" id="doc"
1359 depends="jmolGuide,jmolDevelopersGuide,jmolAppletGuide,jmolHistory,javadoc"/>
1360
1361 <target name="initdoc" depends="init,check.docbook-xml,check.docbook-xsl,check.xsl" />
1362
1363 <target name="check.docbook-xsl" depends="setup" unless="docbook-xsl.uptodate" >
1364 <delete file="build/${docbook-xsl}.timestamp" />
1365 <delete dir="build/${docbook-xsl}" />
1366 <mkdir dir="build/${docbook-xsl}" />
1367 <untar src="doc/${docbook-xsl}.tar.gz" dest="build"
1368 compression="gzip" />
1369 <touch file="build/${docbook-xsl}.timestamp" />
1370 </target>
1371
1372 <target name="check.docbook-xml" depends="setup" unless="docbook-xml.uptodate" >
1373 <delete file="build/docbook-xml.timestamp" />
1374 <delete dir="build/docbook-xml" />
1375 <mkdir dir="build/docbook-xml" />
1376 <unzip src="doc/${docbook-xml}.zip" dest="build/docbook-xml" />
1377 <touch file="build/docbook-xml.timestamp" />
1378 </target>
1379
1380 <target name="check.xsl" depends="setup" unless="xsl.available" >
1381 <echo message="XSLT class 'com.icl.saxon.StyleSheet' not found." />
1382 <echo message="Note that the documentation is NOT generated now." />
1383 </target>
1384
1385 <target name="javadoc" depends="initdoc" unless="javadoc.uptodate">
1386 <mkdir dir="${javadoc.dir}"/>
1387 <javadoc destdir="${javadoc.dir}" sourcepath="src"
1388 private="true"
1389 packagenames="org.openscience.*,org.jmol.*"
1390 excludepackagenames="org.jmol.jcamp.*">
1391 <classpath refid="project.class.path" />
1392 <link href="http://download.oracle.com/javase/6/docs/api/" />
1393 <link href="http://download.java.net/media/java3d/javadoc/1.5.0/" />
1394 </javadoc>
1395 </target>
1396
1397 <target name="jmolGuide" id="jmolGuide" depends="initdoc"
1398 unless="jmolGuide.uptodate" >
1399 <echo message="Generating user's guide" />
1400 <mkdir dir="build/doc/JmolUserGuide" />
1401 <java fork="true" dir="build/doc/JmolUserGuide"
1402 classname="com.icl.saxon.StyleSheet"
1403 classpath="${lib.dir}/saxon.jar" >
1404 <jvmarg value="${proxyHost}" />
1405 <jvmarg value="${proxyPort}" />
1406 <arg value="../../../doc/source/JmolGuide.docbook.xml" />
1407 <arg value="../../${docbook-xsl}/html/chunk.xsl" />
1408 </java>
1409 <echo message="Generating user's guide (fr)" />
1410 <mkdir dir="build/doc/JmolUserGuide_fr" />
1411 <java fork="true" dir="build/doc/JmolUserGuide_fr"
1412 classname="com.icl.saxon.StyleSheet"
1413 classpath="${lib.dir}/saxon.jar" >
1414 <jvmarg value="${proxyHost}" />
1415 <jvmarg value="${proxyPort}" />
1416 <arg value="../../../doc/source/JmolGuide_fr.docbook.xml" />
1417 <arg value="../../${docbook-xsl}/html/chunk.xsl" />
1418 </java>
1419 </target>
1420
1421 <target name="jmolHistory" id="jmolHistory"
1422 depends="initdoc" unless="jmolHistory.uptodate" >
1423 <echo message="Generating history of changes" />
1424 <mkdir dir="build/doc/JmolHistory" />
1425 <java fork="true" dir="build/doc/JmolHistory"
1426 classname="com.icl.saxon.StyleSheet"
1427 classpath="${lib.dir}/saxon.jar" >
1428 <arg value="-o" />
1429 <arg value="ChangeLog.html" />
1430 <arg value="../../../doc/source/JmolHistory.xml" />
1431 <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
1432 </java>
1433 <echo message="Generating history of changes (fr)" />
1434 <java fork="true" dir="build/doc/JmolHistory"
1435 classname="com.icl.saxon.StyleSheet"
1436 classpath="${lib.dir}/saxon.jar" >
1437 <arg value="-o" />
1438 <arg value="ChangeLog_fr.html" />
1439 <arg value="../../../doc/source/JmolHistory_fr.xml" />
1440 <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
1441 <arg value="lang=fr" />
1442 </java>
1443 <echo message="Generating history of changes (nl)" />
1444 <java fork="true" dir="build/doc/JmolHistory"
1445 classname="com.icl.saxon.StyleSheet"
1446 classpath="${lib.dir}/saxon.jar" >
1447 <arg value="-o" />
1448 <arg value="ChangeLog_nl.html" />
1449 <arg value="../../../doc/source/JmolHistory_nl.xml" />
1450 <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
1451 <arg value="lang=nl" />
1452 </java>
1453 </target>
1454
1455 <target name="jmolDevelopersGuide" id="jmolDevelopersGuide"
1456 depends="initdoc" unless="jmolDevelopersGuide.uptodate" >
1457 <echo message="Generating developer's guide" />
1458 <java fork="true" dir="build/doc"
1459 classname="com.icl.saxon.StyleSheet"
1460 classpath="${lib.dir}/saxon.jar" >
1461 <arg value="-o" />
1462 <arg value="JmolDevelopersGuide.html" />
1463 <arg value="../../doc/source/JmolDevelopersGuide.docbook.xml" />
1464 <arg value="../${docbook-xsl}/html/docbook.xsl" />
1465 </java>
1466 <echo message="Generating developer's guide (fr)" />
1467 <java fork="true" dir="build/doc"
1468 classname="com.icl.saxon.StyleSheet"
1469 classpath="${lib.dir}/saxon.jar" >
1470 <arg value="-o" />
1471 <arg value="JmolDevelopersGuide_fr.html" />
1472 <arg value="../../doc/source/JmolDevelopersGuide_fr.docbook.xml" />
1473 <arg value="../${docbook-xsl}/html/docbook.xsl" />
1474 </java>
1475 <echo message="Generating developer's guide (de)" />
1476 <java fork="true" dir="build/doc"
1477 classname="com.icl.saxon.StyleSheet"
1478 classpath="${lib.dir}/saxon.jar" >
1479 <arg value="-o" />
1480 <arg value="JmolDevelopersGuide_de.html" />
1481 <arg value="../../doc/source/JmolDevelopersGuide_de.docbook.xml" />
1482 <arg value="../${docbook-xsl}/html/docbook.xsl" />
1483 </java>
1484 </target>
1485
1486 <target name="jmolAppletGuide" id="jmolAppletGuide" depends="initdoc"
1487 unless="jmolAppletGuide.uptodate" >
1488 <echo message="Generating applet guide" />
1489 <java fork="true" dir="build/doc"
1490 classname="com.icl.saxon.StyleSheet"
1491 classpath="${lib.dir}/saxon.jar" >
1492 <arg value="-o" />
1493 <arg value="JmolAppletGuide.html" />
1494 <arg value="../../doc/source/JmolAppletGuide.docbook.xml" />
1495 <arg value="../${docbook-xsl}/html/docbook.xsl" />
1496 </java>
1497 <echo message="Generating applet guide (fr)" />
1498 <java fork="true" dir="build/doc"
1499 classname="com.icl.saxon.StyleSheet"
1500 classpath="${lib.dir}/saxon.jar" >
1501 <arg value="-o" />
1502 <arg value="JmolAppletGuide_fr.html" />
1503 <arg value="../../doc/source/JmolAppletGuide_fr.docbook.xml" />
1504 <arg value="../${docbook-xsl}/html/docbook.xsl" />
1505 </java>
1506 <echo message="Generating applet guide (de)" />
1507 <java fork="true" dir="build/doc"
1508 classname="com.icl.saxon.StyleSheet"
1509 classpath="${lib.dir}/saxon.jar" >
1510 <arg value="-o" />
1511 <arg value="JmolAppletGuide_de.html" />
1512 <arg value="../../doc/source/JmolAppletGuide_de.docbook.xml" />
1513 <arg value="../${docbook-xsl}/html/docbook.xsl" />
1514 </java>
1515 </target>
1516
1517 <target name="test" id="test" depends="main,compile-tests">
1518 <junit printsummary="yes" haltonfailure="yes">
1519 <classpath>
1520 <pathelement location="${jmol.build.dir}/Jmol.jar" />
1521 <pathelement location="${tests.dir}/Tests.jar" />
1522 <pathelement location="./jars/junit.jar" />
1523 </classpath>
1524 <formatter type="plain" usefile="false" />
1525 <!-- <batchtest>
1526 <fileset dir="test" />
1527 </batchtest> -->
1528 <test name="org.jmol.AllTests" />
1529 </junit>
1530 </target>
1531
1532 <target name="compile-tests" id="compile-tests" depends="main">
1533 <mkdir dir="${test-classes.dir}"/>
1534 <javac srcdir="test" destdir="${test-classes.dir}"
1535 debug="off" deprecation="on"
1536 optimize="off" source="1.5">
1537 <classpath>
1538 <pathelement location="${jmol.build.dir}/Jmol.jar" />
1539 <pathelement location="./jars/junit.jar" />
1540 </classpath>
1541 </javac>
1542 <mkdir dir="${tests.dir}"/>
1543 <jar destfile="${tests.dir}/Tests.jar" basedir="${test-classes.dir}" />
1544 </target>
1545
1546 <!-- i18n stuff -->
1547 <target name="main-i18n" depends="classes">
1548 <ant antfile="tools/build-i18n.xml" target="main-i18n"/>
1549 </target>
1550 <target name="spotless-i18n">
1551 <ant antfile="tools/build-i18n.xml" target="spotless-i18n"/>
1552 </target>
1553
1554</project>
01555
=== modified file 'build.xml'
--- build.xml 2011-04-11 22:04:43 +0000
+++ build.xml 2011-09-15 11:23:35 +0000
@@ -57,12 +57,18 @@
57 <fileset dir="${lib.dir}">57 <fileset dir="${lib.dir}">
58 <include name="*.jar" />58 <include name="*.jar" />
59 </fileset>59 </fileset>
60 <fileset dir="/usr/share/icedtea-web/">
61 <include name="plugin.jar"/>
62 </fileset>
60 </path>63 </path>
61 64
62 <path id="applet-project.class.path">65 <path id="applet-project.class.path">
63 <fileset dir="${lib.dir}">66 <fileset dir="${lib.dir}">
64 <include name="*.jar" />67 <include name="*.jar" />
65 </fileset>68 </fileset>
69 <fileset dir="/usr/share/icedtea-web/">
70 <include name="plugin.jar"/>
71 </fileset>
66 </path>72 </path>
67 73
68 <path id="apisio-project.class.path">74 <path id="apisio-project.class.path">
6975
=== modified file 'debian/changelog'
--- debian/changelog 2011-04-11 22:04:43 +0000
+++ debian/changelog 2011-09-15 11:23:35 +0000
@@ -1,3 +1,12 @@
1jmol (12.0.40-1ubuntu1) oneiric; urgency=low
2
3 * Fix FTBFS (LP: #831372):
4 - d/control: added icedtea6-plugin to Build-Depends
5 - d/patches/fix-icedtea-web-plugin.patch: patch build.xml to pickup
6 plugin.jar from icedtea6-plugin.
7
8 -- James Page <james.page@ubuntu.com> Thu, 15 Sep 2011 11:58:34 +0100
9
1jmol (12.0.40-1) unstable; urgency=low10jmol (12.0.40-1) unstable; urgency=low
211
3 * New upstream release.12 * New upstream release.
413
=== modified file 'debian/control'
--- debian/control 2011-04-11 22:04:43 +0000
+++ debian/control 2011-09-15 11:23:35 +0000
@@ -1,9 +1,10 @@
1Source: jmol1Source: jmol
2Section: science2Section: science
3Priority: optional3Priority: optional
4Maintainer: Debichem Team <debichem-devel@lists.alioth.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debichem Team <debichem-devel@lists.alioth.debian.org>
5Uploaders: Michael Banck <mbanck@debian.org>6Uploaders: Michael Banck <mbanck@debian.org>
6Build-Depends: debhelper (>= 7.0.0), javahelper, quilt, docbook-xml (>= 4.2), docbook-xsl (>= 1.66), xsltproc, default-jdk, ant, ant-contrib, libcommons-cli-java, libjaxp1.3-java, libsaxon-java, libvecmath-java, libitext1-java7Build-Depends: debhelper (>= 7.0.0), javahelper, quilt, docbook-xml (>= 4.2), docbook-xsl (>= 1.66), xsltproc, default-jdk, ant, ant-contrib, libcommons-cli-java, libjaxp1.3-java, libsaxon-java, libvecmath-java, libitext1-java, icedtea6-plugin
7Standards-Version: 3.9.18Standards-Version: 3.9.1
8Homepage: http://jmol.sourceforge.net/9Homepage: http://jmol.sourceforge.net/
9XS-Vcs-Browser: http://svn.debian.org/wsvn/debichem/10XS-Vcs-Browser: http://svn.debian.org/wsvn/debichem/
1011
=== added file 'debian/patches/fix-icedtea-web-plugin.patch'
--- debian/patches/fix-icedtea-web-plugin.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/fix-icedtea-web-plugin.patch 2011-09-15 11:23:35 +0000
@@ -0,0 +1,27 @@
1Description: Ensure icedtea6 plugin.jar is picked up during build.
2Author: James Page <james.page@ubuntu.com>
3Forwarded: not-needed
4
5Index: jmol/build.xml
6===================================================================
7--- jmol.orig/build.xml 2011-09-15 12:01:12.736742142 +0100
8+++ jmol/build.xml 2011-09-15 12:11:06.818499966 +0100
9@@ -57,12 +57,18 @@
10 <fileset dir="${lib.dir}">
11 <include name="*.jar" />
12 </fileset>
13+ <fileset dir="/usr/share/icedtea-web/">
14+ <include name="plugin.jar"/>
15+ </fileset>
16 </path>
17
18 <path id="applet-project.class.path">
19 <fileset dir="${lib.dir}">
20 <include name="*.jar" />
21 </fileset>
22+ <fileset dir="/usr/share/icedtea-web/">
23+ <include name="plugin.jar"/>
24+ </fileset>
25 </path>
26
27 <path id="apisio-project.class.path">
028
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-04-11 22:04:43 +0000
+++ debian/patches/series 2011-09-15 11:23:35 +0000
@@ -3,3 +3,4 @@
3chime2jmol_binary.patch3chime2jmol_binary.patch
4right_cgi_diretory.patch4right_cgi_diretory.patch
5cgi_fix_shebang.patch5cgi_fix_shebang.patch
6fix-icedtea-web-plugin.patch

Subscribers

People subscribed via source and target branches

to all changes: