git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
bdfde6e
)
JAL-1759 corrected jmol applet lib name
features/JAL-1759jmolUpdate
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Sun, 12 Jul 2015 11:30:25 +0000
(12:30 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Sun, 12 Jul 2015 11:30:25 +0000
(12:30 +0100)
build.xml
patch
|
blob
|
history
diff --git
a/build.xml
b/build.xml
index
44021ba
..
d0aad96
100755
(executable)
--- a/
build.xml
+++ b/
build.xml
@@
-112,7
+112,7
@@
<property name="packageDir" value="dist" />
<property name="outputJar" value="jalview.jar" />
<!-- Jalview Applet JMol Jar Dependency -->
<property name="packageDir" value="dist" />
<property name="outputJar" value="jalview.jar" />
<!-- Jalview Applet JMol Jar Dependency -->
- <property name="jmolJar" value="JmolApplet-14.2.14_2015.06.01.jar" />
+ <property name="jmolJar" value="JmolApplet-14.2.14_2015.06.11.jar" />
<property name="varnaJar" value="VARNAv3-93.jar" />
<property name="jsoup" value="jsoup-1.8.1.jar" />
<property name="jsonSimple" value="json_simple-1.1.jar" />
<property name="varnaJar" value="VARNAv3-93.jar" />
<property name="jsoup" value="jsoup-1.8.1.jar" />
<property name="jsonSimple" value="json_simple-1.1.jar" />
@@
-547,7
+547,7
@@
<mkdir dir="${outputDir}" />
<javac source="${javac.source}" target="${javac.target}" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}"
classpathref="jalviewlite.deps" includes="jalview/appletgui/**"
<mkdir dir="${outputDir}" />
<javac source="${javac.source}" target="${javac.target}" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}"
classpathref="jalviewlite.deps" includes="jalview/appletgui/**"
- excludes="ext/**,MCview/**,org/**,vamsas/**,jalview/ext/paradise/**" />
+ excludes="ext/**,gui/**,jbgui/**,MCview/**,org/**,vamsas/**,jalview/ext/rbvi/**,jalview/ext/paradise/**" />
</target>
<target name="packageApplet" depends="compileApplet, buildPropertiesFile">
</target>
<target name="packageApplet" depends="compileApplet, buildPropertiesFile">