Changeset 30131 for main/trunk/release-kits/kits

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.

Location:

main/trunk/release-kits/kits

Files:

• rk2/installer/antinstall-config.xml (modified) (1 diff)
• rk2/installer/build.xml (modified) (3 diffs)
• rk3/installer/build.xml (modified) (2 diffs)

main/trunk/release-kits/kits/rk2/installer/antinstall-config.xml

@@ -66 +66 @@
         <comment name="choose-components"/>
 
-        <!-- if linux|windows -->
+        <!-- if linux|windows|mac -->
         <target
             target="Initialising"

main/trunk/release-kits/kits/rk2/installer/build.xml

@@ -46 +46 @@
             <available file="../@java.extracted@/bin/java"/>
             <available file="../@java.extracted@/bin/java.exe"/>
+            <available file="/tmp/jre/bin/java"/>
         </or>
     </condition>
@@ -69 +70 @@
     <!-- copy jre -->
     <target name="Initialising" if="bundled.java.exists">
+        <!-- work out whether a jre was bundled with this installer. If it was, then for a Mac, it would live in /tmp -->
+        <!-- if mac -->
+        <property name="extracted.jre.path" location="/tmp/jre" relative="false" />
+        <!-- /if -->
+        <!-- if windows|linux -->
+        <property name="extracted.jre.path" location="../@java.extracted@" relative="true" basedir="${basedir}" />
+        <!-- /if -->
+
+        <mkdir dir="${installDir}/packages"/>
+        <copy todir="${installDir}/packages/jre" failonerror="false">
+            <fileset dir="${extracted.jre.path}"/>
+        </copy>
+        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
+        <!-- if mac -->
+        <chmod dir="${installDir}/packages/jre/lib" includes="**/*" perm="a+rx"/>       
+        <!-- /if -->
+    </target>
+
+    <!-- copy jre -->
+    <!--
+    <target name="Initialising" if="bundled.java.exists">
         <mkdir dir="${installDir}/packages"/>
         <copy todir="${installDir}/packages/jre" failonerror="false">
@@ -75 +97 @@
         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
     </target>
+    -->
+
 
     <!-- core system -->

main/trunk/release-kits/kits/rk3/installer/build.xml

@@ -46 +46 @@
     <winprops/>
     <!-- /if -->
-
-    <!-- work out whether a jre is bundled with this installer -->
-    <available file="../jre/bin" property="bundled.java.exists"/>
-
+    
     <!-- determine if there is an existing installation in the installDir-->
     <available file="${installDir}\installation.properties" property="is.overinstall"/>
+
+    <!-- work out whether a jre was bundled with this installer. If it was, then for a Mac, it would live in /tmp -->
+    <!-- if mac -->
+    <available file="/tmp/jre/bin" property="bundled.java.exists"/>
+    <property name="extracted.jre.path" location="/tmp/jre" relative="false" />
+    <!-- /if -->
+    <!-- if windows|liunx -->
+    <available file="../jre/bin" property="bundled.java.exists"/>
+    <property name="extracted.jre.path" location="../jre" relative="true" basedir="${basedir}" />
+    <!-- /if -->
 
     <!-- target to copy the bundled jre into place -->
@@ -57 +64 @@
         <mkdir dir="${installDir}"/>
         <copy todir="${installDir}/packages/jre" failonerror="false">
-            <fileset dir="../jre"/>
+            <fileset dir="${extracted.jre.path}"/>
         </copy>
         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
+        <!-- if mac -->
+        <chmod dir="${installDir}/packages/jre/lib" includes="**/*" perm="a+rx"/>       
+        <!-- /if -->
     </target>