update to Jmol 12.1.5 (will become 12.2.X when released)

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 455278a..ae3dcec 100755 (executable)
--- 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="Jmol-12.0.RC18.jar" />
+               <property name="jmolJar" value="JmolApplet-12.0.6.jar" />
                <property name="jalviewLiteJar" value="jalviewApplet.jar"/>
                <!-- switch to indicate if we should obfuscate jalviewLite -->
                <!--<property name="donotobfuscate" value="true"/> -->
@@ -137,7 +137,7 @@
                        <fileset dir="${java118.home}">
                                <include name="lib/classes.zip"/>
                        </fileset>
-                       <pathelement location="lib/${jmolJar}"/>
+                       <pathelement location="appletlib/${jmolJar}"/>
                </path>
        </target>
 
@@ -196,7 +196,7 @@
 
        <target name="build" depends="prepare">
                <!-- not efficient yet. -->
-               <javac source="1.4" target="1.4"
+               <javac source="1.5" target="1.5"
         srcdir ="${sourceDir}"
         destdir="${outputDir}"
                                debug="${javac.debug}"
@@ -251,7 +251,7 @@
        -->
                        </information>
                        <resources>
-                               <j2se version="1.4+" initial_heap_size="10M"/>
+                               <j2se version="1.5+" initial_heap_size="10M"/>
                                <fileset dir="${packageDir}">
                                        <include name="jalview.jar" />
                                </fileset>
@@ -291,7 +291,7 @@
                -->
                                </information>
                                <resources>
-                                       <j2se version="1.4+" initial_heap_size="64M" max_heap_size="512M"/>
+                                       <j2se version="1.5+" initial_heap_size="64M" max_heap_size="512M"/>
                                        <fileset dir="${packageDir}">
                                                <include name="jalview.jar" />
                                        </fileset>
@@ -330,7 +330,7 @@
                        -->
                                        </information>
                                        <resources>
-                                               <j2se version="1.4+" initial_heap_size="256M" max_heap_size="1024M"/>
+                                               <j2se version="1.5+" initial_heap_size="256M" max_heap_size="1024M"/>
                                                <fileset dir="${packageDir}">
                                                        <include name="jalview.jar" />
                                                </fileset>
@@ -467,7 +467,7 @@
     srcdir="${sourceDir}" 
     destdir="${outputDir}"
        debug="${javac.debug}"
-    classpath="lib/${jmolJar}"
+    classpath="appletlib/${jmolJar}"
        includes="jalview/appletgui/**"
        excludes="ext/**,MCview/**,org/**,vamsas/**"
        />
@@ -500,7 +500,7 @@
 
                                <path id="obfuscateDeps.path">
                                        <pathelement location="${applet.jre.tools}"/>
-                                       <pathelement location="lib/${jmolJar}"/>
+                                       <pathelement location="appletlib/${jmolJar}"/>
                                </path>
                                <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
 
@@ -607,6 +607,7 @@
                                                <include name="${libDir}/**/*"/>
                                                <include name="${resourceDir}/**/*"/>
                                                <include name="${helpDir}/**/*"/>
+                                               <include name="appletlib/${jmolJar}"/>
                                                <exclude name="**/*locales"/>
                                                <exclude name="*locales/**"/>
                                                <exclude name="utils/InstallAnywhere/**Build.iap_xml"/>