Merge branch 'JAL-1400_signapplet' into Release_2_8_Branch

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 3eae6af..5f8b5af 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -228,7 +228,7 @@
 
        <target name="makefulldist" depends="makedist">
                <!-- the default keystore details might need to be edited here -->
-               <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
+               <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" sigalg="SHA1withRSA">
 
                        <fileset dir="${packageDir}">
                                <include name="*.jar" />
@@ -412,7 +412,7 @@
                                <include name="*.jar"/>
                        </fileset>
                </delete>
-               <jar destfile="${packageDir}/${outputJar}">
+               <jar destfile="${packageDir}/${outputJar}" index="true">
                        <manifest>
                                <attribute name="Main-Class" value="jalview.bin.Jalview" />
         <attribute name="Permissions" value="all-permissions" />
@@ -464,9 +464,14 @@
        <target name="packageApplet" depends="compileApplet, buildPropertiesFile">
                <copy file="${resourceDir}/images/idwidth.gif" toFile="${outputDir}/images/idwidth.gif" />
                <copy file="${resourceDir}/images/link.gif" toFile="${outputDir}/images/link.gif" />
-               <jar destfile="in.jar">
+               <jar destfile="in.jar" index="true">
                        <manifest>
                                <attribute name="Main-Class" value="jalview.bin.JalviewLite" />
+                               <attribute name="Permissions" value="sandbox" />
+                               <!--<attribute name="Trusted-Lib" value="true" /> -->
+                               <attribute name="Application-Name" value="JalviewLite Applet"/>
+                               <attribute name="Codebase" value="*.jalview.org *"/>
+                               <attribute name="Caller-Allowable-Codebase" value="*.jalview.org *"/>
                        </manifest>
                        <fileset dir="${outputDir}">
                                <include name="com/**" />
@@ -496,11 +501,17 @@
                        <injar file="in.jar" />
                        <outjar file="${jalviewLiteJar}" />
                        <libraryjar refid="obfuscateDeps.path" />
+                       <dontwarn/>
                        <keep access="public" type="class" name="jalview.bin.JalviewLite">
                                <field access="public" />
                                <method access="public" />
                                <constructor access="public" />
                        </keep>
+                       <keep access="public" type="class" name="jalview.appletgui.AlignFrame">
+                               <field access="public" />
+                               <method access="public" />
+                               <constructor access="public" />
+                       </keep>
                        <!--      -libraryjars "${obfuscateDeps}"
       -injars      in.jar
       -outjars     jalviewApplet.jar
@@ -583,7 +594,14 @@
                      <include name="**/*"/>
                        </fileset>
          </copy>
-                       
+           <jar update="true" index="true" jarfile="${packageDir}/examples/${jalviewLiteJar}"/>
+           <jar update="true" index="true" jarfile="${packageDir}/examples/$(jmolJar}"/>
+    <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
+
+      <fileset dir="${packageDir}/examples">
+        <include name="*.jar" />
+      </fileset>
+    </signjar>
        </target>
        <target name="sourcedoc" description="Create jalview source documentation pages" depends="init">
         <javadoc destdir="${javadocDir}">