Changeset 28612


Ignore:
Timestamp:
2013-11-07T18:21:08+13:00 (10 years ago)
Author:
ak19
Message:

Redoing the previous commit: for GS3, ant handles getting IsisGdl instead of letting the release-kit do that. During ant install, the new get-isisgdl target is called. If the OS is 64 bits and Linux or Mac (Lion), the target will get the pre-compiled IsisGdl binary from caveat that's appropriate to the OS

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.xml

    r28611 r28612  
    10761076  </target>
    10771077
    1078   <!-- Until Mac Lions (64 bit) can generate a working IsisGdl, use the one generated on a Leopard -->
     1078  <!-- Until 64 bit Linux and Mac (Lion) machines can generate a working IsisGdl,
     1079       use the ones generated on a 32 bit Linux and Mac (Leopard), respectively -->
    10791080  <target name="get-isisgdl">
    1080     <if>
    1081       <bool>
    1082     <and>
    1083       <contains string="${os.bin.dir}" substring="darwin" casesensitive="false"/>
    1084       <matches pattern="^(10\.7\.[4-9]|10\.[8-9]|1[1-9]|[2-9])" string="${os.version}"/>
    1085     </and>
    1086       </bool>
    1087       <get src="http://www.greenstone.org/caveat-emptor/IsisGdl.macleopard"
    1088         dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>
     1081    <exec executable="/bin/uname" dir="${basedir}" failonerror="false"
     1082      outputproperty="uname.val">
     1083      <arg value="-m"/>
     1084    </exec>
     1085   
     1086    <if><bool><equals arg1="${uname.val}" arg2="x86_64"/></bool>
     1087      <echo>Bitness: ${uname.val}</echo>
     1088      <if><bool><contains string="${os.bin.dir}" substring="darwin" casesensitive="false"/></bool>
     1089    <get src="http://www.greenstone.org/caveat-emptor/IsisGdl.macleopard"
     1090             dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>   
     1091      </if>
     1092      <if><bool><contains string="${os.bin.dir}" substring="linux" casesensitive="false"/></bool>
     1093    <get src="http://www.greenstone.org/caveat-emptor/IsisGdl.bin32"
     1094             dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>
     1095      </if>
    10891096      <chmod file="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl" perm="755"/>
    10901097    </if>
Note: See TracChangeset for help on using the changeset viewer.