<!-- Key Password -->
<property name="jalview.key.pass" value="alignmentisfun" />
+
+
<!-- Don't change anything below here unless you know what you are doing! -->
<!-- Url path for WebStart in JNLP file -->
<property name="WebStartLocation" value="http://www.jalview.org/webstart" />
<!-- Webstart Image - looked for in resources/images -->
<property name="WebStartImage" value="JalviewLogo_big.png"/>
<!-- J2SE version needed for webstart launch -->
- <property name="j2sev" value="1.6+"/>
+<!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
+ <property name="j2sev" value="1.7+"/>
+
+ <!-- Permissions for running Java applets and applications. Defaults are those suitable for deploying jalview webstart/jalviewLite at www.jalview.org -->
+ <property name="application.codebase" value="*.jalview.org"/>
+ <property name="applet.codebase" value="*.jalview.org"/>
+ <property name="applet.caller-codebase" value="${applet.codebase}"/>
+
<!-- build directory configuration -->
<property name="libDir" value="lib" />
<property name="resourceDir" value="resources" />
<property name="outputJar" value="jalview.jar" />
<!-- Jalview Applet JMol Jar Dependency -->
<property name="jmolJar" value="JmolApplet-12.2.4.jar" />
+ <property name="varnaJar" value="VARNAv3-9.jar" />
<property name="jalviewLiteJar" value="jalviewApplet.jar" />
<!-- switch to indicate if we should obfuscate jalviewLite -->
<!--<property name="donotobfuscate" value="true"/> -->
<!-- the JmolApplet includes the JmolApplet console and the application javac seems to always try and build all packages
-->
<include name="${jmolJar}" />
+ <include name="${varnaJar}" />
</fileset>
</path>
<include name="plugin.jar"/>
</fileset>
<pathelement location="appletlib/${jmolJar}" />
+ <pathelement location="lib/${varnaJar}" />
+
</path>
<!-- default location for outputting javadoc -->
<property name="javadocDir" value="${packageDir}/javadoc"/>
<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" />
<attribute name="Permissions" value="all-permissions" />
<!--<attribute name="Trusted-Lib" value="true" /> -->
<attribute name="Application-Name" value="Jalview Desktop"/>
- <attribute name="Codebase" value="*"/>
+ <attribute name="Codebase" value="${application.codebase}"/>
</manifest>
<fileset dir="${outputDir}/">
<exclude name="cache*/**" />
<mkdir dir="${outputDir}" />
<javac source="1.5" target="1.5" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}"
classpathref="jalviewlite.deps" includes="jalview/appletgui/**"
- excludes="ext/**,MCview/**,org/**,vamsas/**" />
+ excludes="ext/**,MCview/**,org/**,vamsas/**,jalview/ext/paradise/**" />
</target>
<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" />
+ <copy todir="${outputDir}/lang">
+ <fileset dir="${resourceDir}/lang"><include name="**.*"/></fileset></copy>
<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="www.jalview.org"/>
+ <!-- <attribute name="Permissions" value="sandbox" /> -->
+ <!--<attribute name="Trusted-Lib" value="true" /> -->
+ <attribute name="Codebase" value="${applet.codebase}"/>
+ <attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}"/>
</manifest>
<fileset dir="${outputDir}">
<include name="com/**" />
<include name=".build_properties" />
<include name="images/idwidth.gif" />
<include name="images/link.gif" />
+ <include name="lang/**" />
</fileset>
</jar>
</target>
</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">
-
+ <jar update="true" index="true" jarfile="${packageDir}/examples/${jmolJar}">
+ <manifest>
+ <attribute name="Application-Name" value="Jmol (bundled with JalviewLite)"/>
+ <!-- <attribute name="Permissions" value="sandbox" /> -->
+ <!--<attribute name="Trusted-Lib" value="true" /> -->
+ <attribute name="Codebase" value="${applet.codebase}"/>
+ <attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}"/>
+ </manifest>
+ </jar>
+ <signjar sigalg="SHA1WithRSA" 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>