git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1139 need to explicitly specify SHA1 for java 6 launch
[jalview.git]
/
build.xml
diff --git
a/build.xml
b/build.xml
index
d843c00
..
e12db95
100755
(executable)
--- a/
build.xml
+++ b/
build.xml
@@
-88,6
+88,8
@@
<!-- 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" />
<!-- 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+"/>
<!-- build directory configuration -->
<!-- J2SE version needed for webstart launch -->
<property name="j2sev" value="1.6+"/>
<!-- build directory configuration -->
@@
-101,7
+103,7
@@
<property name="packageDir" value="dist" />
<property name="outputJar" value="jalview.jar" />
<!-- Jalview Applet JMol Jar Dependency -->
<property name="packageDir" value="dist" />
<property name="outputJar" value="jalview.jar" />
<!-- Jalview Applet JMol Jar Dependency -->
- <property name="jmolJar" value="JmolApplet-12.1.13.jar" />
+ <property name="jmolJar" value="JmolApplet-12.2.4.jar" />
<property name="jalviewLiteJar" value="jalviewApplet.jar" />
<!-- switch to indicate if we should obfuscate jalviewLite -->
<!--<property name="donotobfuscate" value="true"/> -->
<property name="jalviewLiteJar" value="jalviewApplet.jar" />
<!-- switch to indicate if we should obfuscate jalviewLite -->
<!--<property name="donotobfuscate" value="true"/> -->
@@
-226,12
+228,18
@@
<target name="makefulldist" depends="makedist">
<!-- the default keystore details might need to be edited here -->
<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 digestalg="SHA1" storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
<fileset dir="${packageDir}">
<include name="*.jar" />
</fileset>
</signjar>
<fileset dir="${packageDir}">
<include name="*.jar" />
</fileset>
</signjar>
+ <copy todir="${packageDir}">
+ <fileset dir="${resourceDir}/images">
+ <include name="${WebStartImage}"/>
+ </fileset>
+ </copy>
+
<taskdef classpathref="build.classpath" resource="com/roxes/tools/ant/taskdefs.properties" />
<!-- codebase="http://www.jalview.org/jalview/webstart" -->
<taskdef classpathref="build.classpath" resource="com/roxes/tools/ant/taskdefs.properties" />
<!-- codebase="http://www.jalview.org/jalview/webstart" -->
@@
-243,8
+251,8
@@
<homepage href="http://www.jalview.org" />
<description>Jalview Multiple Alignment Editor</description>
<description kind="short">Jalview</description>
<homepage href="http://www.jalview.org" />
<description>Jalview Multiple Alignment Editor</description>
<description kind="short">Jalview</description>
- <icon href="logo_big.gif" />
- <offline_allowed />
+ <icon href="${WebStartImage}" />
+ <offline_allowed/>
</information>
<resources>
<j2se version="${j2sev}" initial_heap_size="10M" />
</information>
<resources>
<j2se version="${j2sev}" initial_heap_size="10M" />
@@
-271,7
+279,7
@@
<homepage href="http://www.jalview.org" />
<description>Jalview Multiple Alignment Editor</description>
<description kind="short">Jalview</description>
<homepage href="http://www.jalview.org" />
<description>Jalview Multiple Alignment Editor</description>
<description kind="short">Jalview</description>
- <icon href="logo_big.gif" />
+ <icon href="${WebStartImage}" />
<offline_allowed />
</information>
<resources>
<offline_allowed />
</information>
<resources>
@@
-299,7
+307,7
@@
<homepage href="http://www.jalview.org" />
<description>Jalview Multiple Alignment Editor</description>
<description kind="short">Jalview</description>
<homepage href="http://www.jalview.org" />
<description>Jalview Multiple Alignment Editor</description>
<description kind="short">Jalview</description>
- <icon href="logo_big.gif" />
+ <icon href="${WebStartImage}" />
<offline_allowed />
</information>
<resources>
<offline_allowed />
</information>
<resources>
@@
-338,7
+346,8
@@
<association mime-type="application-x/ext-file" extensions="aln"/>
<association mime-type="application-x/ext-file" extensions="pir"/>
<association mime-type="application-x/ext-file" extensions="amsa"/>
<association mime-type="application-x/ext-file" extensions="aln"/>
<association mime-type="application-x/ext-file" extensions="pir"/>
<association mime-type="application-x/ext-file" extensions="amsa"/>
- <association mime-type="application-x/ext-file" extensions="stk"/>-->
+ <association mime-type="application-x/ext-file" extensions="stk"/>
+ <association mime-type="application-x/ext-file" extensions="jar"/>-->
</target>
</target>
@@
-483,11
+492,17
@@
<injar file="in.jar" />
<outjar file="${jalviewLiteJar}" />
<libraryjar refid="obfuscateDeps.path" />
<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.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
<!-- -libraryjars "${obfuscateDeps}"
-injars in.jar
-outjars jalviewApplet.jar