Changeset 19904

Show
Ignore:
Timestamp:
24.06.2009 15:42:23 (11 years ago)
Author:
oranfry
Message:

change build.xml to fail on compilation error, and fixed a codo

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r19903 r19904  
    330330    <antcall target="compile-collection-building"/> 
    331331    <antcall target="install-auxiliary-jar-files"/> 
    332     <antcall tartget="install-jni-files"/> 
     332    <antcall target="install-jni-files"/> 
    333333  </target> 
    334334     
     
    10711071    </echo> 
    10721072     
    1073     <exec executable="${javagdbm.home}/configure" os="${os.unix}" dir="${javagdbm.home}"> 
     1073    <exec executable="${javagdbm.home}/configure" os="${os.unix}" dir="${javagdbm.home}" failonerror="true"> 
    10741074      <arg value="--prefix=${basedir}"/> 
    10751075      <arg value="--libdir=${lib.jni}"/> 
     
    10821082  <target name="clean-javagdbm" depends="init"> 
    10831083    <exec executable="make" os="${os.unix}" 
    1084       dir="${javagdbm.home}"> 
     1084      dir="${javagdbm.home}" failonerror="true"> 
    10851085      <arg value="clean"/> 
    10861086    </exec> 
     
    10911091  <target name="distclean-javagdbm" depends="init"> 
    10921092    <exec executable="make" os="${os.unix}" 
    1093       dir="${javagdbm.home}"> 
     1093      dir="${javagdbm.home}" failonerror="true"> 
    10941094      <arg value="distclean"/> 
    10951095    </exec> 
     
    11001100    <!-- unix: --> 
    11011101    <echo>compile javagdbm</echo> 
    1102     <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"/> 
    1103     <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"> 
     1102    <exec executable="make" os="${os.unix}" dir="${javagdbm.home}" failonerror="true"/> 
     1103    <exec executable="make" os="${os.unix}" dir="${javagdbm.home}" failonerror="true"> 
    11041104      <arg value="install"/> 
    11051105    </exec> 
     
    11071107    <!-- windows: just the java stuff. --> 
    11081108    <echo>Windows: compile javagdbm (java only)</echo> 
    1109     <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}"> 
     1109    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true"> 
    11101110      <arg value="compile"/> 
    11111111      <arg value="javaonly"/> 
     
    11241124 
    11251125  <!-- windows --> 
    1126     <exec executable="${src.packages.home}/search4j/compile.bat" os="${os.windows}" dir="${src.packages.home}/search4j"/> 
     1126    <exec executable="${src.packages.home}/search4j/compile.bat" os="${os.windows}" dir="${src.packages.home}/search4j" failonerror="true"/> 
    11271127 
    11281128  <!-- unix --> 
    1129     <exec executable="${src.packages.home}/search4j/configure" os="${os.unix}" dir="${src.packages.home}/search4j"><arg line="--bindir=${basedir}/bin"/></exec> 
    1130     <exec executable="make" os="${os.unix}" dir="${src.packages.home}/search4j"/> 
     1129    <exec executable="${src.packages.home}/search4j/configure" os="${os.unix}" dir="${src.packages.home}/search4j" failonerror="true"><arg line="--bindir=${basedir}/bin"/></exec> 
     1130    <exec executable="make" os="${os.unix}" dir="${src.packages.home}/search4j" failonerror="true"/> 
    11311131 
    11321132  <!-- install --> 
     
    11971197  <target name="configure-common-src" depends="init" if="collection.building.disabled"> 
    11981198    <exec executable="${common.src.home}/configure" os="${os.unix}" 
    1199       dir="${common.src.home}"> 
     1199      dir="${common.src.home}" failonerror="true"> 
    12001200      <arg value="--prefix=${common.src.home}"/> <!-- what value to use?? --> 
    12011201    </exec> 
     
    12041204  <target name="clean-common-src" depends="init" if="collection.building.disabled"> 
    12051205    <!-- unix:  --> 
    1206     <exec executable="make" os="${os.unix}" dir="${common.src.home}"> 
     1206    <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true"> 
    12071207      <arg value="clean"/> 
    12081208    </exec> 
    12091209    <!-- windows: -->     
    1210     <exec executable="nmake" dir="${common.src.home}" os="${os.windows}" > 
     1210    <exec executable="nmake" dir="${common.src.home}" os="${os.windows}" failonerror="true"> 
    12111211      <arg value="/f"/> 
    12121212      <arg value="win32.mak"/> 
     
    12151215  </target> 
    12161216  <target name="distclean-common-src" depends="init" if="collection.building.disabled"> 
    1217     <exec executable="make" os="${os.unix}" dir="${common.src.home}"> 
     1217    <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true"> 
    12181218      <arg value="distclean"/> 
    12191219    </exec> 
     
    12211221  <target name="compile-common-src" depends="init" if="collection.building.disabled"> 
    12221222    <!-- unix: --> 
    1223     <exec executable="make" os="${os.unix}" dir="${common.src.home}"> 
     1223    <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true"> 
    12241224    </exec> 
    12251225    <!-- windows: --> 
    1226     <exec executable="nmake" dir="${common.src.home}" os="${os.windows}"> 
     1226    <exec executable="nmake" dir="${common.src.home}" os="${os.windows}" failonerror="true"> 
    12271227      <arg value="/f"/> 
    12281228      <arg value="win32.mak"/> 
     
    12461246    description="Configure only the collection building components"> 
    12471247    <exec executable="${gs2build.home}/configure" os="${os.unix}" 
    1248       dir="${gs2build.home}"> 
     1248      dir="${gs2build.home}" failonerror="true"> 
    12491249      <arg value="--prefix=${gs2build.home}"/> 
    12501250    </exec> 
     
    14041404  <target name="clean-gs2build" depends="init" if="collection.building.enabled"> 
    14051405    <!-- unix:  --> 
    1406     <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 
     1406    <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true"> 
    14071407      <arg value="clean"/> 
    14081408    </exec> 
    14091409    <!-- windows: -->     
    1410     <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" > 
     1410    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" failonerror="true"> 
    14111411      <arg value="/f"/> 
    14121412      <arg value="win32.mak"/> 
     
    14171417 
    14181418  <target name="distclean-gs2build" depends="init,clean-gs2build" if="collection.building.enabled"> 
    1419     <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 
     1419    <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true"> 
    14201420      <arg value="distclean"/> 
    14211421    </exec> 
     
    14251425    <!-- gs2build --> 
    14261426    <!--linux: make, make install --> 
    1427     <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 
    1428     </exec> 
    1429     <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 
     1427    <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true"/> 
     1428    <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true"> 
    14301429      <arg value="install"/> 
    14311430    </exec> 
     
    14331432    <!-- <exec executable="${compile.windows.c++.setup}" os="${os.windows}"/>--> 
    14341433    <!--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-->  
    1435     <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}"> 
     1434    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" failonerror="true"> 
    14361435      <arg value="/f"/> 
    14371436      <arg value="win32.mak"/> 
    14381437    </exec> 
    1439     <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}"> 
     1438    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" failonerror="true"> 
    14401439      <arg value="/f"/> 
    14411440      <arg value="win32.mak"/>