JAL-3445 branch for BSML file reading development

[jalview.git] / buildcore.xml

diff --git a/buildcore.xml b/buildcore.xml
index 8f7fea6..1ca110a 100644 (file)
--- a/buildcore.xml
+++ b/buildcore.xml
@@ -24,10 +24,16 @@
     <!-- sensible defaults for default target -->
     <property name="site" value="site"/>
     <property name="site.path" value="${site}/swingjs" />
-    <property name="core.name" value="_jalview" />
+    
+       <property name="core.name" value="_jalview" />
     <property name="classlist"  
-      description="Class list .txt generated by java2script classloader to be bundled into corefile - default is _j2sclasslist.txt" 
+      description="Class list generated by java2script classloader to be bundled into corefile - default is _j2sclasslist.txt" 
       value="_j2sclasslist.txt" />
+       
+    <property name="core.name.jmol" value="_jvjmol" />
+    <property name="classlist.jmol"  
+      value="_j2sclasslist_jmol.txt" />
+       
     <!-- create a NON svn local directory only containing JS files
        
        <echo>Deleting the site directory.</echo>
@@ -37,10 +43,8 @@
        
        <!-- concatentate the stevesoft files -->
     <concat destfile="${site.path}/j2s/com/stevesoft/core.js">
-        <fileset dir="${site.path}/j2s/com/stevesoft">
+        <fileset dir="${site.path}/j2s/com/stevesoft/pat">
           <include name="**/*.js" />
-               <exclude name="core.js" />
-               <exclude name="Regex.js" />
         </fileset>
     </concat>
     <antcall target="call-core">
@@ -48,6 +52,19 @@
       <param name="call-core.list" value="com/stevesoft/core.js" />
     </antcall>
 
+
+       <!-- compress the jmol files -->
+    
+       <loadresource property="coreclassesjmol">
+      <file file="${classlist.jmol}"/>
+    </loadresource>
+
+    <antcall target="call-core">
+      <param name="call-core.name" value="${core.name.jmol}" />
+      <param name="call-core.list" value="
+               ${coreclassesjmol}
+               " />
+    </antcall>
        
     <!-- make core files -->
 
@@ -57,10 +74,11 @@
       <file file="${classlist}"/>
     </loadresource>
 
+       <!-- removing                   core/coreswingjs.js  -->
+
     <antcall target="call-core">
       <param name="call-core.name" value="${core.name}" />
       <param name="call-core.list" value="
-                       core/coreswingjs.js
                ${coreclasses}
                " />
     </antcall>
@@ -72,7 +90,7 @@
     <property name="template.html" value="jalview_bin_Jalview.html"/>
     <property name="template.name" value="JalviewJS"/>
 
-    <echo>......Now copying ${site}/${template.html} as ${$template.name}_${core.name}.html with core:"${core.name}", added to the Info block.</echo>
+    <echo>......Now copying ${site}/${template.html} as ${template.name}_${core.name}.html with core:"${core.name}", added to the Info block.</echo>
     <copy file="${site}/${template.html}" tofile="${site}/${template.name}_${core.name}.html"/>
     <replace token="NONE" value="${core.name}" file="${site}/${template.name}_${core.name}.html"/>