Changeset 20826 for greenstone3


Ignore:
Timestamp:
2009-10-19T15:39:22+13:00 (12 years ago)
Author:
ak19
Message:

Added a few more failonerror commands to exec targets.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r20810 r20826  
    800800    <property name="tomcat.path" refid="local.tomcat.path"/>
    801801    <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">
    803803      <!--<env key="GSDLOS" value="linux"/> do we need this?? -->
    804804      <env key="GSDL3HOME" value="${basedir}"/>
     
    811811      <env key="WNHOME" path="${wn.home}"/>
    812812    </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">
    814814      <env key="GSDLOS" value="windows"/>
    815815      <env key="GSDL3HOME" value="${basedir}"/>
     
    832832  <!-- shouldn't this test whether anything is running first? -->
    833833  <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">
    835835      <env key="CATALINA_HOME" value="${catalina.home}"/>
    836836    </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">
    838838      <env key="CATALINA_HOME" value="${catalina.home}"/>
    839839    </exec>
     
    14601460    <!-- linux -->
    14611461    <exec executable="clean.sh" os="${os.unix}" dir="${gli.home}"
    1462       resolveExecutable="true"/>
     1462      resolveExecutable="true" failonerror="true"/>
    14631463    <!-- windows -->
    14641464    <exec executable="clean.bat" os="${os.windows}" dir="${gli.home}"
    1465       resolveExecutable="true"/>
     1465      resolveExecutable="true" failonerror="true"/>
    14661466  </target>
    14671467 
     
    14711471
    14721472    <!-- 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"/>
    14741474    <!--remote gli-->
    14751475    <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}"
    1476       resolveExecutable="true"/>
     1476      resolveExecutable="true" failonerror="true"/>
    14771477    <!-- 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"/>
    14791479    <!--remote gli-->
    14801480    <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}"
    1481       resolveExecutable="true"/>
     1481      resolveExecutable="true" failonerror="true"/>
    14821482    <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" />
    14831483  </target>
    14841484
    14851485  <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">
    14871487      <env key="gsdl3path" path="${basedir}"/>
    14881488      <env key="gsdlpath" path="${gs2build.home}"/>
    14891489    </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">
    14911491      <env key="gsdl3path" path="${basedir}"/>
    14921492      <env key="gsdlpath" path="${gs2build.home}"/>
    14931493      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.home}/lib"/>
    14941494    </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">
    14961496      <env key="GSDL3PATH" path="${basedir}"/>
    14971497      <env key="GSDLPATH" path="${gs2build.home}"/>
     
    16211621
    16221622    <!-- 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"/>-->
    16241624      <!--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-->
    16251625      <exec executable="nmake" dir="${build.src.home}" os="${os.windows}" failonerror="true">
Note: See TracChangeset for help on using the changeset viewer.