Changeset 15098


Ignore:
Timestamp:
2008-03-20T15:46:31+13:00 (15 years ago)
Author:
oranfry
Message:

when running 'ant update' on a greenstone3 installtion, perform svn updates instead of checkouts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • greenstone3/trunk/build.xml

    r15078 r15098  
    10521052  <target name="svnupdate-gs2building" if="collection.building.enabled" depends="init,svnupdate-gs2build,svnupdate-gli" unless="nocvs.mode">
    10531053  </target>
     1054
    10541055  <target name="svnupdate-gs2build" if="collection.building.enabled" depends="init" unless="nocvs.mode">
    1055     <!-- Note: can't do a -d update here cos it will get all of gsdl
    1056      also, an update doesn't get new files, so we do a checkout instead. -->
    1057         <antcall target="checkout-gs2build"/>
     1056        <!-- please keep this function in sync with checkout-gs2build -->
     1057
     1058        <echo>updating gs2build</echo>
     1059        <!-- svn updates -->
     1060        <svn>
     1061            <!-- perllib -->
     1062            <update dir="gs2build/perllib" revision="${branch.revision}"/>
     1063
     1064            <!-- selected packages -->
     1065            <update dir="gs2build/packages/cpan" revision="${branch.revision}" />
     1066            <update dir="gs2build/packages/expat" revision="${branch.revision}" />
     1067            <update dir="gs2build/packages/html-tidy" revision="${branch.revision}" />
     1068            <update dir="gs2build/packages/isis-gdl" revision="${branch.revision}" />
     1069            <update dir="gs2build/packages/kea" revision="${branch.revision}" />
     1070            <update dir="gs2build/packages/pdftohtml" revision="${branch.revision}" />
     1071            <update dir="gs2build/packages/rtftohtml" revision="${branch.revision}" />
     1072            <update dir="gs2build/packages/w3mir" revision="${branch.revision}" />
     1073            <update dir="gs2build/packages/wget" revision="${branch.revision}" />
     1074            <update dir="gs2build/packages/windows" revision="${branch.revision}" />
     1075            <update dir="gs2build/packages/wv" revision="${branch.revision}" />
     1076            <update dir="gs2build/packages/xlhtml" revision="${branch.revision}" />
     1077            <update dir="gs2build/packages/yaz" revision="${branch.revision}" />
     1078           
     1079            <!-- some of src (db2txt hashfile phind txt2db) -->
     1080            <update dir="gs2build/src/db2txt" revision="${branch.revision}" />
     1081            <update dir="gs2build/src/hashfile" revision="${branch.revision}" />
     1082            <update dir="gs2build/src/phind" revision="${branch.revision}" />
     1083            <update dir="gs2build/src/txt2db" revision="${branch.revision}" />
     1084
     1085            <!-- bin -->
     1086            <update dir="gs2build/bin/script" revision="${branch.revision}" />
     1087
     1088            <!-- mappings -->
     1089            <update dir="gs2build/mappings" revision="${branch.revision}"/>
     1090
     1091            <!-- etc/packages -->
     1092            <update dir="gs2build/etc/packages" revision="${branch.revision}"/>
     1093   
     1094            <!-- collect -->
     1095            <update dir="gs2build/collect/modelcol" revision="${branch.revision}"/>
     1096
     1097            <!-- gs2build-extra -->
     1098            <update dir="gs2build/gs2build-extra" revision="${branch.revision}"/>
     1099
     1100            <!-- indexers -->
     1101            <update dir="gs2build/indexers" revision="${branch.revision}"/>
     1102
     1103            <!-- single files -->
     1104           
     1105            <!-- some files from lib -->
     1106            <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
     1107            <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
     1108            <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
     1109
     1110            <!-- some files from etc -->
     1111            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
     1112            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
     1113            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
     1114            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
     1115
     1116            <!-- some files from the gsdl root directory -->
     1117            <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
     1118            <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
     1119            <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
     1120            <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
     1121            <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
     1122            <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
     1123            <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
     1124            <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
     1125            <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
     1126        </svn>
     1127
    10581128  </target>
    10591129 
    10601130  <target name="svnupdate-gli" if="collection.building.enabled" depends="init" unless="nocvs.mode">
    10611131    <svn>
    1062         <update dir="${gli.home}"/>
     1132        <update dir="${gli.home}" revision="${branch.revision}"/>
    10631133    </svn>
    10641134  </target>
    … …  
    10671137  </target>
    10681138
    1069   <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode">
    1070     <echo>checking out gs2build</echo>
    1071        
     1139    <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode">
     1140        <!-- please keep this function in sync with update-gs2build -->
     1141        <echo>checking out gs2build</echo>
     1142
    10721143        <!-- this has to be created first to avoid errors when trying to export to it later -->
    10731144        <mkdir dir="${basedir}/gs2build/lib"/>
    … …  
    11411212            <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
    11421213        </svn>
     1214
    11431215    </target>
    11441216
Note: See TracChangeset for help on using the changeset viewer.