From caa8b0ca1a7444a960160ffb11e315eca53be2fc Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 5 Mar 2021 13:03:21 +0100 Subject: [PATCH 1/7] give qt5 a show for brew --- CI/before_install.osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index ba0ff00ca7..d054158206 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -7,7 +7,7 @@ HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || tru # Some of these tools can come from places other than brew, so check before installing command -v ccache >/dev/null 2>&1 || brew install ccache command -v cmake >/dev/null 2>&1 || brew install cmake -command -v qmake >/dev/null 2>&1 || brew install qt +command -v qmake >/dev/null 2>&1 || brew install qt5 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-f8918dd.zip -o ~/openmw-deps.zip unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null From 17059cefea659458e2550355593cc7bb47fbca5e Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 5 Mar 2021 13:07:26 +0100 Subject: [PATCH 2/7] give qt@5 a try --- CI/before_install.osx.sh | 2 +- CI/before_script.osx.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index d054158206..9adf4dfa5e 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -7,7 +7,7 @@ HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || tru # Some of these tools can come from places other than brew, so check before installing command -v ccache >/dev/null 2>&1 || brew install ccache command -v cmake >/dev/null 2>&1 || brew install cmake -command -v qmake >/dev/null 2>&1 || brew install qt5 +command -v qmake >/dev/null 2>&1 || brew install qt@5 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-f8918dd.zip -o ~/openmw-deps.zip unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index 8f9be16e1a..36fa792991 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -4,7 +4,7 @@ export CXX=clang++ export CC=clang DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps" -QT_PATH=$(brew --prefix qt) +QT_PATH=$(brew --prefix qt@5) CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache mkdir build cd build From 87ede9284bafd264d0d8371cf9f15c0f87d6203f Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 5 Mar 2021 13:08:38 +0100 Subject: [PATCH 3/7] be more explicit --- CI/before_install.osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 9adf4dfa5e..49b2fbe167 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh -ex # workaround python issue on travis HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.8 || true From 8fc0f965bb04de2f857a9c567699545e92aa1179 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 5 Mar 2021 13:10:22 +0100 Subject: [PATCH 4/7] which qmake? --- CI/before_install.osx.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 49b2fbe167..d8832d90ea 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -9,5 +9,8 @@ command -v ccache >/dev/null 2>&1 || brew install ccache command -v cmake >/dev/null 2>&1 || brew install cmake command -v qmake >/dev/null 2>&1 || brew install qt@5 +qmake --version +which qmake + curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-f8918dd.zip -o ~/openmw-deps.zip unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null From f03beb796359af18637ed3b8e1dbe822803f55df Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 5 Mar 2021 13:12:42 +0100 Subject: [PATCH 5/7] uninstall qt@6 --- CI/before_install.osx.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index d8832d90ea..9d0774d3ca 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -3,6 +3,7 @@ # workaround python issue on travis HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.8 || true HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || true +HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies qt@6 || true # Some of these tools can come from places other than brew, so check before installing command -v ccache >/dev/null 2>&1 || brew install ccache From 53cb20454ff9249dda40e30c0f3d1bc5a4590f1c Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 5 Mar 2021 13:20:03 +0100 Subject: [PATCH 6/7] add path hack only to verify, will remove later --- CI/before_install.osx.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 9d0774d3ca..b38e04a061 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -10,6 +10,7 @@ command -v ccache >/dev/null 2>&1 || brew install ccache command -v cmake >/dev/null 2>&1 || brew install cmake command -v qmake >/dev/null 2>&1 || brew install qt@5 +export PATH="/usr/local/opt/qt@5/bin:$PATH" qmake --version which qmake From 9fbb530dde4d95e1881a5a83b12125ede46e786a Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 5 Mar 2021 13:25:46 +0100 Subject: [PATCH 7/7] be explicit and print version information to verification --- CI/before_install.osx.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index b38e04a061..6dad0abc19 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -9,10 +9,11 @@ HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies qt@6 || true command -v ccache >/dev/null 2>&1 || brew install ccache command -v cmake >/dev/null 2>&1 || brew install cmake command -v qmake >/dev/null 2>&1 || brew install qt@5 +export PATH="/usr/local/opt/qt@5/bin:$PATH" # needed to use qmake in none default path as qt now points to qt6 -export PATH="/usr/local/opt/qt@5/bin:$PATH" +ccache --version +cmake --version qmake --version -which qmake curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-f8918dd.zip -o ~/openmw-deps.zip unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null