From 60ce290f1dcd9e22d88c692f1193c73cec0249d4 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Fri, 1 Oct 2021 10:36:44 +0200 Subject: [PATCH] Fix XCode build (having same file name between .cpp and .mm is a bad use case) and test in CI (cherry picked from commit daa56cc77cbd683a5a0fc37d917a0329de65d71f) --- linphone-app/CMakeLists.txt | 2 +- .../{DesktopToolsMacOs.mm => DesktopToolsMacOsNative.mm} | 0 tools/app_notarization.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename linphone-app/src/components/other/desktop-tools/{DesktopToolsMacOs.mm => DesktopToolsMacOsNative.mm} (100%) diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt index 050c052ef..95a900923 100644 --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -312,7 +312,7 @@ if (APPLE) src/app/single-application/SingleApplication.cpp src/components/core/event-count-notifier/EventCountNotifierMacOs.m src/components/other/desktop-tools/DesktopToolsMacOs.cpp - src/components/other/desktop-tools/DesktopToolsMacOs.mm + src/components/other/desktop-tools/DesktopToolsMacOsNative.mm src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m src/components/other/desktop-tools/state-process/StateProcessMacOs.mm ) diff --git a/linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.mm b/linphone-app/src/components/other/desktop-tools/DesktopToolsMacOsNative.mm similarity index 100% rename from linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.mm rename to linphone-app/src/components/other/desktop-tools/DesktopToolsMacOsNative.mm diff --git a/tools/app_notarization.sh b/tools/app_notarization.sh index 9677877d6..ca3b5fffb 100755 --- a/tools/app_notarization.sh +++ b/tools/app_notarization.sh @@ -23,7 +23,7 @@ do xcrun_result=$? if [ "${xcrun_result}" != "0" ] then - if [ ${trycount} -lt 4 ] + if [ "${trycount}" -lt 4 ] then tryCount=$((tryCount+1)) sleep 60