Add universal binary for Mimer SQL on macOS

Do not use the Mimer SQL installer on macOS since it is not universal.
Instead, use an archive with the needed library and include files.
Use a universal binary on all macOS version from 11 and up.

Fixes: QTBUG-111219
Change-Id: I4a3716b1207ee966f36e977fe5f9d1016fb9efcb
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 3d354bf9c056eaa09082abac2f42ef96b820b652)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

10 files changed, 22 insertions, 18 deletions

diff --git a/coin/provisioning/common/macos/mimersql.sh b/coin/provisioning/common/macos/mimersql.sh
index 9d65c188..4f207700 100755
--- a/coin/provisioning/common/macos/mimersql.sh
+++ b/coin/provisioning/common/macos/mimersql.sh
@@ -7,22 +7,26 @@
 # Mimer SQL is needed for Qt to be able to support Mimer SQL
 
 set -ex
+os="$1"
 
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
-arch=$(uname -m)
-
 mimerSqlVersion="11.0.7G"
-if [ "$arch" = "x86_64" ]; then
-    mimerSqlPackageName="mimersql-${mimerSqlVersion}-x86.pkg"
-    SHA1="e8129e66cef8a1cf6639895963ce6155e0acfa90"
+if [ "$os" = "macos" ]; then
+    arch=$(uname -m)
+    if [ "$arch" = "x86_64" ]; then
+        mimerSqlPackageName="mimersql-110_x86_64.tgz"
+        SHA1="d748f87b72e7188c527f131db2590f552f18f544"
+    else
+        mimerSqlPackageName="mimersql-110_arm64.tgz"
+        SHA1="f209c97074d096e50e637441073e8aa355c5116e"
+    fi
 else
-    mimerSqlPackageName="mimersql-${mimerSqlVersion}-macosarm_64.pkg"
-    SHA1="82ded8637e5ba79532b552dcfb385d158d6abf74"
+    mimerSqlPackageName="mimersql-110_universal.tgz"
+    SHA1="eab32be623f1cbde7c29cea0f0ca4332b8ca502b"
 fi
 
-
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/mac/$mimerSqlPackageName"
 AltUrl="https://install.mimer.com/qt/macOS/$mimerSqlPackageName"
 appPrefix=""
@@ -30,7 +34,7 @@ appPrefix=""
 DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp/$mimerSqlPackageName"
 
 echo "Installing $mimerSqlPackageName"
-sudo installer -pkg /tmp/$mimerSqlPackageName -target /
+tar -C /usr/local -zxf /tmp/$mimerSqlPackageName
 
 echo "Removing $mimerSqlPackageName"
 rm "/tmp/$mimerSqlPackageName"
diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/98-mimersql.sh b/coin/provisioning/qtci-macos-10.15-x86_64/98-mimersql.sh
index d64c9ff6..75be3f12 100755
--- a/coin/provisioning/qtci-macos-10.15-x86_64/98-mimersql.sh
+++ b/coin/provisioning/qtci-macos-10.15-x86_64/98-mimersql.sh
@@ -2,4 +2,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/mimersql.sh"
+"$BASEDIR/../common/macos/mimersql.sh" "macos"
diff --git a/coin/provisioning/qtci-macos-11-arm/98-mimersql.sh b/coin/provisioning/qtci-macos-11-arm/98-mimersql.sh
index d64c9ff6..70d5bc1d 100755
--- a/coin/provisioning/qtci-macos-11-arm/98-mimersql.sh
+++ b/coin/provisioning/qtci-macos-11-arm/98-mimersql.sh
@@ -2,4 +2,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/mimersql.sh"
+"$BASEDIR/../common/macos/mimersql.sh" "macos-universal"
diff --git a/coin/provisioning/qtci-macos-11-x86_64/98-mimersql.sh b/coin/provisioning/qtci-macos-11-x86_64/98-mimersql.sh
index d64c9ff6..70d5bc1d 100755
--- a/coin/provisioning/qtci-macos-11-x86_64/98-mimersql.sh
+++ b/coin/provisioning/qtci-macos-11-x86_64/98-mimersql.sh
@@ -2,4 +2,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/mimersql.sh"
+"$BASEDIR/../common/macos/mimersql.sh" "macos-universal"
diff --git a/coin/provisioning/qtci-macos-12-arm/98-mimersql.sh b/coin/provisioning/qtci-macos-12-arm/98-mimersql.sh
index d64c9ff6..70d5bc1d 100755
--- a/coin/provisioning/qtci-macos-12-arm/98-mimersql.sh
+++ b/coin/provisioning/qtci-macos-12-arm/98-mimersql.sh
@@ -2,4 +2,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/mimersql.sh"
+"$BASEDIR/../common/macos/mimersql.sh" "macos-universal"
diff --git a/coin/provisioning/qtci-macos-12-x86_64/98-mimersql.sh b/coin/provisioning/qtci-macos-12-x86_64/98-mimersql.sh
index d64c9ff6..70d5bc1d 100755
--- a/coin/provisioning/qtci-macos-12-x86_64/98-mimersql.sh
+++ b/coin/provisioning/qtci-macos-12-x86_64/98-mimersql.sh
@@ -2,4 +2,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/mimersql.sh"
+"$BASEDIR/../common/macos/mimersql.sh" "macos-universal"
diff --git a/coin/provisioning/qtci-macos-13-arm/98-mimersql.sh b/coin/provisioning/qtci-macos-13-arm/98-mimersql.sh
index d64c9ff6..70d5bc1d 100755
--- a/coin/provisioning/qtci-macos-13-arm/98-mimersql.sh
+++ b/coin/provisioning/qtci-macos-13-arm/98-mimersql.sh
@@ -2,4 +2,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/mimersql.sh"
+"$BASEDIR/../common/macos/mimersql.sh" "macos-universal"
diff --git a/coin/provisioning/qtci-macos-13-x86_64/98-mimersql.sh b/coin/provisioning/qtci-macos-13-x86_64/98-mimersql.sh
index d64c9ff6..70d5bc1d 100755
--- a/coin/provisioning/qtci-macos-13-x86_64/98-mimersql.sh
+++ b/coin/provisioning/qtci-macos-13-x86_64/98-mimersql.sh
@@ -2,4 +2,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/mimersql.sh"
+"$BASEDIR/../common/macos/mimersql.sh" "macos-universal"
diff --git a/coin/provisioning/qtci-macos-14-arm/98-mimersql.sh b/coin/provisioning/qtci-macos-14-arm/98-mimersql.sh
index d64c9ff6..70d5bc1d 100755
--- a/coin/provisioning/qtci-macos-14-arm/98-mimersql.sh
+++ b/coin/provisioning/qtci-macos-14-arm/98-mimersql.sh
@@ -2,4 +2,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/mimersql.sh"
+"$BASEDIR/../common/macos/mimersql.sh" "macos-universal"
diff --git a/coin/provisioning/qtci-macos-14-x86_64/98-mimersql.sh b/coin/provisioning/qtci-macos-14-x86_64/98-mimersql.sh
index d64c9ff6..70d5bc1d 100755
--- a/coin/provisioning/qtci-macos-14-x86_64/98-mimersql.sh
+++ b/coin/provisioning/qtci-macos-14-x86_64/98-mimersql.sh
@@ -2,4 +2,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/mimersql.sh"
+"$BASEDIR/../common/macos/mimersql.sh" "macos-universal"