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

Timestamp:

2023-10-25T13:52:16+13:00 (6 months ago)

Author:

kjdon

Message:

the change to specific.os.type to switch between Lion and Mojave downloads of gnome-lib meant that on linux, it was looking for linux-Mojave version. fixed.

File:

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

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

@@ -66 +66 @@
 
             <!-- 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}-Mojave">
-                <and>
-                    <contains string="${os.shell}" substring="darwin" casesensitive="false"/>
-                    <matches pattern="^(10\.7\.[4-9]|10\.[8-9]|1[1-9]|[2-9])" string="${os.version}"/>
-                </and>
-            </condition>
-
+                 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) -->
+            <if>
+              <bool>
+                <contains string="${os.shell}" substring="darwin" casesensitive="false"/>
+              </bool>
+              <condition property="specific.os.type" value="${os.shell}-Lion" else="${os.shell}-Mojave">
+                <matches pattern="^(10\.7\.[4-9]|10\.[8-9]|1[1-9]|[2-9])" string="${os.version}"/>
+              </condition>
+              <else>
+                <!-- not a mac-->
+                <property name="specific.os.type" value="${os.shell}"/>
+              </else>
+            </if>
             <if><bool><or>
                 <equals arg1="${post.2.83.version}" arg2="true"/>