Changeset 20930

Show
Ignore:
Timestamp:
11.11.2009 14:01:44 (10 years ago)
Author:
oranfry
Message:

use the system svn client instead of svnant

Location:
greenstone3/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r20839 r20930  
    701701 
    702702  <target name="svnupdate-web" unless="nosvn.mode"> 
    703     <svn> 
    704       <update dir="${web.home}" revision="${branch.revision}"/> 
    705     </svn> 
     703    <exec executable="svn"> 
     704      <arg value="update"/> 
     705      <arg value="${web.home}"/> 
     706      <arg value="-r"/><arg value="${branch.revision}"/> 
     707    </exec> 
    706708  </target> 
    707709 
     
    10651067   
    10661068  <target name="svnupdate-core" unless="nosvn.mode"> 
    1067     <svn> 
    1068       <update dir="." revision="${branch.revision}"/> 
    1069     </svn> 
     1069    <exec executable="svn"> 
     1070      <arg value="update"/> 
     1071      <arg value="${basedir}"/> 
     1072      <arg value="-r"/><arg value="${branch.revision}"/> 
     1073    </exec> 
    10701074  </target> 
    10711075 
     
    11711175 
    11721176  <target name="svnupdate-packages" unless="nosvn.mode">  
    1173     <svn> 
    1174       <update dir="${src.packages.home}" revision="${branch.revision}"/> 
    1175     </svn> 
     1177    <exec executable="svn"> 
     1178      <arg value="update"/> 
     1179      <arg value="${src.packages.home}"/> 
     1180      <arg value="-r"/><arg value="${branch.revision}"/> 
     1181    </exec> 
    11761182  </target> 
    11771183 
     
    13111317 
    13121318  <target name="svnupdate-common-src" depends="init" if="collection.building.disabled" unless="nosvn.mode"> 
    1313     <svn> 
    1314       <update dir="${common.src.home}" revision="${branch.revision}"/> 
    1315     </svn>     
     1319    <exec executable="svn"> 
     1320      <arg value="update"/> 
     1321      <arg value="${common.src.home}"/> 
     1322      <arg value="-r"/><arg value="${branch.revision}"/> 
     1323    </exec> 
    13161324  </target> 
    13171325 
     
    13231331  <target name="checkout-common-src" depends="init" if="collection.building.disabled" unless="nosvn.mode"> 
    13241332    <echo>checking out common-src</echo> 
    1325     <svn> 
    1326       <checkout url="${svn.root}/gsdl/trunk/common-src" destPath="common-src" revision="${branch.revision}"/> 
    1327     </svn> 
     1333    <exec executable="svn"> 
     1334      <arg value="checkout"/> 
     1335      <arg value="${svn.root}/gsdl/trunk/common-src"/> 
     1336            <arg value="common-src"/> 
     1337      <arg value="-r"/><arg value="${branch.revision}"/> 
     1338    </exec> 
    13281339  </target> 
    13291340     
     
    14331444  <!-- ============== gli targets ================================= --> 
    14341445  <target name="svnupdate-gli" if="collection.building.enabled" depends="init" unless="nosvn.mode"> 
    1435     <svn> 
    1436       <update dir="${gli.home}" revision="${branch.revision}"/> 
    1437  
    1438       <!-- some files from cgi-bin: necessary for remote GLI server  -->  
    1439       <export srcUrl="${svn.root}/gsdl/${branch.path}/cgi-bin/gliserver.pl" destPath="${web.home}/WEB-INF/cgi/gliserver.pl" revision="${branch.revision}"/>   
    1440       <export srcUrl="${svn.root}/gsdl/${branch.path}/cgi-bin/gsdlCGI.pm" destPath="${web.home}/WEB-INF/cgi/gsdlCGI.pm" revision="${branch.revision}"/> 
    1441     </svn> 
     1446 
     1447    <exec executable="svn"> 
     1448      <arg value="update"/> 
     1449      <arg value="${gli.home}"/> 
     1450      <arg value="-r"/><arg value="${branch.revision}"/> 
     1451    </exec> 
     1452 
     1453    <exec executable="svn"> 
     1454      <arg value="export"/> 
     1455      <arg value="${svn.root}/gsdl/${branch.path}/cgi-bin/gliserver.pl"/> 
     1456      <arg value="${svn.root}/gsdl/${branch.path}/cgi-bin/gsdlCGI.pm"/> 
     1457      <arg value="-r"/><arg value="${branch.revision}"/> 
     1458    </exec> 
     1459 
    14421460  </target> 
    14431461 
     
    14451463    <!-- checkout --> 
    14461464    <if><bool><not><istrue value="${nosvn.mode}"/></not></bool> 
    1447       <svn> 
    1448         <checkout url="${svn.root}/gli/${branch.path}" destPath="gli" revision="${branch.revision}"/> 
    1449  
    1450     <!-- some files from cgi-bin: necessary for remote GLI server  -->  
    1451     <export srcUrl="${svn.root}/gsdl/${branch.path}/cgi-bin/gliserver.pl" destPath="${web.home}/WEB-INF/cgi/gliserver.pl" revision="${branch.revision}"/>   
    1452     <export srcUrl="${svn.root}/gsdl/${branch.path}/cgi-bin/gsdlCGI.pm" destPath="${web.home}/WEB-INF/cgi/gsdlCGI.pm" revision="${branch.revision}"/> 
    1453       </svn> 
     1465 
     1466    <exec executable="svn"> 
     1467      <arg value="checkout"/> 
     1468      <arg value="${gli.home}"/> 
     1469      <arg value="-r"/><arg value="${branch.revision}"/> 
     1470    </exec> 
     1471 
     1472    <exec executable="svn"> 
     1473      <arg value="export"/> 
     1474      <arg value="${svn.root}/gsdl/${branch.path}/cgi-bin/gliserver.pl"/> 
     1475      <arg value="${svn.root}/gsdl/${branch.path}/cgi-bin/gsdlCGI.pm"/> 
     1476      <arg value="-r"/><arg value="${branch.revision}"/> 
     1477    </exec> 
     1478 
    14541479    </if> 
    14551480  </target> 
     
    15051530  <target name="svnupdate-gs2build" if="collection.building.enabled" depends="init" unless="nosvn.mode"> 
    15061531    <echo>svn updating gs2build</echo> 
    1507     <svn> 
    1508       <update dir="{gs2build.home}" revision="${branch.revision}"/> 
    1509     </svn> 
     1532    <exec executable="svn"> 
     1533      <arg value="update"/> 
     1534      <arg value="${gs2build.home}"/> 
     1535      <arg value="-r"/><arg value="${branch.revision}"/> 
     1536    </exec> 
    15101537  </target> 
    15111538     
     
    15201547  <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nosvn.mode"> 
    15211548    <echo>checking out gs2build</echo> 
    1522     <svn> 
    1523       <checkout url="${svn.root}/gs2build" destPath="gs2build" revision="${branch.revision}"/> 
    1524     </svn> 
     1549    <exec executable="svn"> 
     1550      <arg value="checkout"/> 
     1551      <arg value="${svn.root}/gs2build"/> 
     1552      <arg value="-r"/><arg value="${branch.revision}"/> 
     1553    </exec> 
     1554 
    15251555  </target> 
    15261556 
    15271557  <target name="checkout-winbin" depends="init" if="current.os.iswindows"  
    15281558    unless="nosvn.mode"> 
    1529     <svn> 
    1530       <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/> 
    1531     </svn> 
     1559 
     1560    <exec executable="svn"> 
     1561      <arg value="checkout"/> 
     1562      <arg value="${svn.root}/other-projects/trunk/winbin"/> 
     1563      <arg value="-r"/><arg value="${branch.revision}"/> 
     1564    </exec> 
     1565 
    15321566  </target> 
    15331567 
    15341568  <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nosvn.mode"> 
    1535     <svn> 
    1536       <update dir="winbin" revision="${branch.revision}"/> 
    1537     </svn> 
     1569    <exec executable="svn"> 
     1570      <arg value="update"/> 
     1571      <arg value="winbin"/> 
     1572      <arg value="-r"/><arg value="${branch.revision}"/> 
     1573    </exec> 
     1574 
    15381575  </target> 
    15391576   
     
    16741711    <mkdir dir="${basedir}/flax-resources"/> 
    16751712    <mkdir dir="${basedir}/flax-lib"/> 
    1676     <svn> 
    1677       <checkout url="${flax.checkout.path}/src/java/org/flax/"   
    1678         destPath="${basedir}/src/java/org/flax"/> 
    1679       <checkout url="${flax.checkout.path}/src/java/org/greenstone/gsdl3/flax/"  
    1680         destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
    1681       <checkout url="${flax.checkout.path}/web/WEB-INF/classes/flax/"  
    1682         destPath="${web.home}/WEB-INF/classes/flax"/> 
    1683       <checkout url="${flax.checkout.path}/web/interfaces/flax/"  
    1684         destPath="${web.home}/interfaces/flax"/> 
    1685       <checkout url="${flax.checkout.path}/web/interfaces/flaxmodule/"  
    1686         destPath="${web.home}/interfaces/flaxmodule"/> 
    1687       <checkout url="${flax.checkout.path}/web/sites/flax/"  
    1688         destPath="${web.home}/sites/flax"/> 
    1689       <checkout url="${flax.checkout.path}/flax-resources" 
    1690         destPath="${basedir}/flax-resources"/> 
    1691       <checkout url="${flax.checkout.path}/lib" 
    1692         destPath="${basedir}/flax-lib"/> 
    1693     </svn> 
     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 
    16941731    <echo>prepare flax files...</echo> 
    16951732    <move file="${web.home}/WEB-INF/web.xml" tofile="${web.home}/WEB-INF/web.xml.greenstone3backup"/> 
     
    17001737  <target name="update-flax" description="update flax from repository"> 
    17011738    <echo>updating flax ...</echo> 
    1702     <svn> 
    1703       <update dir="${basedir}/src/java/org/flax"/> 
    1704       <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
     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/flax"/></exec> 
     1743    <exec executable="svn"><arg value="update"/><arg value="src/java/org/flax"/></exec> 
     1744    <exec executable="svn"><arg value="update"/><arg value="src/java/org/flax"/></exec> 
     1745       
     1746        <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
    17051747      <update dir="${web.home}/WEB-INF/classes/flax"/> 
    17061748      <update dir="${web.home}/interfaces/flax"/> 
  • greenstone3/trunk/resources/xml/components.xml

    r20061 r20930  
    44    <!-- source component - files that get compiled and could be safely removed from a binary distribution --> 
    55    <patternset id="greenstone3.source.component"> 
     6        <include name="gli/src"/> 
     7        <include name="gli/src/**/*"/> 
    68        <include name="src"/> 
    79        <include name="src/**/*"/>