Changeset 21351


Ignore:
Timestamp:
12/15/09 18:15:09 (11 years ago)
Author:
ak19
Message:

Xiaofeng found out that FailOnError attribute is incompatible with Spawn attribute, so removed the recently added FailOnError wherever it was combined with Spawn.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r21347 r21351  
    802802    <property name="tomcat.path" refid="local.tomcat.path"/>
    803803    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/>
    804     <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false" failonerror="true">
     804    <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false">
    805805      <!--<env key="GSDLOS" value="linux"/> do we need this?? -->
    806806      <env key="GSDL3HOME" value="${basedir}"/>
     
    813813      <env key="WNHOME" path="${wn.home}"/>
    814814    </exec>
    815     <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true" failonerror="true">
     815    <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true">
    816816      <env key="GSDLOS" value="windows"/>
    817817      <env key="GSDL3HOME" value="${basedir}"/>
     
    834834  <!-- shouldn't this test whether anything is running first? -->
    835835  <target name="stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal">
    836     <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false" failonerror="true">
     836    <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false">
    837837      <env key="CATALINA_HOME" value="${catalina.home}"/>
    838838    </exec>
    839     <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false" failonerror="true">
     839    <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false">
    840840      <env key="CATALINA_HOME" value="${catalina.home}"/>
    841841    </exec>
     
    15171517
    15181518  <target name="gli" description="Run the Greenstone Librarian Interface" depends="init" if="collection.building.enabled">
    1519     <exec executable="${basedir}/gli/gli.sh" os="${os.linux},${os.solaris}" dir="${basedir}/gli" spawn="true" failonerror="true">
     1519    <exec executable="${basedir}/gli/gli.sh" os="${os.linux},${os.solaris}" dir="${basedir}/gli" spawn="true">
    15201520      <env key="gsdl3path" path="${basedir}"/>
    15211521      <env key="gsdlpath" path="${gs2build.home}"/>
    15221522    </exec>
    1523     <exec executable="${basedir}/gli/gli.sh" os="${os.mac}" dir="${basedir}/gli" spawn="true" failonerror="true">
     1523    <exec executable="${basedir}/gli/gli.sh" os="${os.mac}" dir="${basedir}/gli" spawn="true">
    15241524      <env key="gsdl3path" path="${basedir}"/>
    15251525      <env key="gsdlpath" path="${gs2build.home}"/>
    15261526      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.home}/lib"/>
    15271527    </exec>
    1528     <exec executable="${basedir}/gli/gli.bat" os="${os.windows}" dir="${basedir}/gli" spawn="true" failonerror="true">
     1528    <exec executable="${basedir}/gli/gli.bat" os="${os.windows}" dir="${basedir}/gli" spawn="true">
    15291529      <env key="GSDL3PATH" path="${basedir}"/>
    15301530      <env key="GSDLPATH" path="${gs2build.home}"/>
Note: See TracChangeset for help on using the changeset viewer.