Changeset 19904 for greenstone3/trunk/build.xml
- Timestamp:
- 2009-06-24T15:42:23+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
greenstone3/trunk/build.xml
r19903 r19904 330 330 <antcall target="compile-collection-building"/> 331 331 <antcall target="install-auxiliary-jar-files"/> 332 <antcall tar tget="install-jni-files"/>332 <antcall target="install-jni-files"/> 333 333 </target> 334 334 … … 1071 1071 </echo> 1072 1072 1073 <exec executable="${javagdbm.home}/configure" os="${os.unix}" dir="${javagdbm.home}" >1073 <exec executable="${javagdbm.home}/configure" os="${os.unix}" dir="${javagdbm.home}" failonerror="true"> 1074 1074 <arg value="--prefix=${basedir}"/> 1075 1075 <arg value="--libdir=${lib.jni}"/> … … 1082 1082 <target name="clean-javagdbm" depends="init"> 1083 1083 <exec executable="make" os="${os.unix}" 1084 dir="${javagdbm.home}" >1084 dir="${javagdbm.home}" failonerror="true"> 1085 1085 <arg value="clean"/> 1086 1086 </exec> … … 1091 1091 <target name="distclean-javagdbm" depends="init"> 1092 1092 <exec executable="make" os="${os.unix}" 1093 dir="${javagdbm.home}" >1093 dir="${javagdbm.home}" failonerror="true"> 1094 1094 <arg value="distclean"/> 1095 1095 </exec> … … 1100 1100 <!-- unix: --> 1101 1101 <echo>compile javagdbm</echo> 1102 <exec executable="make" os="${os.unix}" dir="${javagdbm.home}" />1103 <exec executable="make" os="${os.unix}" dir="${javagdbm.home}" >1102 <exec executable="make" os="${os.unix}" dir="${javagdbm.home}" failonerror="true"/> 1103 <exec executable="make" os="${os.unix}" dir="${javagdbm.home}" failonerror="true"> 1104 1104 <arg value="install"/> 1105 1105 </exec> … … 1107 1107 <!-- windows: just the java stuff. --> 1108 1108 <echo>Windows: compile javagdbm (java only)</echo> 1109 <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" >1109 <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true"> 1110 1110 <arg value="compile"/> 1111 1111 <arg value="javaonly"/> … … 1124 1124 1125 1125 <!-- windows --> 1126 <exec executable="${src.packages.home}/search4j/compile.bat" os="${os.windows}" dir="${src.packages.home}/search4j" />1126 <exec executable="${src.packages.home}/search4j/compile.bat" os="${os.windows}" dir="${src.packages.home}/search4j" failonerror="true"/> 1127 1127 1128 1128 <!-- unix --> 1129 <exec executable="${src.packages.home}/search4j/configure" os="${os.unix}" dir="${src.packages.home}/search4j" ><arg line="--bindir=${basedir}/bin"/></exec>1130 <exec executable="make" os="${os.unix}" dir="${src.packages.home}/search4j" />1129 <exec executable="${src.packages.home}/search4j/configure" os="${os.unix}" dir="${src.packages.home}/search4j" failonerror="true"><arg line="--bindir=${basedir}/bin"/></exec> 1130 <exec executable="make" os="${os.unix}" dir="${src.packages.home}/search4j" failonerror="true"/> 1131 1131 1132 1132 <!-- install --> … … 1197 1197 <target name="configure-common-src" depends="init" if="collection.building.disabled"> 1198 1198 <exec executable="${common.src.home}/configure" os="${os.unix}" 1199 dir="${common.src.home}" >1199 dir="${common.src.home}" failonerror="true"> 1200 1200 <arg value="--prefix=${common.src.home}"/> <!-- what value to use?? --> 1201 1201 </exec> … … 1204 1204 <target name="clean-common-src" depends="init" if="collection.building.disabled"> 1205 1205 <!-- unix: --> 1206 <exec executable="make" os="${os.unix}" dir="${common.src.home}" >1206 <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true"> 1207 1207 <arg value="clean"/> 1208 1208 </exec> 1209 1209 <!-- windows: --> 1210 <exec executable="nmake" dir="${common.src.home}" os="${os.windows}" >1210 <exec executable="nmake" dir="${common.src.home}" os="${os.windows}" failonerror="true"> 1211 1211 <arg value="/f"/> 1212 1212 <arg value="win32.mak"/> … … 1215 1215 </target> 1216 1216 <target name="distclean-common-src" depends="init" if="collection.building.disabled"> 1217 <exec executable="make" os="${os.unix}" dir="${common.src.home}" >1217 <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true"> 1218 1218 <arg value="distclean"/> 1219 1219 </exec> … … 1221 1221 <target name="compile-common-src" depends="init" if="collection.building.disabled"> 1222 1222 <!-- unix: --> 1223 <exec executable="make" os="${os.unix}" dir="${common.src.home}" >1223 <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true"> 1224 1224 </exec> 1225 1225 <!-- windows: --> 1226 <exec executable="nmake" dir="${common.src.home}" os="${os.windows}" >1226 <exec executable="nmake" dir="${common.src.home}" os="${os.windows}" failonerror="true"> 1227 1227 <arg value="/f"/> 1228 1228 <arg value="win32.mak"/> … … 1246 1246 description="Configure only the collection building components"> 1247 1247 <exec executable="${gs2build.home}/configure" os="${os.unix}" 1248 dir="${gs2build.home}" >1248 dir="${gs2build.home}" failonerror="true"> 1249 1249 <arg value="--prefix=${gs2build.home}"/> 1250 1250 </exec> … … 1404 1404 <target name="clean-gs2build" depends="init" if="collection.building.enabled"> 1405 1405 <!-- unix: --> 1406 <exec executable="make" os="${os.unix}" dir="${gs2build.home}" >1406 <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true"> 1407 1407 <arg value="clean"/> 1408 1408 </exec> 1409 1409 <!-- windows: --> 1410 <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" >1410 <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" failonerror="true"> 1411 1411 <arg value="/f"/> 1412 1412 <arg value="win32.mak"/> … … 1417 1417 1418 1418 <target name="distclean-gs2build" depends="init,clean-gs2build" if="collection.building.enabled"> 1419 <exec executable="make" os="${os.unix}" dir="${gs2build.home}" >1419 <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true"> 1420 1420 <arg value="distclean"/> 1421 1421 </exec> … … 1425 1425 <!-- gs2build --> 1426 1426 <!--linux: make, make install --> 1427 <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 1428 </exec> 1429 <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 1427 <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true"/> 1428 <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true"> 1430 1429 <arg value="install"/> 1431 1430 </exec> … … 1433 1432 <!-- <exec executable="${compile.windows.c++.setup}" os="${os.windows}"/>--> 1434 1433 <!--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--> 1435 <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" >1434 <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" failonerror="true"> 1436 1435 <arg value="/f"/> 1437 1436 <arg value="win32.mak"/> 1438 1437 </exec> 1439 <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" >1438 <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" failonerror="true"> 1440 1439 <arg value="/f"/> 1441 1440 <arg value="win32.mak"/>
Note:
See TracChangeset
for help on using the changeset viewer.