mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 03:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Bugsplat database parameters to build.

Browse source 
Fix crash on call at startup.
This commit is contained in:
Julien Wadel 2026-01-06 11:52:49 +01:00
parent c88d9a7f2a
commit d9e5050a40
7 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci-files/windows-desktop.yml
View file

@ -193,7 +193,7 @@ win64-ninja-vs2022-scheduled-windows:
- if: $NIGHTLY_MASTER - if: $NIGHTLY_MASTER
- if: $DEPLOY_WINDOWS - if: $DEPLOY_WINDOWS
variables: variables:
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=OFF -DENABLE_BUGSPLAT_SYMBOLS_UPLOAD=ON -DBUGSPPLAT_CLIENT_ID=$BUGSPPLAT_CLIENT_ID -DBUGSPPLAT_CLIENT_SECRET=$BUGSPPLAT_CLIENT_SECRET CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=OFF -DENABLE_BUGSPLAT_SYMBOLS_UPLOAD=ON -DBUGSPLAT_CLIENT_ID=$BUGSPLAT_CLIENT_ID -DBUGSPLAT_CLIENT_SECRET=$BUGSPLAT_CLIENT_SECRET -DBUGSPLAT_DATABASE=$BUGSPLAT_DATABASE
RELEASE_FILE: -DLINPHONE_SDK_MAKE_RELEASE_FILE_URL=$MAKE_RELEASE_FILE_URL/$WINDOWS_PLATFORM/$APP_FOLDER RELEASE_FILE: -DLINPHONE_SDK_MAKE_RELEASE_FILE_URL=$MAKE_RELEASE_FILE_URL/$WINDOWS_PLATFORM/$APP_FOLDER
win64-ninja-vs2022-package-windows: win64-ninja-vs2022-package-windows:

5
CMakeLists.txt
View file

