X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build-site.xml;h=29f2745a1fe102cd1f228ee7f6693958ae00c212;hb=refs%2Fheads%2FJalview-JS%2F20190123;hp=edd9e5e269a15bb1ddc3ab4dd81df0c9ddb02eb1;hpb=44064f3839f908bab8c881acd282440187180e3f;p=jalview.git

diff --git a/build-site.xml b/build-site.xml
index edd9e5e..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,9 +28,12 @@
   	<!-- 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.dir" value="site" />
@@ -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>