Changeset 19871
- Timestamp:
- 2009-06-22T12:41:14+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
greenstone3/trunk/build.xml
r19843 r19871 62 62 <property name="src.packages.home" value="${basedir}/src/packages"/> 63 63 <!-- get rid of one of these --> 64 <property name="gdbm.home" value="${gs2build.home}/common-src/packages/gdbm"/>65 <property name="gdbm.installed.path" value="${gs2build.home}/common-src/packages/gdbm"/> 64 <!-- <property name="gdbm.home" value="${gs2build.home}/common-src/packages/gdbm"/> 65 <property name="gdbm.installed.path" value="${gs2build.home}/common-src/packages/gdbm"/> --> 66 66 <property name="flax.svn.root" value="http://svn.greenstone.org/flax"/> 67 67 <property file="build.properties"/> … … 160 160 </not> 161 161 </condition> 162 <condition property="collection.building.disabled"> 163 <isset property="disable.collection.building"/> 164 </condition> 162 165 163 166 <condition property="collection.building.enabled.windows"> … … 175 178 </condition> 176 179 177 <condition property="independent-indexers">180 <!-- <condition property="independent-indexers"> 178 181 <isset property="disable.collection.building"/> 179 </condition> 182 </condition>--> 180 183 181 184 <!-- where is search4j tool --> … … 187 190 188 191 <!-- ============= Base dirs for each package and component ============ --> 189 <property name="src.applet.home" value="${src.home}/org/greenstone/applet"/>192 <!-- <property name="src.applet.home" value="${src.home}/org/greenstone/applet"/>--> 190 193 <property name="src.gsdl3.home" value="${src.home}/org/greenstone/gsdl3"/> 191 194 <property name="anttasks.home" value="${src.home}/org/greenstone/anttasks"/> … … 193 196 <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/> 194 197 195 <condition property="indexers.home" value="${basedir}/src/packages/indexers">198 <!-- <condition property="indexers.home" value="${basedir}/src/packages/indexers"> 196 199 <isset property="disable.collection.building"/> 197 </condition> 198 <condition property="indexers.home" value="${gs2build.home}/common-src/indexers"> 200 </condition>--> 201 202 <!-- <condition property="indexers.home" value="${gs2build.home}/common-src/indexers"> 203 <not> 204 <isset property="disable.collection.building"/> 205 </not> 206 </condition>--> 207 208 <condition property="common.src.home" value="${gs2build.home}/common-src"> 199 209 <not> 200 210 <isset property="disable.collection.building"/> … … 202 212 </condition> 203 213 204 <property name="mg.home" value="${indexers.home}/mg"/> 205 <property name="mgpp.home" value="${indexers.home}/mgpp"/> 206 <property name="lucene.home" value="${indexers.home}/lucene-gs"/> 214 <condition property="common.src.home" value="${basedir}/common-src"> 215 <isset property="disable.collection.building"/> 216 </condition> 217 218 <property name="gdbm.home" value="${common.src.home}/packages/gdbm"/> 219 <property name="mg.home" value="${common.src.home}/indexers/mg"/> 220 <property name="mgpp.home" value="${common.src.home}/indexers/mgpp"/> 221 <property name="lucene.home" value="${common.src.home}/indexers/lucene-gs"/> 207 222 208 223 <!-- ==================== Compilation Control Options ==================== --> … … 316 331 </target> 317 332 318 <target name="new-install" depends="init,install-collection-building,install-runtime" 333 <!-- install-common-src and install-collection-building are mutually exclusive and either one or the other will be done depending on whether collection building is enabled or not --> 334 <target name="new-install" depends="init,install-common-src,install-collection-building,install-runtime" 319 335 description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare new-install'."/> 320 336 337 <target name="install-common-src" depends="init,configure-common-src,compile-common-src"/> 321 338 <target name="install-collection-building" depends="init,configure-collection-building,compile-collection-building"/> 322 339 <target name="install-runtime" depends="init,configure,configure-packages,configure-core,compile-web,compile-packages,compile-core"/> 323 340 324 341 325 <target name="install" depends="init,install-indexer-files,configure,configure-c++,compile" 342 <!-- <target name="install" depends="init,install-indexer-files,configure,configure-c++,compile" --> 343 <target name="install" depends="init,configure,configure-c++,compile" 326 344 description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/> 327 345 … … 1124 1142 <!-- these targets refer to the greenstone source packages - these need 1125 1143 updating less often, so are in separate targets to the core --> 1126 <target name="prepare-packages" depends="init ,prepare-indexers"/>1127 1128 <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nosvn.mode">1144 <target name="prepare-packages" depends="init"/> 1145 1146 <!-- <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nosvn.mode"> 1129 1147 <svn> 1130 1148 <checkout url="${svn.root}/indexers/${branch.path}" destPath="${src.packages.home}/indexers" revision="${branch.revision}"/> … … 1134 1152 <target name="prepare-indexers" depends="init" if="independent-indexers" unless="indexers.present"> 1135 1153 <antcall target="checkout-indexers"/> 1136 </target> 1154 </target> --> 1137 1155 1138 1156 <target name="update-packages" depends="init,svnupdate-packages,configure-packages,clean-packages,compile-packages" … … 1145 1163 </target> 1146 1164 1147 <target name="configure-packages" depends="init,configure-javagdbm,configure-indexers" 1165 <!-- <target name="configure-packages" depends="init,configure-javagdbm,configure-indexers" add common-src here instead.--> 1166 <target name="configure-packages" depends="init,configure-javagdbm" 1148 1167 description="Configure only the packages."/> 1149 1168 … … 1165 1184 Shouldn't they be configured when collection building is ENabled? --> 1166 1185 1167 <!-- <target name="configure-indexers" depends="init" if="independent-indexers"> -->1186 <!-- <target name="configure-indexers" depends="init" if="independent-indexers"> 1168 1187 <target name="configure-indexers" depends="init"> 1169 1188 <echo>Configuring Indexers</echo> 1170 1189 <exec executable="${indexers.home}/configure" os="${os.unix}" dir="${indexers.home}"> 1171 <arg value="- -prefix=${basedir}"/>1172 <arg value="- -libdir=${lib.jni}"/>1190 <arg value="- -prefix=${basedir}"/> 1191 <arg value="- -libdir=${lib.jni}"/> 1173 1192 </exec> 1174 </target> 1175 1176 <target name="clean-packages" depends="init,clean-javagdbm ,clean-indexers" description="Clean only the packages"/>1193 </target> --> 1194 1195 <target name="clean-packages" depends="init,clean-javagdbm" description="Clean only the packages"/> 1177 1196 1178 1197 <target name="clean-javagdbm" depends="init"> … … 1183 1202 </target> 1184 1203 1185 <target name="clean-indexers" depends="init" if="independent-indexers">1204 <!-- <target name="clean-indexers" depends="init" if="independent-indexers"> 1186 1205 <exec executable="make" os="${os.unix}" 1187 1206 dir="${indexers.home}"> … … 1192 1211 <arg value="clean"/> 1193 1212 </exec> 1194 </target> 1195 1196 <target name="distclean-packages" depends="init,distclean-javagdbm ,distclean-indexers" description="Distclean only the packages"/>1213 </target> --> 1214 1215 <target name="distclean-packages" depends="init,distclean-javagdbm" description="Distclean only the packages"/> 1197 1216 1198 1217 <target name="distclean-javagdbm" depends="init"> … … 1203 1222 </target> 1204 1223 1205 <target name="distclean-indexers" depends="init" if="independent-indexers">1224 <!-- <target name="distclean-indexers" depends="init" if="independent-indexers"> 1206 1225 <exec executable="make" os="${os.unix}" 1207 1226 dir="${indexers.home}"> … … 1212 1231 <arg value="clean"/> 1213 1232 </exec> 1214 </target> 1233 </target>--> 1215 1234 1216 1235 <target name="compile-packages" description="Compile only the source packages"> … … 1241 1260 1242 1261 <!-- this may be in gs2build - we will be recompiling, but never mind --> 1243 <echo>Indexers: make (from ${indexers.home})</echo>1262 <!-- <echo>Indexers: make (from ${indexers.home})</echo> 1244 1263 <exec executable="make" os="${os.unix}" dir="${indexers.home}"/> 1245 1264 <echo>Indexers: make install</echo> … … 1256 1275 <arg value="install"/> 1257 1276 </exec> 1258 1277 --> 1259 1278 <!-- install the jar and jni files --> 1260 <echo>Install the indexers' jar and jni files</echo>1279 <!-- <echo>Install the indexers' jar and jni files</echo> 1261 1280 <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/> 1262 1281 <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/> 1263 1282 <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/> 1264 <antcall target="install-jni-files"/> 1283 <antcall target="install-jni-files"/>--> 1265 1284 </target> 1266 1285 … … 1282 1301 </target> 1283 1302 1303 <target name="install-auxiliary-jar-files" depends="init"> 1304 <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/> 1305 <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/> 1306 <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/> 1307 </target> 1308 1284 1309 <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos"/> 1285 1310 … … 1309 1334 </target> 1310 1335 1336 <!-- ========common-src targets =================================--> 1337 <!-- these are used to get common-src (for indexers, gdbm, sqlite etc) when 1338 collection building is not enabled --> 1339 1340 <target name="update-common-src" depends="init" if="collection.building.disabled"> 1341 </target> 1342 <target name="svnupdate-common-src" depends="init" if="collection.building.disabled" unless="nosvn.mode"> 1343 <svn> 1344 <update dir="{common.src.home}" revision="${branch.revision}"/> 1345 </svn> 1346 </target> 1347 1348 <target name="prepare-common-src" depends="init" if="collection.building.disabled"> 1349 <antcall target="checkout-common-src"/> 1350 <antcall target="unzip-windows-packages"/> 1351 </target> 1352 1353 <target name="checkout-common-src" depends="init" if="collection.building.disabled" unless="nosvn.mode"> 1354 <echo>checking out common-src</echo> 1355 <svn> 1356 <checkout url="${svn.root}/gsdl/common-src" destPath="common-src" revision="${branch.revision}"/> 1357 </svn> 1358 </target> 1359 1360 <target name="configure-common-src" depends="init" if="collection.building.disabled"> 1361 <exec executable="${common.src.home}/configure" os="${os.unix}" 1362 dir="${common.src.home}"> 1363 <arg value="--prefix=${common.src.home}"/> <!-- ??? --> 1364 </exec> 1365 </target> 1366 1367 <target name="clean-common-src" depends="init" if="collection.building.disabled"> 1368 <!-- unix: --> 1369 <exec executable="make" os="${os.unix}" dir="${common.src.home}"> 1370 <arg value="clean"/> 1371 </exec> 1372 <!-- windows: --> 1373 <exec executable="nmake" dir="${common.src.home}" os="${os.windows}" > 1374 <arg value="/f"/> 1375 <arg value="win32.mak"/> 1376 <arg value="clean"/> 1377 </exec> 1378 </target> 1379 <target name="distclean-common-src" depends="init" if="collection.building.disabled"> 1380 <exec executable="make" os="${os.unix}" dir="${common.src.home}"> 1381 <arg value="distclean"/> 1382 </exec> 1383 </target> 1384 <target name="compile-common-src" depends="init" if="collection.building.disabled"> 1385 <!-- unix: --> 1386 <exec executable="make" os="${os.unix}" dir="${common.src.home}"> 1387 </exec> 1388 <exec executable="make" os="${os.unix}" dir="${common.src.home}"> 1389 <arg value="install"/> 1390 </exec> 1391 <!-- windows: --> 1392 <exec executable="nmake" dir="${common.src.home}" os="${os.windows}"> 1393 <arg value="/f"/> 1394 <arg value="win32.mak"/> 1395 </exec> 1396 <exec executable="nmake" dir="${common.src.home}" os="${os.windows}"> 1397 <arg value="/f"/> 1398 <arg value="win32.mak"/> 1399 <arg value="install"/> 1400 </exec> 1401 </target> 1402 1311 1403 <!-- ======= collection-building targets ===========================--> 1312 1404 1313 1405 <target name="update-collection-building" if="collection.building.enabled" 1314 depends="init,svnupdate-collection-building, rename-gs2build-files,configure-collection-building,clean-collection-building,compile-collection-building"1406 depends="init,svnupdate-collection-building,gs2build-edit-setup-bat,configure-collection-building,clean-collection-building,compile-collection-building" 1315 1407 description="Update (SVN update, configure, compile etc) only the collection building components"/> 1316 1408 … … 1393 1485 <exec executable="${basedir}/gli/gli.sh" os="${os.linux},${os.solaris}" dir="${basedir}/gli" spawn="true"> 1394 1486 <env key="gsdl3path" path="${basedir}"/> 1395 <env key="gsdlpath" path="${ basedir}/gs2build"/>1487 <env key="gsdlpath" path="${gs2build.home}"/> 1396 1488 </exec> 1397 1489 <exec executable="${basedir}/gli/gli.sh" os="${os.mac}" dir="${basedir}/gli" spawn="true"> 1398 1490 <env key="gsdl3path" path="${basedir}"/> 1399 <env key="gsdlpath" path="${ basedir}/gs2build"/>1491 <env key="gsdlpath" path="${gs2build.home}"/> 1400 1492 <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.installed.path}/lib"/> 1401 1493 </exec> 1402 1494 <exec executable="${basedir}/gli/gli.bat" os="${os.windows}" dir="${basedir}/gli" spawn="true"> 1403 1495 <env key="GSDL3PATH" path="${basedir}"/> 1404 <env key="GSDLPATH" path="${ basedir}/gs2build"/>1496 <env key="GSDLPATH" path="${gs2build.home}"/> 1405 1497 </exec> 1406 1498 <echo>Running GLI from Ant means that you don't get to see any of the terminal output. If you have problems with GLI and want to see the output, please run the script gli.sh/bat from the greenstone3/gli directory. … … 1423 1515 <antcall target="get-windows-binaries"/> 1424 1516 <antcall target="delete-winbin"/> 1425 < antcall target="get-macos-extra"/>1517 <!--<antcall target="get-macos-extra"/>--> 1426 1518 </target> 1427 1519 … … 1456 1548 </target> 1457 1549 1458 <target name="unzip-windows-packages" depends="init" if="c ollection.building.enabled.windows">1459 <unzip src="${ gs2build.home}/common-src/packages/windows/crypt/crypt.zip"1460 dest="${ gs2build.home}/common-src/packages/windows/crypt"/>1461 <unzip src="${ gs2build.home}/common-src/packages/windows/expat/expat.zip"1462 dest="${ gs2build.home}/common-src/packages/windows/expat"/>1550 <target name="unzip-windows-packages" depends="init" if="current.os.iswindows"> 1551 <unzip src="${common.src.home}/packages/windows/crypt/crypt.zip" 1552 dest="${common.src.home}/packages/windows/crypt"/> 1553 <unzip src="${common.src.home}/packages/windows/expat/expat.zip" 1554 dest="${common.src.home}/packages/windows/expat"/> 1463 1555 <untar compression="gzip" 1464 src="${gs2build.home}/common-src/packages/sqlite/${sqlite.targz.version}" 1465 dest="${gs2build.home}/common-src/packages/sqlite"/> 1466 <unzip src="${gs2build.home}/common-src/indexers/packages/windows/iconv/iconv.zip" 1467 dest="${gs2build.home}/common-src/indexers/packages/windows/iconv"/> 1468 </target> 1469 1470 <!-- downloads a good XML-Parser --> 1471 <target name="get-macos-extra" depends="init" if="need.macos.extra"> 1472 <!-- 1473 <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz" 1474 dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz" 1475 usetimestamp="true"/> 1476 --> 1477 <echo>Nothing extra currently needed for MacOS prepare</echo> 1478 </target> 1479 1480 <!-- untars the XML-Parser. need to do this after compiling in gs2build--> 1481 <target name="install-macos-extra" depends="init,get-macos-extra" if="need.macos.extra"> 1482 <!-- make sure these directories are present, otherwise chmod craps out 1483 this chmod is needed in case we are unpacking for a second time --> 1484 <!-- 1485 <mkdir dir="${gs2build.home}/perllib/cpan/perl-5.8"/> 1486 <mkdir dir="${gs2build.home}/perllib/cpan/perl-5.6"/> 1487 <chmod dir="${gs2build.home}/perllib/cpan/perl-5.8" perm="ug+w" includes="**"/> 1488 <chmod dir="${gs2build.home}/perllib/cpan/perl-5.6" perm="ug+w" includes="**"/> 1489 <untar src="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz" 1490 dest="${gs2build.home}/perllib/cpan/" 1491 compression="gzip"/> 1492 --> 1493 <echo>Nothing extra currently needed for MacOs install</echo> 1494 </target> 1495 1496 <target name="install-indexer-files" depends="init" unless="indexers.present"> 1556 src="${common.src.home}/packages/sqlite/${sqlite.targz.version}" 1557 dest="${common.src.home}/packages/sqlite"/> 1558 <unzip src="${common.src.home}/indexers/packages/windows/iconv/iconv.zip" 1559 dest="${common.src.home}/indexers/packages/windows/iconv"/> 1560 </target> 1561 1562 1563 <!-- <target name="install-indexer-files" depends="init" unless="indexers.present"> 1497 1564 <copy todir="${indexers.home}"> 1498 1565 <fileset dir="${gs2build.home}/common-src/indexers" /> 1499 1566 </copy> 1500 1567 <chmod file="${indexers.home}/configure" perm="a+x"/> 1501 </target> 1502 1503 <target name="rename-gs2build-files" depends="gs2build-edit-setup-bat" if="collection.building.enabled"/>1568 </target> --> 1569 1570 <!-- <target name="rename-gs2build-files" depends="gs2build-edit-setup-bat" if="collection.building.enabled"/>--> 1504 1571 1505 1572 <target name="gs2build-edit-setup-bat" if="collection.building.enabled.windows"> … … 1518 1585 1519 1586 <target name="clean-gs2build" depends="init" if="collection.building.enabled"> 1520 <!-- gs2build --> 1521 <!--linux: --> 1587 <!-- unix: --> 1522 1588 <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 1523 1589 <arg value="clean"/> 1524 1590 </exec> 1525 1591 <!-- windows: --> 1526 <!-- run the setup script -->1527 <!--<exec executable="${compile.windows.c++.setup}" os="${os.windows}" />-->1528 <!--Above does not work: even though vcvars.bat executes, the env changes it makes don't get saved. Need user to run vcvars.bat first before calling ant-->1529 1592 <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" > 1530 1593 <arg value="/f"/> … … 1535 1598 1536 1599 1537 <target name="distclean-gs2build" depends="init " if="collection.building.enabled">1600 <target name="distclean-gs2build" depends="init,clean-gs2build" if="collection.building.enabled"> 1538 1601 <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 1539 1602 <arg value="distclean"/> … … 1565 1628 <copy file="${lucene.home}/LuceneWrapper.jar" todir="${gs2build.home}/bin/java"/> 1566 1629 <antcall target="install-gs2build-indexers-windows"/> 1567 < antcall target="install-macos-extra"/>1630 <!--<antcall target="install-macos-extra"/>--> 1568 1631 </target> 1569 1632
Note:
See TracChangeset
for help on using the changeset viewer.