X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=buildcore.xml;h=d2a2d2677e7a9c0a57333af6b8b130308bc8eead;hb=e226ed0ad6ba8552a0b70fb083cf00060588855d;hp=3c21f436c1fc657a2d9c16f6817b0c4d887a4e54;hpb=06ffb4f0ddc2eb9e5e74c23166cda92b5285ad88;p=jalview.git

diff --git a/buildcore.xml b/buildcore.xml
index 3c21f43..d2a2d26 100644
--- a/buildcore.xml
+++ b/buildcore.xml
@@ -24,16 +24,49 @@
     <!-- 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>
    	 	<delete quiet="true" dir="site" />
     -->
 
+  	
+  	<!-- concatentate the stevesoft files -->
+    <concat destfile="${site.path}/j2s/com/stevesoft/core.js">
+        <fileset dir="${site.path}/j2s/com/stevesoft/pat">
+          <include name="**/*.js" />
+        	<exclude name="Regex.js" />
+        </fileset>
+    </concat>
+    <antcall target="call-core">
+      <param name="call-core.name" value="_stevesoft" />
+      <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 -->
 
     <echo>Building core file '${core.name}' - warnings are OK; "does not exist" is trouble</echo>
@@ -42,10 +75,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>