Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into trialMerge

[jalview.git] / build-site.xml

diff --git a/build-site.xml b/build-site.xml
index 5558f8e..b2d88e2 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">
        
@@ -33,8 +33,8 @@
        
        <!-- 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 +54,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 +64,7 @@
        
        -->
 
-       <unzip src="${swingjs.zip}" dest="${site}/" overwrite="true"/>          
+       <unzip src="${swingjs.zip}" dest="${site.dir}/" overwrite="true"/>      
 
        <!-- transfer resources -->