JAL-3210 replacing j11lib/Jmol-14.29.17-no_netscape.jar with unsigned version. Tempor...

[jalview.git] / build-site.xml

diff --git a/build-site.xml b/build-site.xml
index edd9e5e..0cc062d 100644 (file)
--- 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,15 @@
        <!-- 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" />         
        
+       <!-- build_properties datastamp file to copy to site/swingjs/j2s -->
+    <property name="build_properties" value="classes/.build_properties" />     
+ 
+       <!-- non-Java resources to copy to site/ -->
+    <property name="site-resource.dir" value="site-resources" />       
+       
        <!-- output directories -->
 
        <property name="site.dir" value="site" />
@@ -72,6 +78,14 @@
        <copy todir="${j2s.dir}">
       <fileset dir="${resource.dir}">
        <include name="**"/>
+         </fileset>
+         <fileset file="${build_properties}"/> 
+    </copy>
+               
+       <echo> Copying ${site-resource.dir} files into ${site.dir} </echo>
+       <copy todir="${site.dir}">
+      <fileset dir="${site-resource.dir}">
+       <include name="**"/>
        </fileset>
     </copy>