Changeset 20963

Show
Ignore:
Timestamp:
23.11.2009 12:21:42 (10 years ago)
Author:
xiao
Message:

Modified flax targets to use svn checkout commands again

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r20950 r20963  
    17111711    <mkdir dir="${basedir}/flax-resources"/> 
    17121712    <mkdir dir="${basedir}/flax-lib"/> 
    1713  
    1714     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/flax"/> 
    1715       <arg value="src/java/org/flax"/></exec> 
    1716     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/greenstone/gsdl3/flax"/> 
    1717       <arg value="src/java/org/greenstone/gsdl3/flax"/></exec> 
    1718     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/WEB-INF/classes/flax"/> 
    1719       <arg value="${web.home}/WEB-INF/classes/flax"/></exec> 
    1720     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/interfaces/flax"/> 
    1721       <arg value="${web.home}/interfaces/flax"/></exec> 
    1722     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/interfaces/flaxmodule"/> 
    1723       <arg value="${web.home}/interfaces/flax"/></exec> 
    1724     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/sites/flax"/> 
    1725       <arg value="${web.home}/sites/flax"/></exec> 
    1726     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/flax-resources"/> 
    1727       <arg value="flax-resources"/></exec> 
    1728     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/lib"/> 
    1729       <arg value="flax-lib"/></exec> 
    1730  
     1713    <svn> 
     1714      <checkout url="${flax.checkout.path}/src/java/org/flax/"   
     1715        destPath="${basedir}/src/java/org/flax"/> 
     1716      <checkout url="${flax.checkout.path}/src/java/org/greenstone/gsdl3/flax/"  
     1717        destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
     1718      <checkout url="${flax.checkout.path}/web/WEB-INF/classes/flax/"  
     1719        destPath="${web.home}/WEB-INF/classes/flax"/> 
     1720      <checkout url="${flax.checkout.path}/web/interfaces/flax/"  
     1721        destPath="${web.home}/interfaces/flax"/> 
     1722      <checkout url="${flax.checkout.path}/web/interfaces/flaxmodule/"  
     1723        destPath="${web.home}/interfaces/flaxmodule"/> 
     1724      <checkout url="${flax.checkout.path}/web/sites/flax/"  
     1725        destPath="${web.home}/sites/flax"/> 
     1726      <checkout url="${flax.checkout.path}/flax-resources" 
     1727        destPath="${basedir}/flax-resources"/> 
     1728      <checkout url="${flax.checkout.path}/lib" 
     1729        destPath="${basedir}/flax-lib"/> 
     1730    </svn> 
    17311731    <echo>prepare flax files...</echo> 
    17321732    <move file="${web.home}/WEB-INF/web.xml" tofile="${web.home}/WEB-INF/web.xml.greenstone3backup"/> 
    17331733    <antcall target="flax-copy-files" /> 
    1734     <antcall target="unzip-flax-resources" /> 
    17351734  </target> 
    17361735 
    17371736  <target name="update-flax" description="update flax from repository"> 
    17381737    <echo>updating flax ...</echo> 
    1739     <exec executable="svn"><arg value="update"/><arg value="src/java/org/flax"/></exec> 
    1740  
    1741     <exec executable="svn"><arg value="update"/><arg value="src/java/org/flax"/></exec> 
    1742     <exec executable="svn"><arg value="update"/><arg value="src/java/org/greenstone/gsdl3/flax"/></exec> 
    1743     <exec executable="svn"><arg value="update"/><arg value="${web.home}/WEB-INF/classes/flax"/></exec> 
    1744     <exec executable="svn"><arg value="update"/><arg value="${web.home}/interfaces/flax"/></exec> 
    1745     <exec executable="svn"><arg value="update"/><arg value="${web.home}/sites/flax"/></exec> 
     1738    <svn> 
     1739      <update dir="${basedir}/src/java/org/flax"/> 
     1740      <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
     1741      <update dir="${web.home}/WEB-INF/classes/flax"/> 
     1742      <update dir="${web.home}/interfaces/flax"/> 
     1743      <update dir="${web.home}/interfaces/flaxmodule"/> 
     1744      <update dir="${web.home}/sites/flax"/> 
     1745    </svn> 
    17461746    <antcall target="flax-copy-files" /> 
    1747   </target> 
    1748  
    1749   <target name="unzip-flax-resources" > 
    1750     <property name="classes.dir" value="${web.home}/WEB-INF/classes/flax"/> 
    1751     <unzip dest="${classes.dir}">   
    1752       <fileset dir="${classes.dir}"> 
    1753         <include name="*.zip"/> 
    1754       </fileset>     
    1755     </unzip>     
    1756     <delete> 
    1757       <fileset dir="${classes.dir}" includes="*.zip"/> 
    1758     </delete> 
    17591747  </target> 
    17601748   
     
    17711759        </filterset>     
    17721760    </copy> 
    1773     <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" /> 
    17741761    <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${web.home}/WEB-INF/lib" overwrite="true" />     
    17751762    <copy todir="${web.home}/interfaces/flaxmodule/transform" overwrite="true"> 
     
    17771764    </copy> 
    17781765  </target> 
     1766 
    17791767 
    17801768  <target name="compile-javadocs">