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
binding between JalviewLite alignment windows and some external Jmol viewer
[jalview.git]
/
build.xml
diff --git
a/build.xml
b/build.xml
index
e9b5137
..
ae3dcec
100755
(executable)
--- a/
build.xml
+++ b/
build.xml
@@
-291,7
+291,7
@@
-->
</information>
<resources>
-->
</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>
<fileset dir="${packageDir}">
<include name="jalview.jar" />
</fileset>
@@
-330,7
+330,7
@@
-->
</information>
<resources>
-->
</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>
<fileset dir="${packageDir}">
<include name="jalview.jar" />
</fileset>
@@
-467,7
+467,7
@@
srcdir="${sourceDir}"
destdir="${outputDir}"
debug="${javac.debug}"
srcdir="${sourceDir}"
destdir="${outputDir}"
debug="${javac.debug}"
- classpath="lib/${jmolJar}"
+ classpath="appletlib/${jmolJar}"
includes="jalview/appletgui/**"
excludes="ext/**,MCview/**,org/**,vamsas/**"
/>
includes="jalview/appletgui/**"
excludes="ext/**,MCview/**,org/**,vamsas/**"
/>
@@
-500,7
+500,7
@@
<path id="obfuscateDeps.path">
<pathelement location="${applet.jre.tools}"/>
<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" />
</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="${libDir}/**/*"/>
<include name="${resourceDir}/**/*"/>
<include name="${helpDir}/**/*"/>
+ <include name="appletlib/${jmolJar}"/>
<exclude name="**/*locales"/>
<exclude name="*locales/**"/>
<exclude name="utils/InstallAnywhere/**Build.iap_xml"/>
<exclude name="**/*locales"/>
<exclude name="*locales/**"/>
<exclude name="utils/InstallAnywhere/**Build.iap_xml"/>