X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build-site.xml;h=29f2745a1fe102cd1f228ee7f6693958ae00c212;hb=refs%2Fheads%2FJalview-JS%2FJAL-3560-bh-temp;hp=e5202e2b0404981e6bc7a4f1875ffbc2bc47a258;hpb=3ced0e3f96d967240eea9ee0a60276e6cdf73ccb;p=jalview.git

diff --git a/build-site.xml b/build-site.xml
index e5202e2..29f2745 100644
--- a/build-site.xml
+++ b/build-site.xml
@@ -1,39 +1,91 @@
 <?xml version="1.0"?>
 <!--
- * just a crude unzip of non-Jalview classes for development purposes -BH 2018
+ BH 2018.08.12
+
+ - requires tools/ant-contrib.jar
+  
+ - creates the site/ directory if it does not exist
+ - unzip libjs/*.zip into site/swingjs/j2s
+ - unzips swingjs/SwingJS-site.zip into site/
+ - copies non-java resources from resources/ into site/swingjs/j2s
+ 
 -->
-<project name="jalviewX" default="tosite" basedir="."
+
+<project name="swingjs-project" default="tosite" basedir="."
  xmlns:if="ant:if"
     xmlns:unless="ant:unless">
 	
   <target name="tosite">
+  	  	
+  	<!-- input directories -->
   	
-  	<!-- inputs directories -->
-    <property name="resourceDir" value="resources" />  	
-  	<property name="libjsDir" value="libjs"/>
-    <property name="swingjsDir" value="swingjs"/>
-  	
- 	<!-- inputs zip files -->
-  	<property name="swingjs.zip" value="${swingjsDir}/SwingJS-site.zip" />
-    <property name="varna.zip" value="${libjsDir}/VARNA-site.zip" />
+  	<!-- location of ant-contrib.jar -->
+  	<property name="tools.dir" value = "tools" />
+
+ 	<!-- SwingjS_site zip file (could be varied if versioning is needed) -->
+  	<property name="swingjs.zip" value="swingjs/SwingJS-site.zip" />
 
+  	<!-- location of third-party jar contents as precompiled zipped .js files to copy to site/ -->
+  	<property name="libjs.dir" value="libjs" />
+ 
+  	<!-- non-Java resources to copy to site/swingjs/j2s -->
+    <property name="resource.dir" value="resources" />  	
+  	
+  	<!-- non-Java resources to copy to site/ -->
+    <property name="site-resource.dir" value="site-resources" />  	
+  	
 	<!-- output directories -->
-  	<property name="site" value="site"/>
-  	<property name="j2sDir" value="${site}/swingjs/j2s"/>
 
+  	<property name="site.dir" value="site" />
+  	<property name="j2s.dir" value="${site.dir}/swingjs/j2s" />
+  	 
+    <!-- <for  ...> construct needs ant-contrib.jar -->
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
+      <classpath>
+        <pathelement location="${tools.dir}/ant-contrib.jar" />
+      </classpath>
+    </taskdef>
+
+	<!-- unzip all libjs zip files into site
+	
+	   all zip files placed in libjs will be processed
+	   
+	 -->
+
+  	<for param="file.zip">
+  	  <path>
+  	    <fileset dir="${libjs.dir}" includes="*.zip"/>
+  	  </path>
+  	  <sequential>
+  	  	 	<unzip src="@{file.zip}" dest="${site.dir}" overwrite="true"/>  	
+  	  </sequential>
+  	</for>
+
+  	<!-- unzip SwingJS-site.zip 
   	
-  	<echo> Unzipping ${swingjs.zip} into ${site} </echo>
-  	<unzip src="${swingjs.zip}" dest="${site}/" overwrite="true"/>  	
- 
-  	<echo> Unzipping ${varna.zip} into ${site} </echo> 
- 	<unzip src="${varna.zip}" dest="${site}" overwrite="true"/>  	
+  	  we do this separately, as we want it done last 
   	
-  	<echo> Copying ${resourceDir} files into ${j2sDir} </echo>
-  	<copy todir="${j2sDir}">
-      <fileset dir="${resourceDir}">
+  	-->
+
+  	<unzip src="${swingjs.zip}" dest="${site.dir}/" overwrite="true"/>  	
+
+ 	<!-- transfer resources -->
+
+  	<echo> Copying ${resource.dir} files into ${j2s.dir} </echo>
+  	<copy todir="${j2s.dir}">
+      <fileset dir="${resource.dir}">
       	<include name="**"/>
   	</fileset>
     </copy>
-  	
+      		
+  	<echo> Copying ${site-resource.dir} files into ${site.dir} </echo>
+  	<copy todir="${site.dir}">
+      <fileset dir="${site-resource.dir}">
+      	<include name="**"/>
+  	</fileset>
+    </copy>
+      		
 </target>
+	
+
 </project>