Changeset 15809

Show
Ignore:
Timestamp:
29.05.2008 16:45:10 (11 years ago)
Author:
oranfry
Message:

properly houour the branch.revision property

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r15799 r15809  
    659659  <target name="svnupdate-web" unless="nosvn.mode"> 
    660660    <svn> 
    661       <update dir="${web.home}"/> 
     661      <update dir="${web.home}" revision="${branch.revision}"/> 
    662662    </svn> 
    663663  </target> 
     
    956956    <!-- just get rid of empty directories--> 
    957957    <svn> 
    958       <update dir="."/> 
     958      <update dir="."  revision="${branch.revision}"/> 
    959959    </svn> 
    960960  </target> 
     
    968968 
    969969    <svn> 
    970       <update dir="." recurse="false"/> 
     970      <update dir="." recurse="false" revision="${branch.revision}"/> 
    971971    </svn> 
    972972 
    973973    <svn> 
    974       <update dir="bin"/> 
    975       <update dir="comms"/> 
    976       <update dir="dist-resources"/> 
    977       <update dir="docs"/> 
    978       <update dir="lib"/> 
    979       <update dir="resources"/> 
    980       <update dir="src"/> 
    981       <update dir="winutil"/> 
     974      <update dir="bin" revision="${branch.revision}"/> 
     975      <update dir="comms" revision="${branch.revision}"/> 
     976      <update dir="dist-resources" revision="${branch.revision}"/> 
     977      <update dir="docs" revision="${branch.revision}"/> 
     978      <update dir="lib" revision="${branch.revision}"/> 
     979      <update dir="resources" revision="${branch.revision}"/> 
     980      <update dir="src" revision="${branch.revision}"/> 
     981      <update dir="winutil" revision="${branch.revision}"/> 
    982982    </svn> 
    983983 
     
    10871087  <target name="svnupdate-packages" unless="nosvn.mode">  
    10881088    <svn> 
    1089       <update dir="${src.packages.home}"/> 
     1089      <update dir="${src.packages.home}" revision="${branch.revision}"/> 
    10901090    </svn> 
    10911091  </target> 
     
    13001300       
    13011301      <!-- some files from lib --> 
    1302       <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/> 
    1303       <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/> 
    1304       <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/> 
     1302      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h" revision="${branch.revision}"/> 
     1303      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp" revision="${branch.revision}"/> 
     1304      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h" revision="${branch.revision}"/> 
    13051305 
    13061306      <!-- some files from etc --> 
    1307       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/> 
    1308       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/> 
    1309       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/> 
    1310       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/> 
     1307      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt" revision="${branch.revision}"/> 
     1308      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml" revision="${branch.revision}"/> 
     1309      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl" revision="${branch.revision}"/> 
     1310      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml" revision="${branch.revision}"/> 
    13111311 
    13121312      <!-- some files from the gsdl root directory --> 
    1313       <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/> 
    1314       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/> 
    1315       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/> 
    1316       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/> 
    1317       <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/> 
    1318       <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/> 
    1319       <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/> 
    1320       <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/> 
    1321       <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/> 
     1313      <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash" revision="${branch.revision}"/> 
     1314      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub" revision="${branch.revision}"/> 
     1315      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess" revision="${branch.revision}"/> 
     1316      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in" revision="${branch.revision}"/> 
     1317      <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl" revision="${branch.revision}"/> 
     1318      <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh" revision="${branch.revision}"/> 
     1319      <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h" revision="${branch.revision}"/> 
     1320      <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4" revision="${branch.revision}"/> 
     1321      <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h" revision="${branch.revision}"/> 
    13221322    </svn> 
    13231323  </target> 
     
    13851385       
    13861386      <!-- some files from lib --> 
    1387       <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/> 
    1388       <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/> 
    1389       <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/> 
     1387      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h" revision="${branch.revision}"/> 
     1388      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp" revision="${branch.revision}"/> 
     1389      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h" revision="${branch.revision}"/> 
    13901390 
    13911391      <!-- some files from etc --> 
    1392       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/> 
    1393       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/> 
    1394       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/> 
    1395       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/> 
     1392      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt" revision="${branch.revision}"/> 
     1393      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml" revision="${branch.revision}"/> 
     1394      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl" revision="${branch.revision}"/> 
     1395      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml" revision="${branch.revision}"/> 
    13961396 
    13971397      <!-- some files from the gsdl root directory --> 
    1398       <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/> 
    1399       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/> 
    1400       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/> 
    1401       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/> 
    1402       <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/> 
    1403       <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/> 
    1404       <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/> 
    1405       <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/> 
    1406       <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/> 
     1398      <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash" revision="${branch.revision}"/> 
     1399      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub" revision="${branch.revision}"/> 
     1400      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess" revision="${branch.revision}"/> 
     1401      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in" revision="${branch.revision}"/> 
     1402      <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl" revision="${branch.revision}"/> 
     1403      <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh" revision="${branch.revision}"/> 
     1404      <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h" revision="${branch.revision}"/> 
     1405      <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4" revision="${branch.revision}"/> 
     1406      <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h" revision="${branch.revision}"/> 
    14071407    </svn> 
    14081408  </target> 
     
    14271427  <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nosvn.mode"> 
    14281428    <svn> 
    1429       <update dir="winbin"/> 
     1429      <update dir="winbin" revision="${branch.revision}"/> 
    14301430    </svn>   
    14311431  </target>