Changeset 28512


Ignore:
Timestamp:
10/22/13 20:02:42 (7 years ago)
Author:
ak19
Message:

Needed to add an additional test to ensure that the -Lion suffix for the binary file generated is only on Macs (darwin) and not on other machines

Location:
main/trunk/release-kits/kits
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r28511 r28512  
    4949                Mac OS X v10.7.4 onwards is Lion/Mountain Lion, different from Leopard/Snow Leopard. See http://en.wikipedia.org/wiki/Darwin_(operating_system) -->
    5050            <condition property="specific.os.type" value="${os.shell}-Lion" else="${os.shell}">
    51                 <matches pattern="^(10\.7\.[4-9]|10\.[8-9]|1[1-9]|[2-9])" string="${os.version}"/>
     51                <and>
     52                    <contains string="${os.shell}" substring="darwin" casesensitive="false"/>
     53                    <matches pattern="^(10\.7\.[4-9]|10\.[8-9]|1[1-9]|[2-9])" string="${os.version}"/>
     54                </and>
    5255            </condition>
    5356
  • main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

    r28301 r28512  
    5353            Mac OS X v10.7.4 onwards is Lion/Mountain Lion, different from Leopard/Snow Leopard. See http://en.wikipedia.org/wiki/Darwin_(operating_system) -->
    5454            <condition property="specific.os.type" value="${os.shell}-Lion" else="${os.shell}">
    55                 <matches pattern="^(10\.7\.[4-9]|10\.[8-9]|1[1-9]|[2-9])" string="${os.version}"/>
     55                <and>
     56                    <contains string="${os.shell}" substring="darwin" casesensitive="false"/>
     57                    <matches pattern="^(10\.7\.[4-9]|10\.[8-9]|1[1-9]|[2-9])" string="${os.version}"/>
     58                </and>
    5659            </condition>
    5760
Note: See TracChangeset for help on using the changeset viewer.