Changeset 10901
- Timestamp:
- 2005-11-15T17:29:09+13:00 (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl3/build.xml
r10897 r10901 86 86 <property name="os.linux" value="Linux"/> 87 87 <property name="os.mac" value="Mac OS X"/> 88 <property name="os.solaris" value="SunOS"/> 89 <property name="os.unix" value="${os.linux},${os.mac},${os.solaris}"/> 88 90 <property name="os.windows" value="Windows 95,Windows 98,Windows 2000,Windows XP,Windows NT,Windows ME"/> <!-- check this!!!--> 89 91 … … 215 217 <echo>is unixnotmac : ${current.os.isunixnotmac}</echo> 216 218 <echo>is windows : ${current.os.iswindows}</echo> 219 <echo>os.unix: ${os.unix}</echo> 217 220 </target> 218 221 <!-- ==================== Primary and Global Targets ============================= --> … … 543 546 <property name="tomcat.path" refid="local.tomcat.path"/> 544 547 <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/> 545 <exec executable="${catalina.home}/bin/startup.sh" os="${os. linux},${os.mac}" dir="${catalina.home}/bin" spawn="false">548 <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false"> 546 549 <!--<env key="GSDLOS" value="linux"/> do we need this?? --> 547 550 <env key="GSDL3HOME" value="${basedir}"/> … … 571 574 <!-- windows: do we want to launch a webrowser?? --> 572 575 <target name="stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal"> 573 <exec executable="${catalina.home}/bin/shutdown.sh" os="${os. linux},${os.mac}" dir="${catalina.home}/bin" spawn="false">576 <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false"> 574 577 <env key="CATALINA_HOME" value="${catalina.home}"/> 575 578 </exec> … … 1071 1074 Configuring MG 1072 1075 </echo> 1073 <exec executable="${mg.home}/configure" os="${os. linux},${os.mac}"1076 <exec executable="${mg.home}/configure" os="${os.unix}" 1074 1077 dir="${mg.home}"> 1075 1078 <arg value="--prefix=${basedir}"/> … … 1079 1082 Configuring MGPP 1080 1083 </echo> 1081 <exec executable="${mgpp.home}/configure" os="${os. linux},${os.mac}"1084 <exec executable="${mgpp.home}/configure" os="${os.unix}" 1082 1085 dir="${mgpp.home}"> 1083 1086 <arg value="--prefix=${basedir}"/> … … 1087 1090 Configuring JavaGDBM 1088 1091 </echo> 1089 <exec executable="${javagdbm.home}/configure" os="${os.linux} "1092 <exec executable="${javagdbm.home}/configure" os="${os.linux},${os.solaris}" 1090 1093 dir="${javagdbm.home}"> 1091 1094 <arg value="--prefix=${basedir}"/> … … 1105 1108 <target name="clean-packages-c++" depends="init"> 1106 1109 <!-- mg : just call the make target --> 1107 <exec executable="make" os="${os. linux},${os.mac}"1110 <exec executable="make" os="${os.unix}" 1108 1111 dir="${mg.home}"> 1109 1112 <arg value="clean"/> 1110 1113 </exec> 1111 1114 <!-- mgpp --> 1112 <exec executable="make" os="${os. linux},${os.mac}"1115 <exec executable="make" os="${os.unix}" 1113 1116 dir="${mgpp.home}"> 1114 1117 <arg value="clean"/> 1115 1118 </exec> 1116 1119 <!-- javagdbm --> 1117 <exec executable="make" os="${os. linux},${os.mac}"1120 <exec executable="make" os="${os.unix}" 1118 1121 dir="${javagdbm.home}"> 1119 1122 <arg value="clean"/> … … 1123 1126 <target name="distclean-packages-c++" depends="init"> 1124 1127 <!-- mg : just call the make target --> 1125 <exec executable="make" os="${os. linux},${os.mac}"1128 <exec executable="make" os="${os.unix}" 1126 1129 dir="${mg.home}"> 1127 1130 <arg value="distclean"/> 1128 1131 </exec> 1129 1132 <!-- mgpp --> 1130 <exec executable="make" os="${os. linux},${os.mac}"1133 <exec executable="make" os="${os.unix}" 1131 1134 dir="${mgpp.home}"> 1132 1135 <arg value="distclean"/> 1133 1136 </exec> 1134 1137 <!-- javagdbm --> 1135 <exec executable="make" os="${os. linux},${os.mac}"1138 <exec executable="make" os="${os.unix}" 1136 1139 dir="${javagdbm.home}"> 1137 1140 <arg value="distclean"/> … … 1152 1155 description="Compile only the packages"> 1153 1156 <echo>Compiling MG</echo> 1154 <exec executable="make" os="${os. linux},${os.mac}"1157 <exec executable="make" os="${os.unix}" 1155 1158 dir="${mg.home}"> 1156 1159 </exec> 1157 <exec executable="make" os="${os. linux},${os.mac}"1160 <exec executable="make" os="${os.unix}" 1158 1161 dir="${mg.home}"> 1159 1162 <arg value="install"/> … … 1170 1173 <!-- mgpp --> 1171 1174 <echo>Compiling MGPP</echo> 1172 <exec executable="make" os="${os. linux},${os.mac}"1175 <exec executable="make" os="${os.unix}" 1173 1176 dir="${mgpp.home}"> 1174 1177 </exec> 1175 <exec executable="make" os="${os. linux},${os.mac}"1178 <exec executable="make" os="${os.unix}" 1176 1179 dir="${mgpp.home}"> 1177 1180 <arg value="install"/> … … 1187 1190 1188 1191 <!-- javagdbm --> 1189 <exec executable="make" os="${os. linux},${os.mac}"1192 <exec executable="make" os="${os.unix}" 1190 1193 dir="${javagdbm.home}"> 1191 1194 </exec> 1192 <exec executable="make" os="${os. linux},${os.mac}"1195 <exec executable="make" os="${os.unix}" 1193 1196 dir="${javagdbm.home}"> 1194 1197 <arg value="install"/> … … 1378 1381 <target name="configure-gs2building" depends="init" if="gsdl2.islocal" 1379 1382 description="Configure only the Greenstone 2 building components"> 1380 <exec executable="${gs2build.home}/configure" os="${os.linux} "1383 <exec executable="${gs2build.home}/configure" os="${os.linux},${os.solaris}" 1381 1384 dir="${gs2build.home}"> 1382 1385 <arg value="--prefix=${gs2build.home}"/> … … 1395 1398 <property name="gli.home" value="${basedir}/gli"/> 1396 1399 <!-- linux --> 1397 <exec executable="clean.sh" os="${os. linux},${os.mac}" dir="${gli.home}"1400 <exec executable="clean.sh" os="${os.unix}" dir="${gli.home}" 1398 1401 resolveExecutable="true"/> 1399 1402 <!-- windows --> … … 1404 1407 <!-- gs2build --> 1405 1408 <!--linux: --> 1406 <exec executable="make" os="${os. linux},${os.mac}" dir="${gs2build.home}">1409 <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 1407 1410 <arg value="clean"/> 1408 1411 </exec> … … 1412 1415 <!-- gs2build --> 1413 1416 <!--linux: --> 1414 <exec executable="make" os="${os. linux},${os.mac}" dir="${gs2build.home}">1417 <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 1415 1418 <arg value="distclean"/> 1416 1419 </exec> … … 1434 1437 <property name="gli.home" value="${basedir}/gli"/> 1435 1438 <!-- linux --> 1436 <exec executable="makegli.sh" os="${os. linux},${os.mac}" dir="${gli.home}"1439 <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" 1437 1440 resolveExecutable="true"/> 1438 1441 <!-- windows --> … … 1441 1444 <!-- gs2build --> 1442 1445 <!--linux: make, make install --> 1443 <exec executable="make" os="${os. linux},${os.mac}" dir="${gs2build.home}">1444 </exec> 1445 <exec executable="make" os="${os. linux},${os.mac}" dir="${gs2build.home}">1446 <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 1447 </exec> 1448 <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 1446 1449 <arg value="install"/> 1447 1450 </exec> … … 1462 1465 1463 1466 <target name="gli-local" depends="init" if="gsdl2.islocal"> 1464 <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.linux} " dir="${basedir}/gli" spawn="true">1467 <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.linux},${os.solaris}" dir="${basedir}/gli" spawn="true"> 1465 1468 <env key="gsdl3path" path="${basedir}"/> 1466 1469 <env key="gsdlpath" path="${basedir}/gs2build"/> … … 1480 1483 1481 1484 <target name="gli-external" depends="init" unless="gsdl2.islocal"> 1482 <exec executable="${gsdl2.installed.path}/gli/gli4gs3.sh" os="${os.linux},${os. mac}" dir="${gsdl2.installed.path}/gli" spawn="true">1485 <exec executable="${gsdl2.installed.path}/gli/gli4gs3.sh" os="${os.linux},${os.solaris}" dir="${gsdl2.installed.path}/gli" spawn="true"> 1483 1486 <env key="gsdl3path" path="${basedir}"/> 1484 1487 <env key="gsdlpath" path="${gsdl2.installed.path}"/> 1488 </exec> 1489 <exec executable="${gsdl2.installed.path}/gli/gli4gs3.sh" os="${os.mac}" dir="${gsdl2.installed.path}/gli" spawn="true"> 1490 <env key="gsdl3path" path="${basedir}"/> 1491 <env key="gsdlpath" path="${gsdl2.installed.path}"/> 1492 <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.installed.path}/lib"/> 1485 1493 </exec> 1486 1494 <exec executable="${gsdl2.installed.path}/gli/gli4gs3.bat" os="${os.windows}" dir="${gsdl2.installed.path}/gli" spawn="true">
Note:
See TracChangeset
for help on using the changeset viewer.