Changeset 15048

Show
Ignore:
Timestamp:
05.03.2008 15:43:34 (11 years ago)
Author:
oranfry
Message:

changed all 'gets' from the repo to 'svn export's and introduced a branch.revision property which specifies the revision or the repository to get code from

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r15044 r15048  
    7979 
    8080 
    81   <!-- version number stuff --> 
    82  
    83   <!-- app.version defaults to trunk --> 
    84   <condition property="app.version" value="trunk"> 
    85     <not><isset property="app.version"/></not> 
    86   </condition> 
    87  
    88     <!-- determine the 'branch path' --> 
    89   <condition property="branch.path" value="trunk"> 
    90     <equals arg1="${app.version}" arg2="trunk" /> 
    91   </condition> 
    92   <condition property="branch.path" value="branches/${app.version}"> 
    93     <not><equals arg1="${app.version}" arg2="trunk" /></not> 
    94   </condition> 
    95  
    96  
     81  <!-- defaults - set these on the command line or in build.properties or they will take these default values--> 
     82  <property name="app.version" value="trunk"/> 
     83  <property name="branch.path" value="trunk"/> 
     84  <property name="branch.revision" value="HEAD"/> 
     85 
     86  <!--constants --> 
    9787  <property name="flax.svn.root" value="http://svn.greenstone.org/flax"/> 
    98  
    9988  <property name="svn.root" value="http://svn.greenstone.org"/> 
    100 <!--  <property name="cvs.root" value=":pserver:cvs_anon@cvs.scms.waikato.ac.nz:2402/usr/local/global-cvs/gsdl-src"/> --> 
     89 
     90  <!--  <property name="cvs.root" value=":pserver:cvs_anon@cvs.scms.waikato.ac.nz:2402/usr/local/global-cvs/gsdl-src"/> --> 
    10191  <!-- catalina home is set to tomcat basedir is already installed, otherwise 
    10292  use greenstone's tomcat --> 
     
    908898<!--  <target name="checkout-indexers" depends="check-svnroot,init" if="independent-indexers" unless="nocvs.mode"> --> 
    909899    <svn> 
    910         <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers"/> 
     900        <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers" revision="${branch.revision}"/> 
    911901    </svn> 
    912902  </target> 
     
    10821072        <svn> 
    10831073            <!-- perllib --> 
    1084             <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib"/> 
     1074            <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib" revision="${branch.revision}"/> 
    10851075 
    10861076            <!-- selected packages --> 
    1087             <checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan"/> 
    1088             <checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat"/> 
    1089             <checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy"/> 
    1090             <checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl"/> 
    1091             <checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea"/> 
    1092             <checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml"/> 
    1093             <checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml"/> 
    1094             <checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir"/> 
    1095             <checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget"/> 
    1096             <checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows"/> 
    1097             <checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv"/> 
    1098             <checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml"/> 
    1099             <checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz"/> 
     1077            <checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan" revision="${branch.revision}" /> 
     1078            <checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat" revision="${branch.revision}" /> 
     1079            <checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy" revision="${branch.revision}" /> 
     1080            <checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl" revision="${branch.revision}" /> 
     1081            <checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea" revision="${branch.revision}" /> 
     1082            <checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml" revision="${branch.revision}" /> 
     1083            <checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml" revision="${branch.revision}" /> 
     1084            <checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir" revision="${branch.revision}" /> 
     1085            <checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget" revision="${branch.revision}" /> 
     1086            <checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows" revision="${branch.revision}" /> 
     1087            <checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv" revision="${branch.revision}" /> 
     1088            <checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml" revision="${branch.revision}" /> 
     1089            <checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz" revision="${branch.revision}" /> 
    11001090             
    11011091            <!-- some of src (db2txt hashfile phind txt2db) --> 
    1102             <checkout url="${svn.root}/gsdl/${branch.path}/src/db2txt" destPath="gs2build/src/db2txt"/> 
    1103             <checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile"/> 
    1104             <checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind"/> 
    1105             <checkout url="${svn.root}/gsdl/${branch.path}/src/txt2db" destPath="gs2build/src/txt2db"/> 
     1092            <checkout url="${svn.root}/gsdl/${branch.path}/src/db2txt" destPath="gs2build/src/db2txt" revision="${branch.revision}" /> 
     1093            <checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile" revision="${branch.revision}" /> 
     1094            <checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind" revision="${branch.revision}" /> 
     1095            <checkout url="${svn.root}/gsdl/${branch.path}/src/txt2db" destPath="gs2build/src/txt2db" revision="${branch.revision}" /> 
    11061096 
    11071097            <!-- bin --> 
    1108             <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script"/> 
     1098            <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script" revision="${branch.revision}" /> 
    11091099 
    11101100            <!-- mappings --> 
    1111             <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings"/> 
     1101            <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings" revision="${branch.revision}"/> 
    11121102 
    11131103            <!-- etc/packages --> 
    1114             <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages"/> 
     1104            <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages" revision="${branch.revision}"/> 
    11151105     
    11161106            <!-- collect --> 
    1117             <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol"/> 
     1107            <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol" revision="${branch.revision}"/> 
    11181108 
    11191109            <!-- gs2build-extra --> 
    1120             <checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra"/> 
     1110            <checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra" revision="${branch.revision}"/> 
    11211111 
    11221112            <!-- indexers --> 
    1123             <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers"/> 
    1124  
    1125  
     1113            <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers" revision="${branch.revision}"/> 
     1114 
     1115            <!-- single files --> 
     1116             
     1117            <!-- some files from lib --> 
     1118            <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/> 
     1119            <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/> 
     1120            <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/> 
     1121 
     1122            <!-- some files from etc --> 
     1123            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/> 
     1124            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/> 
     1125            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/> 
     1126            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/> 
     1127 
     1128            <!-- some files from the gsdl root directory --> 
     1129            <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/> 
     1130            <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/> 
     1131            <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/> 
     1132            <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/> 
     1133            <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/> 
     1134            <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/> 
     1135            <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/> 
     1136            <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/> 
     1137            <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/> 
    11261138        </svn> 
    1127         <!-- regular downloads --> 
    1128  
    1129         <!-- some files from lib --> 
    1130         <mkdir dir="gs2build/lib"/> 
    1131         <get src="${svn.root}/gsdl/${branch.path}/lib/text_t.h" dest="gs2build/lib/text_t.h"/> 
    1132         <get src="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" dest="gs2build/lib/text_t.cpp"/> 
    1133         <get src="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" dest="gs2build/lib/gsdlconf.h"/> 
    1134  
    1135         <!-- some files from etc --> 
    1136         <get src="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" dest="gs2build/etc/marctodc.txt"/> 
    1137         <get src="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" dest="gs2build/etc/dc2marc-mapping.xml"/> 
    1138         <get src="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" dest="gs2build/etc/dc2marc.xsl"/> 
    1139         <get src="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" dest="gs2build/etc/qdc2marc-mapping.xml"/> 
    1140  
    1141         <!-- some files from the gsdl root directory --> 
    1142         <get src="${svn.root}/gsdl/${branch.path}/setup.bash" dest="gs2build/setup.bash"/> 
    1143         <get src="${svn.root}/gsdl/${branch.path}/config.sub" dest="gs2build/config.sub"/> 
    1144         <get src="${svn.root}/gsdl/${branch.path}/config.guess" dest="gs2build/config.guess"/> 
    1145         <get src="${svn.root}/gsdl/${branch.path}/config.h.in" dest="gs2build/config.h.in"/> 
    1146         <get src="${svn.root}/gsdl/${branch.path}/configtest.pl" dest="gs2build/configtest.pl"/> 
    1147         <get src="${svn.root}/gsdl/${branch.path}/install-sh" dest="gs2build/install-sh"/> 
    1148         <get src="${svn.root}/gsdl/${branch.path}/acconfig.h" dest="gs2build/acconfig.h"/> 
    1149         <get src="${svn.root}/gsdl/${branch.path}/aclocal.m4" dest="gs2build/aclocal.m4"/> 
    1150         <get src="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" dest="gs2build/WIN32cfg.h"/> 
    1151  
    11521139    </target> 
    11531140 
     
    11651152    unless="nocvs.mode"> 
    11661153    <svn> 
    1167         <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin"/> 
     1154        <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/> 
    11681155    </svn>   
    11691156  </target> 
     
    12621249    <echo>checking out gli</echo> 
    12631250    <svn> 
    1264         <checkout url="${svn.root}/gli/${branch.path}" destPath="gli"/> 
     1251        <checkout url="${svn.root}/gli/${branch.path}" destPath="gli" revision="${branch.revision}"/> 
    12651252    </svn> 
    12661253  </target>