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

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/shared/core/ant-scripts

Files:

• create-installer.xml (modified) (1 diff)
• shared.xml (modified) (1 diff)
• wrap.xml (modified) (1 diff)

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

@@ -67 +67 @@
             <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.linux-java}" datatype="int"/>
         <else>
-            <property name="component.bytesize.core" value="${component.bytesize.core-without-jre}"/>
+            <exec dir="." executable="/bin/sh" outputproperty="bitness.ouput"><arg line="-c &quot;uname -m&quot;"/></exec>
+            <if><bool><contains string="${bitness.ouput}" substring="_64"/></bool>
+                <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.mac-java}" datatype="int"/>
+                <else><property name="component.bytesize.core" value="${component.bytesize.core-without-jre}"/></else>
+            </if>
         </else></if></else></if>
         <math result="component.megabytesize.core" operand1="${component.bytesize.core}" operation="/" operand2="1048576" datatype="int"/>

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

@@ -92 +92 @@
         <!-- linux -->
         <property name="linux-java.installer" value="jre_bin${extension_x64}"/>
-        <property name="bundled.version.linux-java" value="1.6.0_05"/> <!-- set this to the version number of java in the above archive -->
+        <property name="bundled.version.linux-java" value="1.7.0_72"/> <!-- set this to the version number of java in the above archive -->
         <property name="component.bytesize.linux-java" value="101245987"/> <!-- set this to the size of the extract archive -->
 
         <!-- windows -->
         <property name="windows-java.installer" value="jre.exe"/>
-        <property name="bundled.version.windows-java" value="1.6.0_07"/> <!-- set this to the version number of java in the above archive -->
+        <property name="bundled.version.windows-java" value="1.7.0_72"/> <!-- set this to the version number of java in the above archive -->
         <property name="component.bytesize.windows-java" value="75000000"/> <!-- set this to the size of the extract archive -->
+
+        <!-- mac -->
+        <!-- only a jre_bin for 64 bit macs -->
+        <property name="mac-java.installer" value="jre_bin_x64"/>
+        <property name="bundled.version.mac-java" value="1.7.0_79"/> <!-- set this to the version number of java in the above archive -->
+        <property name="component.bytesize.mac-java" value="30688272"/> <!-- set this to the size of the archive, NOT the extracted archive, since we'll extract it into the /tmp folder -->
 
         <!-- version numbers of other bundled things -->

main/trunk/release-kits/shared/core/ant-scripts/wrap.xml

@@ -151 +151 @@
 
             <!-- copy bundled files -->
+            <!-- Include the self-extracting jre (for 64 bit) if this Mac is a 64 bit OS
+                 http://stackoverflow.com/questions/218989/how-to-determine-build-architecture-32bit-64bit-with-ant -->
+            <exec dir="." executable="/bin/sh" outputproperty="bitness.ouput"><arg line="-c &quot;uname -m&quot;"/></exec>
+            <if><bool><contains string="${bitness.ouput}" substring="_64"/></bool>
+                <copy tofile="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Resources/Java/jre_bin" file="${rk.home}/shared/mac/${mac-java.installer}"/>
+            </if>
             <chmod file="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/MacOS/greenstone" perm="ug+x"/>
             <copy todir="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Resources/Java" file="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar"/>