<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"/> -->
<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}"
- classpath="lib/${jmolJar}"
+ classpath="appletlib/${jmolJar}"
includes="jalview/appletgui/**"
excludes="ext/**,MCview/**,org/**,vamsas/**"
/>
<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">
<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" />
verbose="true"
properties="${schemaDir}/jalview.properties"
/>
+ <castor-srcgen file="${schemaDir}/JalviewWsParamSet.xsd"
+ todir="${sourceDir}"
+ package="jalview.schemabinding.version2"
+ warnings="false"
+ nodesc="false"
+ verbose="true"
+ properties="${schemaDir}/jalview.properties"
+ />
<castor-srcgen file="${schemaDir}/jalview.xsd"
todir="${sourceDir}"
package="jalview.schemabinding.version2"
<include name="${libDir}/**/*"/>
<include name="${resourceDir}/**/*"/>
<include name="${helpDir}/**/*"/>
- <include name="${jmolJar}"/>
+ <include name="appletlib/${jmolJar}"/>
<exclude name="**/*locales"/>
<exclude name="*locales/**"/>
<exclude name="utils/InstallAnywhere/**Build.iap_xml"/>