Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 138619 | Differences between
and this patch

Collapse All | Expand All

(-)orig.build.xml (-24 / +3 lines)
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 484-495 Link Here
484
      </fileset>
483
      </fileset>
485
    </jar>
484
    </jar>
486
485
487
    <jar destfile="JmolApplet_i18n.jar" manifest="manifest/applet_i18n.txt" >
488
      <fileset dir="${applet.classes.dir}">
489
        <include name="org/jmol/translation/**" />
490
      </fileset>
491
    </jar>
492
493
    <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->
486
    <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->
494
    <!-- changes to this must be replicated below for the signed applet -->
487
    <!-- changes to this must be replicated below for the signed applet -->
495
    <jar destfile="JmolApplet0.jar" manifest="manifest/applet0.txt"
488
    <jar destfile="JmolApplet0.jar" manifest="manifest/applet0.txt"
Lines 508-514 Link Here
508
        <pathelement path="JmolApplet4.jar" />
501
        <pathelement path="JmolApplet4.jar" />
509
        <pathelement path="JmolApplet5.jar" />
502
        <pathelement path="JmolApplet5.jar" />
510
        <pathelement path="JmolApplet6.jar" />
503
        <pathelement path="JmolApplet6.jar" />
511
        <pathelement path="JmolApplet_i18n.jar" />
512
      </indexjars>
504
      </indexjars>
513
    </jar>
505
    </jar>
514
    <!-- changes to this must be replicated below for the signed applet -->
506
    <!-- changes to this must be replicated below for the signed applet -->
Lines 538-546 Link Here
538
    <signjar jar="JmolApplet6.jar" signedjar="JmolAppletSigned6.jar"
530
    <signjar jar="JmolApplet6.jar" signedjar="JmolAppletSigned6.jar"
539
             keystore="selfSignedCertificate/selfSignedCertificate.store"
531
             keystore="selfSignedCertificate/selfSignedCertificate.store"
540
             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
532
             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
541
    <signjar jar="JmolApplet_i18n.jar" signedjar="JmolAppletSigned_i18n.jar"
542
             keystore="selfSignedCertificate/selfSignedCertificate.store"
543
             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
544
533
545
    <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->
534
    <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->
546
    <!-- this one must be treated specially because of jar indexing
535
    <!-- this one must be treated specially because of jar indexing
Lines 561-567 Link Here
561
        <pathelement path="JmolAppletSigned4.jar" />
550
        <pathelement path="JmolAppletSigned4.jar" />
562
        <pathelement path="JmolAppletSigned5.jar" />
551
        <pathelement path="JmolAppletSigned5.jar" />
563
        <pathelement path="JmolAppletSigned6.jar" />
552
        <pathelement path="JmolAppletSigned6.jar" />
564
        <pathelement path="JmolAppletSigned_i18n.jar" />
565
      </indexjars>
553
      </indexjars>
566
    </jar>
554
    </jar>
567
    <signjar jar="JmolAppletSigned0.jar"
555
    <signjar jar="JmolAppletSigned0.jar"
Lines 571-577 Link Here
571
  </target>
559
  </target>
572
560
573
  <target name="dist" id="dist"
561
  <target name="dist" id="dist"
574
          depends="doc,main-i18n,main,signed-applet">
562
          depends="doc,main,signed-applet">
575
    <!-- first build binary distribution -->
563
    <!-- first build binary distribution -->
576
    <delete dir="build/dist/jmol-${version}"/>
564
    <delete dir="build/dist/jmol-${version}"/>
577
    <mkdir dir="build/dist/jmol-${version}"/>
565
    <mkdir dir="build/dist/jmol-${version}"/>
Lines 711-717 Link Here
711
      <fileset dir=".">
699
      <fileset dir=".">
712
        <include name="apisio.classes" />
700
        <include name="apisio.classes" />
713
        <include name="build.xml" />
701
        <include name="build.xml" />
714
        <include name="build-i18n.xml" />
715
      </fileset>
702
      </fileset>
716
    </copy>
703
    </copy>
717
704
Lines 801-807 Link Here
801
    </delete>
788
    </delete>
802
  </target>
789
  </target>
803
790
804
  <target name="spotless" id="spotless" depends="clean,spotless-i18n">
791
  <target name="spotless" id="spotless" depends="clean">
805
    <delete dir="build"/>
792
    <delete dir="build"/>
806
    <delete dir="${javadoc.dir}"/>
793
    <delete dir="${javadoc.dir}"/>
807
    <delete dir="packaging/rpm/dist"/>
794
    <delete dir="packaging/rpm/dist"/>
Lines 998-1009 Link Here
998
    <jar destfile="Tests.jar" basedir="${test-classes.dir}" />
985
    <jar destfile="Tests.jar" basedir="${test-classes.dir}" />
999
  </target>
986
  </target>
1000
987
1001
  <!-- i18n stuff -->
1002
  <target name="main-i18n" depends="classes">
1003
    <ant antfile="build-i18n.xml" target="main-i18n"/>
1004
  </target>
1005
  <target name="spotless-i18n">
1006
    <ant antfile="build-i18n.xml" target="spotless-i18n"/>
1007
  </target>
1008
1009
</project>
988
</project>

Return to bug 138619