Merge branch 'Release_2_8_1_Branch' into Release_2_8_1_Branch_i18n

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index b2a39c6..0e13756 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" />
+               <!-- 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 -->
@@ -234,7 +236,7 @@
                </signjar>
                <copy todir="${packageDir}">
                        <fileset dir="${resourceDir}/images">
-                               <include name="JalviewLogo_big.png"/>
+                               <include name="${WebStartImage}"/>
                        </fileset>
                                        </copy>
                
@@ -249,7 +251,7 @@
                                <homepage href="http://www.jalview.org" />
                                <description>Jalview Multiple Alignment Editor</description>
                                <description kind="short">Jalview</description>
-                               <icon href="JalviewLogo_big.png" />
+                               <icon href="${WebStartImage}" />
                                <offline_allowed/>
                        </information>
                        <resources>
@@ -277,7 +279,7 @@
                                <homepage href="http://www.jalview.org" />
                                <description>Jalview Multiple Alignment Editor</description>
                                <description kind="short">Jalview</description>
-                               <icon href="JalviewLogo_big.png" />
+                               <icon href="${WebStartImage}" />
                                <offline_allowed />
                        </information>
                        <resources>
@@ -305,7 +307,7 @@
                                <homepage href="http://www.jalview.org" />
                                <description>Jalview Multiple Alignment Editor</description>
                                <description kind="short">Jalview</description>
-                               <icon href="JalviewLogo_big.png" />
+                               <icon href="${WebStartImage}" />
                                <offline_allowed />
                        </information>
                        <resources>
@@ -458,6 +460,8 @@
        <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">
                        <manifest>
                                <attribute name="Main-Class" value="jalview.bin.JalviewLite" />
@@ -469,6 +473,7 @@
                                <include name=".build_properties" />
                                <include name="images/idwidth.gif" />
                                <include name="images/link.gif" />
+                               <include name="lang/**" />
                        </fileset>
                </jar>
        </target>