Changeset 31969 for main

Timestamp:

2017-09-14T20:07:12+12:00 (7 years ago)

Author:

ak19

Message:

Found the location where libsqlite3.dylib was included by the release kit in the Mac binary. Modified the code to start making exceptions from Maverick onwards (Yosemite, El Capitan), which is Mac version 10.9 and onwards, so that these versions don't end up with this incompatible dylib that we generate and which prevents gli from launching sucessfully on a Mac where setup.bash is not already sourced. Instead, for these later versions of mac where we don't include our own dylib for sqlite3, we let it find the system version.

File:

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

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

@@ -245 +245 @@
             </exec>
             
-            <copy todir="${basedir}/compiled/lib/${os.shell}">
-                <fileset dir="${basedir}/compiled/common-src/packages/sqlite/lib" includes="*.dylib"/>
-            </copy> 
+            <!-- the libsqlite3.dylib is no longer compatible with Macs from Maverick/Yosemite/El Capitan onwards, so 10.9, 10.10, 10.11, 
+                 but also future versions of darwin, like anything that is version 11+, so major version numbers that are 2 digits or beyond) -->
+            <if><bool>
+                <and>
+                  <contains string="${os.shell}" substring="darwin" casesensitive="false"/>
+                  <not><matches pattern="^(10\.9|10\.[1-9][0-9]|1[1-9]|[2-9][0-9])" string="${os.version}"/></not><!--all darwin before Maverick/10.9-->
+                </and>              
+              </bool>
+              <copy todir="${basedir}/compiled/lib/${os.shell}">
+                <fileset dir="${basedir}/compiled/common-src/packages/sqlite/lib" includes="*.dylib"/>
+              </copy>
+            </if>
+
         </if>