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
Merge branch 'JAL-1569_wuss_vienna_broke' into develop
[jalview.git]
/
build.xml
diff --git
a/build.xml
b/build.xml
index
5f34f3e
..
19b41e5
100755
(executable)
--- a/
build.xml
+++ b/
build.xml
@@
-1,6
+1,6
@@
<?xml version="1.0"?>
<!--
<?xml version="1.0"?>
<!--
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
@@
-18,15
+18,6
@@
* The Jalview Authors are detailed in the 'AUTHORS' file.
-->
<project name="jalviewX" default="usage" basedir=".">
* The Jalview Authors are detailed in the 'AUTHORS' file.
-->
<project name="jalviewX" default="usage" basedir=".">
- <!-- we use jalopy to format our sources -->
- <taskdef name="jalopy" classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
- <classpath>
- <fileset dir="utils/jalopy/lib">
- <include name="*.jar" />
- </fileset>
- </classpath>
- </taskdef>
-
<target name="help" depends="usage" />
<target name="usage">
<echo message="~~~Jalview Ant build.xml Usage~~~~" />
<target name="help" depends="usage" />
<target name="usage">
<echo message="~~~Jalview Ant build.xml Usage~~~~" />
@@
-92,7
+83,7
@@
<!-- Webstart Image - looked for in resources/images -->
<property name="WebStartImage" value="JalviewLogo_big.png"/>
<!-- J2SE version needed for webstart launch -->
<!-- Webstart Image - looked for in resources/images -->
<property name="WebStartImage" value="JalviewLogo_big.png"/>
<!-- J2SE version needed for webstart launch -->
-<!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
+ <!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
<property name="j2sev" value="1.7+"/>
<!-- Permissions for running Java applets and applications. -->
<property name="j2sev" value="1.7+"/>
<!-- Permissions for running Java applets and applications. -->
@@
-115,7
+106,7
@@
<property name="outputJar" value="jalview.jar" />
<!-- Jalview Applet JMol Jar Dependency -->
<property name="jmolJar" value="JmolApplet-12.2.4.jar" />
<property name="outputJar" value="jalview.jar" />
<!-- Jalview Applet JMol Jar Dependency -->
<property name="jmolJar" value="JmolApplet-12.2.4.jar" />
- <property name="varnaJar" value="VARNAv3-9.jar" />
+ <property name="varnaJar" value="VARNAv3-91.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"/> -->
@@
-147,7
+138,7
@@
<!-- the JmolApplet includes the JmolApplet console and the application javac seems to always try and build all packages
-->
<include name="${jmolJar}" />
<!-- the JmolApplet includes the JmolApplet console and the application javac seems to always try and build all packages
-->
<include name="${jmolJar}" />
- <include name="${varnaJar}" />
+ <include name="${varnaJar}" />
</fileset>
</path>
</fileset>
</path>
@@
-365,13
+356,13
@@
</presetdef>
<jnlpf toFile="${jnlpFile}"/>
</presetdef>
<jnlpf toFile="${jnlpFile}"/>
-
+
</target>
</target>
-
+
<target name="-dofakejnlpfileassoc" depends="-generatejnlpf" if="nojnlpfileassocs">
<echo message="Not adding JNLP File Associations"/>
</target>
<target name="-dofakejnlpfileassoc" depends="-generatejnlpf" if="nojnlpfileassocs">
<echo message="Not adding JNLP File Associations"/>
</target>
-
+
<target name="-dojnlpfileassoc" depends="-generatejnlpf" unless="nojnlpfileassocs">
<replace file="${jnlpFile}">
<replacetoken>
<target name="-dojnlpfileassoc" depends="-generatejnlpf" unless="nojnlpfileassocs">
<replace file="${jnlpFile}">
<replacetoken>
@@
-391,9
+382,9
@@
<association mime-type="application-x/ext-file" extensions="stk"/>
<association mime-type="application-x/ext-file" extensions="jvp"/>
</information>]]></replacevalue>
<association mime-type="application-x/ext-file" extensions="stk"/>
<association mime-type="application-x/ext-file" extensions="jvp"/>
</information>]]></replacevalue>
- </replace>
- <echo message="Added file associations to JNLP file"/>
- </target>
+ </replace>
+ <echo message="Added file associations to JNLP file"/>
+</target>
<target name="writejnlpf" depends="-dojnlpfileassoc,-dofakejnlpfileassoc">
</target>
<target name="writejnlpf" depends="-dojnlpfileassoc,-dofakejnlpfileassoc">
</target>