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

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

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

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/installer/antinstall-config.xml

    r22325 r30131  
    6666        <comment name="choose-components"/>
    6767
    68         <!-- if linux|windows -->
     68        <!-- if linux|windows|mac -->
    6969        <target
    7070            target="Initialising"
  • main/trunk/release-kits/kits/rk2/installer/build.xml

    r29340 r30131  
    4646            <available file="../@java.extracted@/bin/java"/>
    4747            <available file="../@java.extracted@/bin/java.exe"/>
     48            <available file="/tmp/jre/bin/java"/>
    4849        </or>
    4950    </condition>
     
    6970    <!-- copy jre -->
    7071    <target name="Initialising" if="bundled.java.exists">
     72        <!-- work out whether a jre was bundled with this installer. If it was, then for a Mac, it would live in /tmp -->
     73        <!-- if mac -->
     74        <property name="extracted.jre.path" location="/tmp/jre" relative="false" />
     75        <!-- /if -->
     76        <!-- if windows|linux -->
     77        <property name="extracted.jre.path" location="../@java.extracted@" relative="true" basedir="${basedir}" />
     78        <!-- /if -->
     79
     80        <mkdir dir="${installDir}/packages"/>
     81        <copy todir="${installDir}/packages/jre" failonerror="false">
     82            <fileset dir="${extracted.jre.path}"/>
     83        </copy>
     84        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
     85        <!-- if mac -->
     86        <chmod dir="${installDir}/packages/jre/lib" includes="**/*" perm="a+rx"/>       
     87        <!-- /if -->
     88    </target>
     89
     90    <!-- copy jre -->
     91    <!--
     92    <target name="Initialising" if="bundled.java.exists">
    7193        <mkdir dir="${installDir}/packages"/>
    7294        <copy todir="${installDir}/packages/jre" failonerror="false">
     
    7597        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
    7698    </target>
     99    -->
     100
    77101
    78102    <!-- core system -->
  • main/trunk/release-kits/kits/rk3/installer/build.xml

    r29335 r30131  
    4646    <winprops/>
    4747    <!-- /if -->
    48 
    49     <!-- work out whether a jre is bundled with this installer -->
    50     <available file="../jre/bin" property="bundled.java.exists"/>
    51 
     48   
    5249    <!-- determine if there is an existing installation in the installDir-->
    5350    <available file="${installDir}\installation.properties" property="is.overinstall"/>
     51
     52    <!-- work out whether a jre was bundled with this installer. If it was, then for a Mac, it would live in /tmp -->
     53    <!-- if mac -->
     54    <available file="/tmp/jre/bin" property="bundled.java.exists"/>
     55    <property name="extracted.jre.path" location="/tmp/jre" relative="false" />
     56    <!-- /if -->
     57    <!-- if windows|liunx -->
     58    <available file="../jre/bin" property="bundled.java.exists"/>
     59    <property name="extracted.jre.path" location="../jre" relative="true" basedir="${basedir}" />
     60    <!-- /if -->
    5461
    5562    <!-- target to copy the bundled jre into place -->
     
    5764        <mkdir dir="${installDir}"/>
    5865        <copy todir="${installDir}/packages/jre" failonerror="false">
    59             <fileset dir="../jre"/>
     66            <fileset dir="${extracted.jre.path}"/>
    6067        </copy>
    6168        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
     69        <!-- if mac -->
     70        <chmod dir="${installDir}/packages/jre/lib" includes="**/*" perm="a+rx"/>       
     71        <!-- /if -->
    6272    </target>
    6373
Note: See TracChangeset for help on using the changeset viewer.