Changeset 19996


Ignore:
Timestamp:
2009-07-16T15:03:49+12:00 (13 years ago)
Author:
oranfry
Message:

can't use compile.bat anymore as it doesn't exist, do the proper make, make install instead

File:
1 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r19975 r19996  
    11531153  <target name="compile-search4j">
    11541154
    1155   <!-- windows -->
    1156     <exec executable="${src.packages.home}/search4j/compile.bat" os="${os.windows}" dir="${src.packages.home}/search4j" failonerror="true"/>
    1157 
    1158   <!-- unix -->
    1159     <exec executable="${src.packages.home}/search4j/configure" os="${os.unix}" dir="${src.packages.home}/search4j" failonerror="true"><arg line="--bindir=${basedir}/bin"/>
    1160       <arg line="${static.arg}"/>
    1161     </exec>
    1162     <exec executable="make" os="${os.unix}" dir="${src.packages.home}/search4j" failonerror="true"/>
    1163 
    1164   <!-- install -->
    1165     <copy todir="bin"><fileset dir="${src.packages.home}/search4j" includes="search4j,search4j.exe"/></copy>
    1166     <if><bool><istrue value="${current.os.isunix}"/></bool>
    1167       <chmod perm="+x" file="bin/search4j"/>
    1168     </if>
     1155    <!-- windows -->
     1156    <if><bool><istrue value="${os.iswindows}"/></bool>
     1157      <exec executable="nmake" dir="${src.packages.home}/search4j" failonerror="true">
     1158        <arg value="/f"/>
     1159        <arg value="win32.mak"/>
     1160        <arg value='BINDIR="${basedir}\bin"'/>
     1161      </exec>
     1162      <exec executable="nmake" dir="${src.packages.home}/search4j" failonerror="true">
     1163        <arg value="/f"/>
     1164        <arg value="win32.mak"/>
     1165        <arg value="install"/>
     1166        <arg value='BINDIR="${basedir}\bin"'/>
     1167      </exec>
     1168
     1169    <!-- unix -->
     1170    <else><if><bool><istrue value="${os.isunix}"/></bool>
     1171      <exec executable="${src.packages.home}/search4j/configure" dir="${src.packages.home}/search4j" failonerror="true">
     1172        <arg value="--bindir=${basedir}/bin"/>
     1173        <arg value="${static.arg}"/>
     1174      </exec>
     1175      <exec executable="make" dir="${src.packages.home}/search4j" failonerror="true"/>
     1176      <exec executable="make" dir="${src.packages.home}/search4j" failonerror="true">
     1177        <arg value="install"/>
     1178      </exec>
     1179
     1180    <!-- else warn -->
     1181    <else>
     1182      <fail>this target does not support the current os</fail>
     1183
     1184    </else></if></else></if>
    11691185
    11701186  </target>
Note: See TracChangeset for help on using the changeset viewer.