Changeset 15078

Timestamp:

2008-03-10T16:08:40+13:00 (16 years ago)

Author:

shaoqun

Message:

add a unzip-flax-collections target and use it in flax-update

File:

• greenstone3/trunk/build.xml (modified) (2 diffs)

greenstone3/trunk/build.xml

@@ -1438 +1438 @@
     <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/>
     <antcall target="flax-copy-files" />
-
-    <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/>
-    <unzip dest="${coll.dir}">  
-       <fileset dir="${coll.dir}">
-          <include name="*.zip"/>
-       </fileset>    
-    </unzip>    
-    <delete>
-     <fileset dir="${coll.dir}" includes="*.zip"/>
-    </delete>
-  </target>
+    <antcall target="unzip-flax-collections" />
+   </target>
 
   <target name="update-flax" description="update flax from repository">
@@ -1458 +1449 @@
         <update dir="${basedir}/web/interfaces/flax"/>
         <update dir="${basedir}/web/sites/flax"/>
-        <svncall target="flax-copy-files" />
       </svn>
+     <antcall target="flax-copy-files" />
+    <antcall target="unzip-flax-collections" />       
    </target>
 
+   <target name="unzip-flax-collections" >
+    <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/>
+    <unzip dest="${coll.dir}">  
+      <fileset dir="${coll.dir}">
+    <include name="*.zip"/>
+       </fileset>    
+    </unzip>    
+    <delete>
+      <fileset dir="${coll.dir}" includes="*.zip"/>
+    </delete>
+  </target>
+   
    <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories">
       <echo>copying flax files ...</echo>