Changeset 26079


Ignore:
Timestamp:
2012-08-07T16:54:15+12:00 (12 years ago)
Author:
sjm84
Message:

Fixed error messages when calling "ant distclean"

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.xml

    r26033 r26079  
    17021702
    17031703  <target name="distclean-javagdbm" depends="init">
     1704    <if><bool><available file="${javagdbm.home}/Makefile"/></bool>
    17041705    <exec executable="make" os="${os.unix}"
    17051706      dir="${javagdbm.home}" failonerror="true">
    17061707      <arg value="distclean"/>
    17071708    </exec>
     1709    </if>
    17081710  </target>
    17091711 
    … …  
    18791881  <target name="distclean-common-src" depends="init">
    18801882    <!-- unix:  -->
     1883    <if><bool><available file="${common.src.home}/Makefile"/></bool>
    18811884    <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true">
    18821885      <arg value="distclean"/>
    18831886    </exec>
     1887    </if>
    18841888    <!-- windows: distclean = clean + remove configure products (remove makefiles). But on Windows there is no removing makefiles, so we just call clean -->   
    18851889    <exec executable="nmake" dir="${common.src.home}" os="${os.windows}" failonerror="true">
    … …  
    21542158  <target name="clean-build-src" depends="init" if="collection.building.enabled">
    21552159    <!-- unix:  -->
     2160    <if><bool><available file="${build.src.home}/Makefile"/></bool>
    21562161    <exec executable="make" os="${os.unix}" dir="${build.src.home}" failonerror="true">
    21572162      <arg value="clean"/>
    21582163    </exec>
     2164    </if>
    21592165    <!-- windows: -->   
    21602166    <exec executable="nmake" dir="${build.src.home}" os="${os.windows}" failonerror="true">
    … …  
    21692175  <target name="distclean-build-src" depends="init,clean-build-src" if="collection.building.enabled">
    21702176    <!-- unix:  -->
     2177    <if><bool><available file="${build.src.home}/Makefile"/></bool>
    21712178    <exec executable="make" os="${os.unix}" dir="${build.src.home}" failonerror="true">
    21722179      <arg value="distclean"/>
    21732180    </exec>
     2181    </if>
    21742182    <!-- windows: distclean = clean + remove configure products (remove makefiles). But on Windows there is no removing makefiles, so we just call clean -->   
    21752183    <exec executable="nmake" dir="${build.src.home}" os="${os.windows}" failonerror="true">
Note: See TracChangeset for help on using the changeset viewer.