From: jprocter <Jim Procter>
Date: Wed, 25 Aug 2010 14:17:55 +0000 (+0000)
Subject: applet now requires java 1.5 minimum (jmol 12.1.xx series is 1.5 only).
X-Git-Tag: Release_2_6~92
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6e38147bd0ac85772875c9e858dc4558e14423d6;p=jalview.git

applet now requires java 1.5 minimum (jmol 12.1.xx series is 1.5 only).
---

diff --git a/build.xml b/build.xml
index ae3dcec..549d237 100755
--- a/build.xml
+++ b/build.xml
@@ -100,7 +100,7 @@
 		<property name="packageDir" value="dist" />
 		<property name="outputJar" value="jalview.jar" />
 		<!-- Jalview Applet JMol Jar Dependency -->
-		<property name="jmolJar" value="JmolApplet-12.0.6.jar" />
+		<property name="jmolJar" value="JmolApplet-12.1.5.jar" />
 		<property name="jalviewLiteJar" value="jalviewApplet.jar"/>
 		<!-- switch to indicate if we should obfuscate jalviewLite -->
 		<!--<property name="donotobfuscate" value="true"/> -->
@@ -462,8 +462,8 @@
 
 			<target name="compileApplet" depends="init,clean">
 				<mkdir dir="${outputDir}"/>
-				<javac source="1.2"
-    target="1.1"
+				<javac source="1.5"
+    target="1.5"
     srcdir="${sourceDir}" 
     destdir="${outputDir}"
    	debug="${javac.debug}"
@@ -493,7 +493,7 @@
 			<target name="obfuscate" depends="-obfuscatefake,-obfuscatereally" description="construct the final jalviewLite applet jar with or without obfuscation">
 			</target>
 			<target name="-obfuscatefake" depends="packageApplet" if="donotobfuscate">
-				<copy file="in.jar" tofile="${jalviewLiteJar}" />
+				<copy file="in.jar" tofile="${jalviewLiteJar}" overwrite="true"/>
 				<delete file="in.jar"/>
 			</target>
 			<target name="-obfuscatereally" unless="donotobfuscate">