greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16602

Show
Ignore:
Timestamp:
2008-07-30 22:21:50 (5 months ago)
Author:
davidb
Message:

Simplification of syntax needed to get gs2build

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • greenstone3/trunk/build.xml

    r16547 r16602  
    182182    <isset property="disable.collection.building"/> 
    183183  </condition> 
    184   <condition property="indexers.home" value="${gs2build.home}/indexers"> 
     184  <condition property="indexers.home" value="${gs2build.home}/common-src/indexers"> 
    185185    <not> 
    186186      <isset property="disable.collection.building"/> 
    …… 
    12481248    <svn> 
    12491249      <!-- perllib --> 
    1250       <update dir="gs2build/perllib" revision="${branch.revision}"/> 
    1251  
    1252                         <!-- selected packages --> 
    1253                         <update dir="gs2build/packages/cpan" revision="${branch.revision}" /> 
    1254                         <update dir="gs2build/packages/expat" revision="${branch.revision}" /> 
    1255                         <update dir="gs2build/packages/html-tidy" revision="${branch.revision}" /> 
    1256                         <update dir="gs2build/packages/isis-gdl" revision="${branch.revision}" /> 
    1257                         <update dir="gs2build/packages/kea" revision="${branch.revision}" /> 
    1258                         <update dir="gs2build/packages/pdftohtml" revision="${branch.revision}" /> 
    1259                         <update dir="gs2build/packages/rtftohtml" revision="${branch.revision}" /> 
    1260                         <update dir="gs2build/packages/w3mir" revision="${branch.revision}" /> 
    1261                         <update dir="gs2build/packages/wget" revision="${branch.revision}" /> 
    1262                         <update dir="gs2build/packages/windows" revision="${branch.revision}" /> 
    1263                         <update dir="gs2build/packages/wv" revision="${branch.revision}" /> 
    1264                         <update dir="gs2build/packages/xlhtml" revision="${branch.revision}" /> 
    1265                         <update dir="gs2build/packages/yaz" revision="${branch.revision}" /> 
    1266                          
    1267                         <!-- some of src (db2txt hashfile phind txt2db) --> 
    1268                         <update dir="gs2build/src/gdbmedit/db2txt" revision="${branch.revision}" /> 
    1269                         <update dir="gs2build/src/hashfile" revision="${branch.revision}" /> 
    1270                         <update dir="gs2build/src/phind" revision="${branch.revision}" /> 
    1271                         <update dir="gs2build/src/gdbmedit/txt2db" revision="${branch.revision}" /> 
    1272  
    1273       <!-- bin --> 
    1274       <update dir="gs2build/bin/script" revision="${branch.revision}" /> 
    1275  
    1276       <!-- mappings --> 
    1277       <update dir="gs2build/mappings" revision="${branch.revision}"/> 
    1278  
    1279       <!-- etc/packages --> 
    1280       <update dir="gs2build/etc/packages" revision="${branch.revision}"/> 
    1281        
    1282       <!-- collect --> 
    1283       <update dir="gs2build/collect/modelcol" revision="${branch.revision}"/> 
    1284  
    1285       <!-- gs2build-extra --> 
    1286       <update dir="gs2build/gs2build-extra" revision="${branch.revision}"/> 
    1287  
    1288       <!-- indexers --> 
    1289       <update dir="gs2build/indexers" revision="${branch.revision}"/> 
    1290  
    1291       <!-- single files --> 
    1292        
    1293       <!-- some files from lib --> 
    1294       <export srcUrl="${svn.root}/gsdl/${branch.path}/src/lib/text_t.h" destPath="gs2build/src/lib/text_t.h" revision="${branch.revision}"/> 
    1295       <export srcUrl="${svn.root}/gsdl/${branch.path}/src/lib/text_t.cpp" destPath="gs2build/src/lib/text_t.cpp" revision="${branch.revision}"/> 
    1296       <export srcUrl="${svn.root}/gsdl/${branch.path}/src/lib/gsdlconf.h" destPath="gs2build/src/lib/gsdlconf.h" revision="${branch.revision}"/> 
    1297  
    1298       <!-- some files from cgi-bin: necessary for remote GLI server  --> 
    1299       <export srcUrl="${svn.root}/gsdl/${branch.path}/cgi-bin/gliserver.pl" destPath="${web.home}/WEB-INF/cgi/gliserver.pl" revision="${branch.revision}"/> 
    1300       <export srcUrl="${svn.root}/gsdl/${branch.path}/cgi-bin/gsdlCGI.pm" destPath="${web.home}/WEB-INF/cgi/gsdlCGI.pm" revision="${branch.revision}"/> 
    1301  
    1302       <!-- some files from etc --> 
    1303       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt" revision="${branch.revision}"/> 
    1304       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml" revision="${branch.revision}"/> 
    1305       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl" revision="${branch.revision}"/> 
    1306       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml" revision="${branch.revision}"/> 
    1307       
    1308       <!-- some files from the gsdl root directory --> 
    1309       <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash" revision="${branch.revision}"/> 
    1310       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub" revision="${branch.revision}"/> 
    1311       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess" revision="${branch.revision}"/> 
    1312       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in" revision="${branch.revision}"/> 
    1313       <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl" revision="${branch.revision}"/> 
    1314       <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh" revision="${branch.revision}"/> 
    1315       <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h" revision="${branch.revision}"/> 
    1316       <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4" revision="${branch.revision}"/> 
    1317       <export srcUrl="${svn.root}/gsdl/${branch.path}/win32cfg.h" destPath="gs2build/win32cfg.h" revision="${branch.revision}"/> 
     1250      <update dir="gs2build" revision="${branch.revision}"/> 
    13181251    </svn> 
    13191252  </target> 
    …… 
    13371270    <svn> 
    13381271      <!-- perllib --> 
    1339       <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib" revision="${branch.revision}"/> 
    1340  
    1341                         <!-- selected packages --> 
    1342                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan" revision="${branch.revision}" /> 
    1343                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat" revision="${branch.revision}" /> 
    1344                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy" revision="${branch.revision}" /> 
    1345                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl" revision="${branch.revision}" /> 
    1346                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea" revision="${branch.revision}" /> 
    1347                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml" revision="${branch.revision}" /> 
    1348                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml" revision="${branch.revision}" /> 
    1349                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir" revision="${branch.revision}" /> 
    1350                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget" revision="${branch.revision}" /> 
    1351                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows" revision="${branch.revision}" /> 
    1352                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv" revision="${branch.revision}" /> 
    1353                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml" revision="${branch.revision}" /> 
    1354                         <checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz" revision="${branch.revision}" /> 
    1355                          
    1356                         <!-- some of src (db2txt hashfile phind txt2db) --> 
    1357                         <checkout url="${svn.root}/gsdl/${branch.path}/src/gdbmedit/db2txt" destPath="gs2build/src/gdbmedit/db2txt" revision="${branch.revision}" /> 
    1358                         <checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile" revision="${branch.revision}" /> 
    1359                         <checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind" revision="${branch.revision}" /> 
    1360                         <checkout url="${svn.root}/gsdl/${branch.path}/src/gdbmedit/txt2db" destPath="gs2build/src/gdbmedit/txt2db" revision="${branch.revision}" /> 
    1361  
    1362       <!-- bin --> 
    1363       <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script" revision="${branch.revision}" /> 
    1364  
    1365       <!-- mappings --> 
    1366       <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings" revision="${branch.revision}"/> 
    1367  
    1368       <!-- etc/packages --> 
    1369       <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages" revision="${branch.revision}"/> 
    1370        
    1371       <!-- collect --> 
    1372       <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol" revision="${branch.revision}"/> 
    1373  
    1374       <!-- gs2build-extra --> 
    1375       <checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra" revision="${branch.revision}"/> 
    1376  
    1377       <!-- indexers --> 
    1378       <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers" revision="${branch.revision}"/> 
    1379  
    1380       <!-- single files --> 
    1381        
    1382       <!-- some files from lib --> 
    1383       <export srcUrl="${svn.root}/gsdl/${branch.path}/src/lib/text_t.h" destPath="gs2build/src/lib/text_t.h" revision="${branch.revision}"/> 
    1384       <export srcUrl="${svn.root}/gsdl/${branch.path}/src/lib/text_t.cpp" destPath="gs2build/src/lib/text_t.cpp" revision="${branch.revision}"/> 
    1385       <export srcUrl="${svn.root}/gsdl/${branch.path}/src/lib/gsdlconf.h" destPath="gs2build/src/lib/gsdlconf.h" revision="${branch.revision}"/> 
    1386  
    1387       <!-- some files from etc --> 
    1388       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt" revision="${branch.revision}"/> 
    1389       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml" revision="${branch.revision}"/> 
    1390       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl" revision="${branch.revision}"/> 
    1391       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml" revision="${branch.revision}"/> 
    1392  
    1393        <!-- some files from cgi-bin: necessary for remote GLI server  --> 
    1394       <export srcUrl="${svn.root}/gsdl/${branch.path}/cgi-bin/gliserver.pl" destPath="${web.home}/WEB-INF/cgi/gliserver.pl" revision="${branch.revision}"/> 
    1395       <export srcUrl="${svn.root}/gsdl/${branch.path}/cgi-bin/gsdlCGI.pm" destPath="${web.home}/WEB-INF/cgi/gsdlCGI.pm" revision="${branch.revision}"/> 
    1396  
    1397  
    1398       <!-- some files from the gsdl root directory --> 
    1399       <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash" revision="${branch.revision}"/> 
    1400       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub" revision="${branch.revision}"/> 
    1401       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess" revision="${branch.revision}"/> 
    1402       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in" revision="${branch.revision}"/> 
    1403       <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl" revision="${branch.revision}"/> 
    1404       <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh" revision="${branch.revision}"/> 
    1405       <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h" revision="${branch.revision}"/> 
    1406       <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4" revision="${branch.revision}"/> 
    1407       <export srcUrl="${svn.root}/gsdl/${branch.path}/win32cfg.h" destPath="gs2build/win32cfg.h" revision="${branch.revision}"/> 
     1272      <checkout url="${svn.root}/gs2build" destPath="gs2build" revision="${branch.revision}"/> 
     1273 
    14081274    </svn> 
    14091275  </target> 
    …… 
    14111277  <target name="prepare-gs2build" depends="init" if="collection.building.enabled" unless="gs2build.present"> 
    14121278    <antcall target="checkout-gs2build"/> 
    1413     <antcall target="rename-gs2build-files"/> 
    14141279    <antcall target="unzip-windows-packages"/> 
    14151280    <antcall target="checkout-winbin"/>