Changeset 15078

Show
Ignore:
Timestamp:
10.03.2008 16:08:40 (11 years ago)
Author:
shaoqun
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r15050 r15078  
    14381438    <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/> 
    14391439    <antcall target="flax-copy-files" /> 
    1440  
    1441     <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/> 
    1442     <unzip dest="${coll.dir}">   
    1443        <fileset dir="${coll.dir}"> 
    1444           <include name="*.zip"/> 
    1445        </fileset>     
    1446     </unzip>     
    1447     <delete> 
    1448      <fileset dir="${coll.dir}" includes="*.zip"/> 
    1449     </delete> 
    1450   </target> 
     1440    <antcall target="unzip-flax-collections" /> 
     1441   </target> 
    14511442 
    14521443  <target name="update-flax" description="update flax from repository"> 
     
    14581449        <update dir="${basedir}/web/interfaces/flax"/> 
    14591450        <update dir="${basedir}/web/sites/flax"/> 
    1460         <svncall target="flax-copy-files" /> 
    14611451      </svn> 
     1452     <antcall target="flax-copy-files" /> 
     1453    <antcall target="unzip-flax-collections" />        
    14621454   </target> 
    14631455 
     1456   <target name="unzip-flax-collections" > 
     1457    <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/> 
     1458    <unzip dest="${coll.dir}">   
     1459      <fileset dir="${coll.dir}"> 
     1460    <include name="*.zip"/> 
     1461       </fileset>     
     1462    </unzip>     
     1463    <delete> 
     1464      <fileset dir="${coll.dir}" includes="*.zip"/> 
     1465    </delete> 
     1466  </target> 
     1467    
    14641468   <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories"> 
    14651469      <echo>copying flax files ...</echo>