Ignore:
Timestamp:
2015-08-25T21:47:13+12:00 (9 years ago)
Author:
ak19
Message:

Changes specific to 64 bit MacOS with which we now bundle a JRE.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml

    r24438 r30131  
    6767            <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.linux-java}" datatype="int"/>
    6868        <else>
    69             <property name="component.bytesize.core" value="${component.bytesize.core-without-jre}"/>
     69            <exec dir="." executable="/bin/sh" outputproperty="bitness.ouput"><arg line="-c &quot;uname -m&quot;"/></exec>
     70            <if><bool><contains string="${bitness.ouput}" substring="_64"/></bool>
     71                <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.mac-java}" datatype="int"/>
     72                <else><property name="component.bytesize.core" value="${component.bytesize.core-without-jre}"/></else>
     73            </if>
    7074        </else></if></else></if>
    7175        <math result="component.megabytesize.core" operand1="${component.bytesize.core}" operation="/" operand2="1048576" datatype="int"/>
Note: See TracChangeset for help on using the changeset viewer.