SwingJS transpiler to 3.2.5.v1 (fixed java.util.stream)

[jalview.git] / buildcore.xml

diff --git a/buildcore.xml b/buildcore.xml
index 3c21f43..1ca110a 100644 (file)
--- a/buildcore.xml
+++ b/buildcore.xml
@@ -24,16 +24,48 @@
     <!-- 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" />
+        </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 +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>
@@ -57,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"/>