@ -186,8 +186,9 @@ add_option(OPTION_LIST ENABLE_OPENH264 "Enable the use of OpenH264 codec" ${ENAB
add_option(OPTION_LIST ENABLE_SCREENSHARING "Enable screen sharing." ${ENABLE_VIDEO}) add_option(OPTION_LIST ENABLE_SCREENSHARING "Enable screen sharing." ${ENABLE_VIDEO})
add_option(OPTION_LIST ENABLE_BUGSPLAT_SYMBOLS_UPLOAD "Generate and upload symbols to Bugsplat." OFF) add_option(OPTION_LIST ENABLE_BUGSPLAT_SYMBOLS_UPLOAD "Generate and upload symbols to Bugsplat." OFF)
add_cache(OPTION_LIST BUGSPPLAT_CLIENT_ID "Client ID for Bugsplat." "") add_cache(OPTION_LIST BUGSPLAT_CLIENT_ID "Client ID for Bugsplat." "")
add_cache(OPTION_LIST BUGSPPLAT_CLIENT_SECRET "Client Secret for Bugsplat." "") add_cache(OPTION_LIST BUGSPLAT_CLIENT_SECRET "Client Secret for Bugsplat." "")
add_cache(OPTION_LIST BUGSPLAT_DATABASE "Database name for Bugsplat." "Linphone")

1
Linphone/application_info.cmake
View file

@ -7,6 +7,5 @@ set(APPLICATION_LICENCE "GNU General Public License V3")
set(APPLICATION_LICENCE_URL "https://www.gnu.org/licenses/gpl-3.0.html") set(APPLICATION_LICENCE_URL "https://www.gnu.org/licenses/gpl-3.0.html")
set(APPLICATION_START_LICENCE "2010") set(APPLICATION_START_LICENCE "2010")
set(APPLICATION_SEMVER ${LINPHONEAPP_VERSION}) set(APPLICATION_SEMVER ${LINPHONEAPP_VERSION})
set(BUGSPLAT_DATABASE "Linphone")
set(EXECUTABLE_NAME ${LINPHONEAPP_EXECUTABLE_NAME}) set(EXECUTABLE_NAME ${LINPHONEAPP_EXECUTABLE_NAME})

4
Linphone/model/core/CoreModel.cpp
View file

@ -460,7 +460,9 @@ void CoreModel::onCallStateChanged(const std::shared_ptr<linphone::Core> &core,
SettingsModel::getInstance()->setCallToneIndicationsEnabled(false); SettingsModel::getInstance()->setCallToneIndicationsEnabled(false);
} }
App::postModelAsync([core]() { App::postModelAsync([core]() {
for (int i = 0; i < App::getInstance()->getAccountList()->rowCount(); ++i) { auto accounts = App::getInstance()->getAccountList();
if(!accounts) return;
for (int i = 0; i < accounts->rowCount(); ++i) {
auto accountCore = App::getInstance()->getAccountList()->getAt<AccountCore>(i); auto accountCore = App::getInstance()->getAccountList()->getAt<AccountCore>(i);
emit accountCore->lSetPresence(core->getCallsNb() == 0 ? LinphoneEnums::Presence::Online emit accountCore->lSetPresence(core->getCallsNb() == 0 ? LinphoneEnums::Presence::Online
: LinphoneEnums::Presence::Busy, : LinphoneEnums::Presence::Busy,

4
cmake/install/cleanCPack.cmake.in
View file

@ -77,7 +77,7 @@ elseif(WIN32)
# --dir "${CMAKE_CURRENT_BINARY_DIR}/winqt/" # --dir "${CMAKE_CURRENT_BINARY_DIR}/winqt/"
if(@ENABLE_BUGSPLAT_SYMBOLS_UPLOAD@) if(@ENABLE_BUGSPLAT_SYMBOLS_UPLOAD@)
message(STATUS "Uploading Bugsplat symbols from ${CPACK_TEMPORARY_INSTALL_DIRECTORY}") message(STATUS "Uploading Bugsplat symbols from ${CPACK_TEMPORARY_INSTALL_DIRECTORY}")
execute_process(COMMAND "@CRASHPAD_SYMBOLS_UPLOADER@" -m -b @BUGSPLAT_DATABASE@ -a "@LINPHONEAPP_APPLICATION_NAME@" -v "@LINPHONEAPP_VERSION@" -f "**/*.{pdb,exe,dll}" -d "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/@CMAKE_INSTALL_BINDIR@" --clientId "@BUGSPPLAT_CLIENT_ID@" --clientSecret "@BUGSPPLAT_CLIENT_SECRET@" execute_process(COMMAND "@CRASHPAD_SYMBOLS_UPLOADER@" -m -b @BUGSPLAT_DATABASE@ -a "@LINPHONEAPP_APPLICATION_NAME@" -v "@LINPHONEAPP_VERSION@" -f "**/*.{pdb,exe,dll}" -d "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/@CMAKE_INSTALL_BINDIR@" --clientId "@BUGSPLAT_CLIENT_ID@" --clientSecret "@BUGSPLAT_CLIENT_SECRET@"
WORKING_DIRECTORY ${CPACK_TEMPORARY_INSTALL_DIRECTORY} WORKING_DIRECTORY ${CPACK_TEMPORARY_INSTALL_DIRECTORY}
RESULT_VARIABLE CPACK_COMMAND_RESULT RESULT_VARIABLE CPACK_COMMAND_RESULT
COMMAND_ECHO NONE COMMAND_ECHO NONE
@ -85,7 +85,7 @@ elseif(WIN32)
if(CPACK_COMMAND_RESULT) if(CPACK_COMMAND_RESULT)
message(FATAL_ERROR "Failed to upload symbols! ${CPACK_COMMAND_RESULT}") message(FATAL_ERROR "Failed to upload symbols! ${CPACK_COMMAND_RESULT}")
endif() endif()
execute_process(COMMAND "@CRASHPAD_SYMBOLS_UPLOADER@" -m -b @BUGSPLAT_DATABASE@ -a "@LINPHONEAPP_APPLICATION_NAME@" -v "@LINPHONEAPP_VERSION@" -f "**/*.{pdb,exe,dll}" -d "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/@CMAKE_INSTALL_LIBDIR@/mediastreamer/plugins" --clientId "@BUGSPPLAT_CLIENT_ID@" --clientSecret "@BUGSPPLAT_CLIENT_SECRET@" execute_process(COMMAND "@CRASHPAD_SYMBOLS_UPLOADER@" -m -b @BUGSPLAT_DATABASE@ -a "@LINPHONEAPP_APPLICATION_NAME@" -v "@LINPHONEAPP_VERSION@" -f "**/*.{pdb,exe,dll}" -d "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/@CMAKE_INSTALL_LIBDIR@/mediastreamer/plugins" --clientId "@BUGSPLAT_CLIENT_ID@" --clientSecret "@BUGSPLAT_CLIENT_SECRET@"
WORKING_DIRECTORY ${CPACK_TEMPORARY_INSTALL_DIRECTORY} WORKING_DIRECTORY ${CPACK_TEMPORARY_INSTALL_DIRECTORY}
RESULT_VARIABLE CPACK_COMMAND_RESULT RESULT_VARIABLE CPACK_COMMAND_RESULT
COMMAND_ECHO NONE COMMAND_ECHO NONE

4
cmake/install/install.cmake
View file

@ -144,8 +144,8 @@ if(HAVE_CRASH_HANDLER)
message(FATAL_ERROR "Missing application details for Bugsplat. Please fill LINPHONEAPP_APPLICATION_NAME (${LINPHONEAPP_APPLICATION_NAME} - ${LINPHONEAPP_VERSION})") message(FATAL_ERROR "Missing application details for Bugsplat. Please fill LINPHONEAPP_APPLICATION_NAME (${LINPHONEAPP_APPLICATION_NAME} - ${LINPHONEAPP_VERSION})")
elseif(NOT BUGSPLAT_DATABASE) elseif(NOT BUGSPLAT_DATABASE)
message(FATAL_ERROR "Missing database application details for Bugsplat. Please fill BUGSPLAT_DATABASE in application_info.cmake") message(FATAL_ERROR "Missing database application details for Bugsplat. Please fill BUGSPLAT_DATABASE in application_info.cmake")
elseif(NOT BUGSPPLAT_CLIENT_ID OR NOT BUGSPPLAT_CLIENT_SECRET) elseif(NOT BUGSPLAT_CLIENT_ID OR NOT BUGSPLAT_CLIENT_SECRET)
message(FATAL_ERROR "Missing identifications for Bugsplat. Please fill BUGSPPLAT_CLIENT_ID and BUGSPPLAT_CLIENT_SECRET to activate symbol uploading") message(FATAL_ERROR "Missing identifications for Bugsplat. Please fill BUGSPLAT_CLIENT_ID and BUGSPLAT_CLIENT_SECRET to activate symbol uploading")
else() else()
message(STATUS "Preparing symbol uploader Bugsplat for ${LINPHONEAPP_APPLICATION_NAME} - ${LINPHONEAPP_VERSION}.") message(STATUS "Preparing symbol uploader Bugsplat for ${LINPHONEAPP_APPLICATION_NAME} - ${LINPHONEAPP_VERSION}.")
if(WIN32) if(WIN32)

4
cmake/install/packaging.cmake.in
View file

@ -70,7 +70,7 @@ if (NOT "${CMAKE_INSTALL_PREFIX}" MATCHES .*/_CPack_Packages/.*)
if(CPACK_COMMAND_RESULT) if(CPACK_COMMAND_RESULT)
message(FATAL_ERROR "Failed to create AppImage package with this command : '@CMAKE_CURRENT_SOURCE_DIR@/../../tools/create_appimage.sh @EXECUTABLE_NAME@ @QT_PATH@ @LINPHONEAPP_VERSION@' at @CMAKE_INSTALL_PREFIX@/..\nMaybe the .appimage already exists and is running. Please remove the file before packaging if it is the case.") message(FATAL_ERROR "Failed to create AppImage package with this command : '@CMAKE_CURRENT_SOURCE_DIR@/../../tools/create_appimage.sh @EXECUTABLE_NAME@ @QT_PATH@ @LINPHONEAPP_VERSION@' at @CMAKE_INSTALL_PREFIX@/..\nMaybe the .appimage already exists and is running. Please remove the file before packaging if it is the case.")
elseif(@ENABLE_BUGSPLAT_SYMBOLS_UPLOAD@) elseif(@ENABLE_BUGSPLAT_SYMBOLS_UPLOAD@)
execute_process(COMMAND "@CRASHPAD_SYMBOLS_UPLOADER@" -m -b @BUGSPLAT_DATABASE@ -a "@LINPHONEAPP_APPLICATION_NAME@" -v "@LINPHONEAPP_VERSION@" -f "@EXECUTABLE_NAME@" --clientId "@BUGSPPLAT_CLIENT_ID@" --clientSecret "@BUGSPPLAT_CLIENT_SECRET@" execute_process(COMMAND "@CRASHPAD_SYMBOLS_UPLOADER@" -m -b @BUGSPLAT_DATABASE@ -a "@LINPHONEAPP_APPLICATION_NAME@" -v "@LINPHONEAPP_VERSION@" -f "@EXECUTABLE_NAME@" --clientId "@BUGSPLAT_CLIENT_ID@" --clientSecret "@BUGSPLAT_CLIENT_SECRET@"
WORKING_DIRECTORY @CMAKE_INSTALL_PREFIX@/../WORK/Packages/AppImageDir/AppDir/usr/bin/ WORKING_DIRECTORY @CMAKE_INSTALL_PREFIX@/../WORK/Packages/AppImageDir/AppDir/usr/bin/
RESULT_VARIABLE CPACK_COMMAND_RESULT RESULT_VARIABLE CPACK_COMMAND_RESULT
COMMAND_ECHO NONE COMMAND_ECHO NONE
@ -78,7 +78,7 @@ if (NOT "${CMAKE_INSTALL_PREFIX}" MATCHES .*/_CPack_Packages/.*)
if(CPACK_COMMAND_RESULT) if(CPACK_COMMAND_RESULT)
message(FATAL_ERROR "Failed to upload symbols: '@CMAKE_CURRENT_SOURCE_DIR@/../../tools/create_appimage.sh @EXECUTABLE_NAME@ @QT_PATH@ @LINPHONEAPP_VERSION@' at @CMAKE_INSTALL_PREFIX@/..\nMaybe the .appimage already exists and is running. Please remove the file before packaging if it is the case.") message(FATAL_ERROR "Failed to upload symbols: '@CMAKE_CURRENT_SOURCE_DIR@/../../tools/create_appimage.sh @EXECUTABLE_NAME@ @QT_PATH@ @LINPHONEAPP_VERSION@' at @CMAKE_INSTALL_PREFIX@/..\nMaybe the .appimage already exists and is running. Please remove the file before packaging if it is the case.")
endif() endif()
execute_process(COMMAND "@CRASHPAD_SYMBOLS_UPLOADER@" -m -b @BUGSPLAT_DATABASE@ -a "@LINPHONEAPP_APPLICATION_NAME@" -v "@LINPHONEAPP_VERSION@" -f "**/*.so{,.*}" --clientId "@BUGSPPLAT_CLIENT_ID@" --clientSecret "@BUGSPPLAT_CLIENT_SECRET@" execute_process(COMMAND "@CRASHPAD_SYMBOLS_UPLOADER@" -m -b @BUGSPLAT_DATABASE@ -a "@LINPHONEAPP_APPLICATION_NAME@" -v "@LINPHONEAPP_VERSION@" -f "**/*.so{,.*}" --clientId "@BUGSPLAT_CLIENT_ID@" --clientSecret "@BUGSPLAT_CLIENT_SECRET@"
WORKING_DIRECTORY @CMAKE_INSTALL_PREFIX@/../WORK/Packages/AppImageDir/AppDir/usr/ WORKING_DIRECTORY @CMAKE_INSTALL_PREFIX@/../WORK/Packages/AppImageDir/AppDir/usr/
RESULT_VARIABLE CPACK_COMMAND_RESULT RESULT_VARIABLE CPACK_COMMAND_RESULT
COMMAND_ECHO NONE COMMAND_ECHO NONE