(probably unnecessary) explicit inclusion of jalview/ext package

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 38298d2..ded7008 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -467,9 +467,9 @@
     srcdir="${sourceDir}" 
     destdir="${outputDir}"
        debug="${javac.debug}"
-    classpath="lib/${jmolJar}"
-       includes="jalview/appletgui/**"
-       excludes="ext/**,MCview/**,org/**,vamsas/**"
+    classpath="appletlib/${jmolJar}"
+       includes="jalview/appletgui/**,jalview/ext/**"
+       excludes="ext/**,MCview/**,org/**,vamsas/**,jalview/gui/**"
        />
                        </target>
 
@@ -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"/>