|
Lines 326-332
Link Here
|
| 326 |
</target> |
326 |
</target> |
| 327 |
|
327 |
|
| 328 |
<target name="jar" id="jar" |
328 |
<target name="jar" id="jar" |
| 329 |
depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars,main-i18n"> |
329 |
depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars"> |
| 330 |
<copy todir="${classes.dir}/org/openscience/jmol/Data/guide" > |
330 |
<copy todir="${classes.dir}/org/openscience/jmol/Data/guide" > |
| 331 |
<fileset dir="build/doc/JmolUserGuide"> |
331 |
<fileset dir="build/doc/JmolUserGuide"> |
| 332 |
<include name="**/*.html" /> |
332 |
<include name="**/*.html" /> |
|
Lines 447-453
Link Here
|
| 447 |
<!-- note that this class is included in JmolApplet0.jar --> |
447 |
<!-- note that this class is included in JmolApplet0.jar --> |
| 448 |
<exclude name="org/jmol/api/JmolAppletInterface.class" /> |
448 |
<exclude name="org/jmol/api/JmolAppletInterface.class" /> |
| 449 |
<include name="org/jmol/applet/**" /> |
449 |
<include name="org/jmol/applet/**" /> |
| 450 |
<include name="org/jmol/i18n/**" /> |
|
|
| 451 |
<include name="org/jmol/popup/**" /> |
450 |
<include name="org/jmol/popup/**" /> |
| 452 |
</fileset> |
451 |
</fileset> |
| 453 |
</jar> |
452 |
</jar> |
|
Lines 485-495
Link Here
|
| 485 |
</fileset> |
484 |
</fileset> |
| 486 |
</jar> |
485 |
</jar> |
| 487 |
|
486 |
|
| 488 |
<jar destfile="JmolApplet_i18n.jar" manifest="manifest/applet_i18n.txt" > |
|
|
| 489 |
<fileset dir="${applet.classes.dir}"> |
| 490 |
<include name="org/jmol/translation/**" /> |
| 491 |
</fileset> |
| 492 |
</jar> |
| 493 |
|
487 |
|
| 494 |
<!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv --> |
488 |
<!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv --> |
| 495 |
<!-- changes to this must be replicated below for the signed applet --> |
489 |
<!-- changes to this must be replicated below for the signed applet --> |
|
Lines 509-515
Link Here
|
| 509 |
<pathelement path="JmolApplet4.jar" /> |
503 |
<pathelement path="JmolApplet4.jar" /> |
| 510 |
<pathelement path="JmolApplet5.jar" /> |
504 |
<pathelement path="JmolApplet5.jar" /> |
| 511 |
<pathelement path="JmolApplet6.jar" /> |
505 |
<pathelement path="JmolApplet6.jar" /> |
| 512 |
<pathelement path="JmolApplet_i18n.jar" /> |
|
|
| 513 |
</indexjars> |
506 |
</indexjars> |
| 514 |
</jar> |
507 |
</jar> |
| 515 |
<!-- changes to this must be replicated below for the signed applet --> |
508 |
<!-- changes to this must be replicated below for the signed applet --> |
|
Lines 539-547
Link Here
|
| 539 |
<signjar jar="JmolApplet6.jar" signedjar="JmolAppletSigned6.jar" |
532 |
<signjar jar="JmolApplet6.jar" signedjar="JmolAppletSigned6.jar" |
| 540 |
keystore="selfSignedCertificate/selfSignedCertificate.store" |
533 |
keystore="selfSignedCertificate/selfSignedCertificate.store" |
| 541 |
storepass="selfSignedCertificate" alias="selfSignedCertificate" /> |
534 |
storepass="selfSignedCertificate" alias="selfSignedCertificate" /> |
| 542 |
<signjar jar="JmolApplet_i18n.jar" signedjar="JmolAppletSigned_i18n.jar" |
|
|
| 543 |
keystore="selfSignedCertificate/selfSignedCertificate.store" |
| 544 |
storepass="selfSignedCertificate" alias="selfSignedCertificate" /> |
| 545 |
|
535 |
|
| 546 |
<!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv --> |
536 |
<!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv --> |
| 547 |
<!-- this one must be treated specially because of jar indexing |
537 |
<!-- this one must be treated specially because of jar indexing |
|
Lines 562-568
Link Here
|
| 562 |
<pathelement path="JmolAppletSigned4.jar" /> |
552 |
<pathelement path="JmolAppletSigned4.jar" /> |
| 563 |
<pathelement path="JmolAppletSigned5.jar" /> |
553 |
<pathelement path="JmolAppletSigned5.jar" /> |
| 564 |
<pathelement path="JmolAppletSigned6.jar" /> |
554 |
<pathelement path="JmolAppletSigned6.jar" /> |
| 565 |
<pathelement path="JmolAppletSigned_i18n.jar" /> |
|
|
| 566 |
</indexjars> |
555 |
</indexjars> |
| 567 |
</jar> |
556 |
</jar> |
| 568 |
<signjar jar="JmolAppletSigned0.jar" |
557 |
<signjar jar="JmolAppletSigned0.jar" |
|
Lines 572-578
Link Here
|
| 572 |
</target> |
561 |
</target> |
| 573 |
|
562 |
|
| 574 |
<target name="dist" id="dist" |
563 |
<target name="dist" id="dist" |
| 575 |
depends="doc,main-i18n,main,signed-applet"> |
564 |
depends="doc,main,signed-applet"> |
| 576 |
<!-- first build binary distribution --> |
565 |
<!-- first build binary distribution --> |
| 577 |
<delete dir="build/dist/jmol-${version}"/> |
566 |
<delete dir="build/dist/jmol-${version}"/> |
| 578 |
<mkdir dir="build/dist/jmol-${version}"/> |
567 |
<mkdir dir="build/dist/jmol-${version}"/> |
|
Lines 624-630
Link Here
|
| 624 |
<fileset dir="."> |
613 |
<fileset dir="."> |
| 625 |
<include name="applet.classes" /> |
614 |
<include name="applet.classes" /> |
| 626 |
<include name="build.xml" /> |
615 |
<include name="build.xml" /> |
| 627 |
<include name="build-i18n.xml" /> |
|
|
| 628 |
</fileset> |
616 |
</fileset> |
| 629 |
</copy> |
617 |
</copy> |
| 630 |
|
618 |
|
|
Lines 713-719
Link Here
|
| 713 |
<fileset dir="."> |
701 |
<fileset dir="."> |
| 714 |
<include name="apisio.classes" /> |
702 |
<include name="apisio.classes" /> |
| 715 |
<include name="build.xml" /> |
703 |
<include name="build.xml" /> |
| 716 |
<include name="build-i18n.xml" /> |
|
|
| 717 |
</fileset> |
704 |
</fileset> |
| 718 |
</copy> |
705 |
</copy> |
| 719 |
|
706 |
|
|
Lines 803-809
Link Here
|
| 803 |
</delete> |
790 |
</delete> |
| 804 |
</target> |
791 |
</target> |
| 805 |
|
792 |
|
| 806 |
<target name="spotless" id="spotless" depends="clean,spotless-i18n"> |
793 |
<target name="spotless" id="spotless" depends="clean"> |
| 807 |
<delete dir="build"/> |
794 |
<delete dir="build"/> |
| 808 |
<delete dir="${javadoc.dir}"/> |
795 |
<delete dir="${javadoc.dir}"/> |
| 809 |
<delete dir="packaging/rpm/dist"/> |
796 |
<delete dir="packaging/rpm/dist"/> |
|
Lines 999-1011
Link Here
|
| 999 |
</javac> |
986 |
</javac> |
| 1000 |
<jar destfile="Tests.jar" basedir="${test-classes.dir}" /> |
987 |
<jar destfile="Tests.jar" basedir="${test-classes.dir}" /> |
| 1001 |
</target> |
988 |
</target> |
| 1002 |
|
|
|
| 1003 |
<!-- i18n stuff --> |
| 1004 |
<target name="main-i18n" depends="classes"> |
| 1005 |
<ant antfile="build-i18n.xml" target="main-i18n"/> |
| 1006 |
</target> |
| 1007 |
<target name="spotless-i18n"> |
| 1008 |
<ant antfile="build-i18n.xml" target="spotless-i18n"/> |
| 1009 |
</target> |
| 1010 |
|
| 1011 |
</project> |
989 |
</project> |
