Changeset 28301 for main/trunk/release-kits/kits/rk3

Timestamp:

2013-09-19T22:24:35+12:00 (11 years ago)

Author:

ak19

Message:

Release-kit changes for Mac (Mountain) Lion which needs to check out its own specific version of the pre-compiled gnome-lib-minimal package.

File:

• main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml (modified) (2 diffs)

main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

@@ -49 +49 @@
         <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
             <!-- checkout the gnome support library extension-->
+
+            <!-- For Lions, need a specific gnome-lib-minimal tar file. The file name contains darwin12 for Lion, it contains the os.shell name (darwin/linux) for other cases.
+            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) -->
+            <condition property="specific.os.type" value="${os.shell}-Lion" else="${os.shell}">
+                <matches pattern="^(10\.7\.[4-9]|10\.[8-9]|1[1-9]|[2-9])" string="${os.version}"/>
+            </condition>
+
             <if><bool><or>
                 <equals arg1="${post.2.83.version}" arg2="true"/>
@@ -55 +62 @@
                 <exec executable="svn">
                     <arg value="export"/>
-                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${os.shell}${arch}${extension-x64}.tar.gz"/>
-                    <arg value="${basedir}/compiled/ext/gnome-lib-${os.shell}.tar.gz"/>
+                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${specific.os.type}${arch}${extension-x64}.tar.gz"/>
+                    <arg value="${basedir}/compiled/ext/gnome-lib-${specific.os.type}.tar.gz"/>
                 </exec>
 
                 <exec executable="tar" dir="${basedir}/compiled/ext">
                     <arg value="xvzf"/>
-                    <arg value="gnome-lib-${os.shell}.tar.gz"/>
+                    <arg value="gnome-lib-${specific.os.type}.tar.gz"/>
                 </exec>