Changeset 20826
- Timestamp:
- 2009-10-19T15:39:22+13:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
greenstone3/trunk/build.xml
r20810 r20826 800 800 <property name="tomcat.path" refid="local.tomcat.path"/> 801 801 <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/> 802 <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false" >802 <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false" failonerror="true"> 803 803 <!--<env key="GSDLOS" value="linux"/> do we need this?? --> 804 804 <env key="GSDL3HOME" value="${basedir}"/> … … 811 811 <env key="WNHOME" path="${wn.home}"/> 812 812 </exec> 813 <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true" >813 <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true" failonerror="true"> 814 814 <env key="GSDLOS" value="windows"/> 815 815 <env key="GSDL3HOME" value="${basedir}"/> … … 832 832 <!-- shouldn't this test whether anything is running first? --> 833 833 <target name="stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal"> 834 <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false" >834 <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false" failonerror="true"> 835 835 <env key="CATALINA_HOME" value="${catalina.home}"/> 836 836 </exec> 837 <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false" >837 <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false" failonerror="true"> 838 838 <env key="CATALINA_HOME" value="${catalina.home}"/> 839 839 </exec> … … 1460 1460 <!-- linux --> 1461 1461 <exec executable="clean.sh" os="${os.unix}" dir="${gli.home}" 1462 resolveExecutable="true" />1462 resolveExecutable="true" failonerror="true"/> 1463 1463 <!-- windows --> 1464 1464 <exec executable="clean.bat" os="${os.windows}" dir="${gli.home}" 1465 resolveExecutable="true" />1465 resolveExecutable="true" failonerror="true"/> 1466 1466 </target> 1467 1467 … … 1471 1471 1472 1472 <!-- linux --> 1473 <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true" />1473 <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true" failonerror="true"/> 1474 1474 <!--remote gli--> 1475 1475 <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}" 1476 resolveExecutable="true" />1476 resolveExecutable="true" failonerror="true"/> 1477 1477 <!-- windows --> 1478 <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true" />1478 <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true" failonerror="true"/> 1479 1479 <!--remote gli--> 1480 1480 <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}" 1481 resolveExecutable="true" />1481 resolveExecutable="true" failonerror="true"/> 1482 1482 <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" /> 1483 1483 </target> 1484 1484 1485 1485 <target name="gli" description="Run the Greenstone Librarian Interface" depends="init" if="collection.building.enabled"> 1486 <exec executable="${basedir}/gli/gli.sh" os="${os.linux},${os.solaris}" dir="${basedir}/gli" spawn="true" >1486 <exec executable="${basedir}/gli/gli.sh" os="${os.linux},${os.solaris}" dir="${basedir}/gli" spawn="true" failonerror="true"> 1487 1487 <env key="gsdl3path" path="${basedir}"/> 1488 1488 <env key="gsdlpath" path="${gs2build.home}"/> 1489 1489 </exec> 1490 <exec executable="${basedir}/gli/gli.sh" os="${os.mac}" dir="${basedir}/gli" spawn="true" >1490 <exec executable="${basedir}/gli/gli.sh" os="${os.mac}" dir="${basedir}/gli" spawn="true" failonerror="true"> 1491 1491 <env key="gsdl3path" path="${basedir}"/> 1492 1492 <env key="gsdlpath" path="${gs2build.home}"/> 1493 1493 <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.home}/lib"/> 1494 1494 </exec> 1495 <exec executable="${basedir}/gli/gli.bat" os="${os.windows}" dir="${basedir}/gli" spawn="true" >1495 <exec executable="${basedir}/gli/gli.bat" os="${os.windows}" dir="${basedir}/gli" spawn="true" failonerror="true"> 1496 1496 <env key="GSDL3PATH" path="${basedir}"/> 1497 1497 <env key="GSDLPATH" path="${gs2build.home}"/> … … 1621 1621 1622 1622 <!-- run the setup script --> 1623 <!-- <exec executable="${compile.windows.c++.setup}" os="${os.windows}" />-->1623 <!-- <exec executable="${compile.windows.c++.setup}" os="${os.windows}" failonerror="true"/>--> 1624 1624 <!--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--> 1625 1625 <exec executable="nmake" dir="${build.src.home}" os="${os.windows}" failonerror="true">
Note:
See TracChangeset
for help on using the changeset viewer.