X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build-site.xml;h=29f2745a1fe102cd1f228ee7f6693958ae00c212;hb=refs%2Fheads%2FJAL-3253-applet-113cc13-2019.08.28-js-optimizations;hp=5558f8e154ecac0aa0c0c943f76d8fcd1f2adcf8;hpb=f12a942107a79783c574eb2d77aabab0c8b9bdbf;p=jalview.git

diff --git a/build-site.xml b/build-site.xml
index 5558f8e..29f2745 100644
--- a/build-site.xml
+++ b/build-site.xml
@@ -5,13 +5,13 @@
  - requires tools/ant-contrib.jar
   
  - creates the site/ directory if it does not exist
- - unzip libjs *.zip into site/swingjs/j2s
- - unzips SwingJS-site.zip into site/
- - copies non-java resources into site/swingjs/j2s
+ - 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">
 	
@@ -28,13 +28,16 @@
   	<!-- 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/ -->
+  	<!-- 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="j2s.dir" 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">
@@ -54,7 +57,7 @@
   	    <fileset dir="${libjs.dir}" includes="*.zip"/>
   	  </path>
   	  <sequential>
-  	  	 	<unzip src="@{file.zip}" dest="${site}" overwrite="true"/>  	
+  	  	 	<unzip src="@{file.zip}" dest="${site.dir}" overwrite="true"/>  	
   	  </sequential>
   	</for>
 
@@ -64,7 +67,7 @@
   	
   	-->
 
-  	<unzip src="${swingjs.zip}" dest="${site}/" overwrite="true"/>  	
+  	<unzip src="${swingjs.zip}" dest="${site.dir}/" overwrite="true"/>  	
 
  	<!-- transfer resources -->
 
@@ -75,6 +78,13 @@
   	</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>