Show
Ignore:
Timestamp:
04.12.2009 16:48:11 (10 years ago)
Author:
xiao
Message:

changed FLAX targets to use system svn client instead of svnant

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r21196 r21272  
    17211721    <mkdir dir="${basedir}/flax-resources"/> 
    17221722    <mkdir dir="${basedir}/flax-lib"/> 
    1723     <svn> 
    1724       <checkout url="${flax.checkout.path}/src/java/org/flax/"   
    1725         destPath="${basedir}/src/java/org/flax"/> 
    1726       <checkout url="${flax.checkout.path}/src/java/org/greenstone/gsdl3/flax/"  
    1727         destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
    1728       <checkout url="${flax.checkout.path}/web/WEB-INF/classes/flax/"  
    1729         destPath="${web.home}/WEB-INF/classes/flax"/> 
    1730       <checkout url="${flax.checkout.path}/web/interfaces/flax/"  
    1731         destPath="${web.home}/interfaces/flax"/> 
    1732       <checkout url="${flax.checkout.path}/web/interfaces/flaxmodule/"  
    1733         destPath="${web.home}/interfaces/flaxmodule"/> 
    1734       <checkout url="${flax.checkout.path}/web/sites/flax/"  
    1735         destPath="${web.home}/sites/flax"/> 
    1736       <checkout url="${flax.checkout.path}/flax-resources" 
    1737         destPath="${basedir}/flax-resources"/> 
    1738       <checkout url="${flax.checkout.path}/lib" 
    1739         destPath="${basedir}/flax-lib"/> 
    1740     </svn> 
    1741     <echo>prepare flax files...</echo> 
     1723    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/flax"/>  
     1724      <arg value="src/java/org/flax"/></exec>  
     1725    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/greenstone/gsdl3/flax"/>  
     1726      <arg value="src/java/org/greenstone/gsdl3/flax"/></exec>  
     1727    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/WEB-INF/classes/flax"/>  
     1728      <arg value="${web.home}/WEB-INF/classes/flax"/></exec>  
     1729    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/interfaces/flax"/>  
     1730      <arg value="${web.home}/interfaces/flax"/></exec>  
     1731    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/interfaces/flaxmodule"/>  
     1732      <arg value="${web.home}/interfaces/flaxmodule"/></exec>  
     1733    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/sites/flax"/>  
     1734      <arg value="${web.home}/sites/flax"/></exec>  
     1735    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/flax-resources"/>  
     1736      <arg value="flax-resources"/></exec>  
     1737    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/lib"/>  
     1738      <arg value="flax-lib"/></exec>  
    17421739    <move file="${web.home}/WEB-INF/web.xml" tofile="${web.home}/WEB-INF/web.xml.greenstone3backup"/> 
    17431740    <antcall target="flax-copy-files" /> 
     
    17461743  <target name="update-flax" description="update flax from repository"> 
    17471744    <echo>updating flax ...</echo> 
    1748     <svn> 
    1749       <update dir="${basedir}/src/java/org/flax"/> 
    1750       <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
    1751       <update dir="${web.home}/WEB-INF/classes/flax"/> 
    1752       <update dir="${web.home}/interfaces/flax"/> 
    1753       <update dir="${web.home}/interfaces/flaxmodule"/> 
    1754       <update dir="${web.home}/sites/flax"/> 
    1755     </svn> 
     1745    <exec executable="svn"><arg value="update"/> 
     1746      <arg value="src/java/org/flax"/></exec>  
     1747    <exec executable="svn"><arg value="update"/> 
     1748      <arg value="src/java/org/greenstone/gsdl3/flax"/></exec>  
     1749    <exec executable="svn"><arg value="update"/> 
     1750      <arg value="${web.home}/WEB-INF/classes/flax"/></exec>  
     1751    <exec executable="svn"><arg value="update"/> 
     1752      <arg value="${web.home}/interfaces/flax"/></exec>  
     1753    <exec executable="svn"><arg value="update"/> 
     1754      <arg value="${web.home}/interfaces/flaxmodule"/></exec>  
     1755    <exec executable="svn"><arg value="update"/> 
     1756      <arg value="${web.home}/sites/flax"/></exec>  
     1757    <exec executable="svn"><arg value="update"/> 
     1758      <arg value="flax-resources"/></exec>  
     1759    <exec executable="svn"><arg value="update"/> 
     1760      <arg value="flax-lib"/></exec>  
    17561761    <antcall target="flax-copy-files" /> 
    17571762  </target>