From 49454aef5c2ec36e837df6ba38d30e1076a49b8a Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 2 Nov 2021 18:45:37 +0100 Subject: [PATCH] Fix tunnel build and Mac deployment on generic dmg --- .gitlab-ci-files/job-macosx-desktop.yml | 2 +- .../linphone_package/packaging.cmake.in | 4 +-- linphone-app/src/config.h.cmake | 4 +-- linphone-app/tools/create_appimage.sh | 25 ++++++++++--------- linphone-sdk | 2 +- tools/app_notarization.sh | 2 +- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci-files/job-macosx-desktop.yml b/.gitlab-ci-files/job-macosx-desktop.yml index 519a408a4..b6032e737 100644 --- a/.gitlab-ci-files/job-macosx-desktop.yml +++ b/.gitlab-ci-files/job-macosx-desktop.yml @@ -115,7 +115,7 @@ job-macosx-codesigning: - $DEPLOY_MACOSX script: - cd build - - codesign --options runtime,library --verbose -s "$MACOS_SIGNING_IDENTITY" OUTPUT/Packages/Linphone*.dmg + - codesign --options runtime,library --verbose -s "$MACOS_SIGNING_IDENTITY" OUTPUT/Packages/*.dmg - ./../tools/app_notarization.sh artifacts: when: always diff --git a/linphone-app/cmake_builder/linphone_package/packaging.cmake.in b/linphone-app/cmake_builder/linphone_package/packaging.cmake.in index c8b3852bb..ed0b76d04 100644 --- a/linphone-app/cmake_builder/linphone_package/packaging.cmake.in +++ b/linphone-app/cmake_builder/linphone_package/packaging.cmake.in @@ -63,9 +63,9 @@ if (NOT "${CMAKE_INSTALL_PREFIX}" MATCHES .*/_CPack_Packages/.*) set(ENV QML_MODULES_PATHS="@QML_MODULES_PATHS@") execute_process( COMMAND mkdir -p "WORK/Packages/AppImageDir/" WORKING_DIRECTORY "@CMAKE_INSTALL_PREFIX@/..") execute_process( COMMAND cp -rf "@CMAKE_CURRENT_SOURCE_DIR@/../../ui" "WORK/Packages/AppImageDir/" WORKING_DIRECTORY "@CMAKE_INSTALL_PREFIX@/..") - execute_process( COMMAND "@CMAKE_CURRENT_SOURCE_DIR@/../../tools/create_appimage.sh" @CPACK_PACKAGE_FILE_NAME@ @LINPHONE_BUILDER_SIGNING_IDENTITY@ @LINPHONE_BUILDER_SIGNING_PASSPHRASE@ RESULT_VARIABLE CPACK_COMMAND_RESULT WORKING_DIRECTORY "@CMAKE_INSTALL_PREFIX@/.." ) + execute_process( COMMAND "@CMAKE_CURRENT_SOURCE_DIR@/../../tools/create_appimage.sh" @EXECUTABLE_NAME@ @CPACK_PACKAGE_FILE_NAME@ @LINPHONE_BUILDER_SIGNING_IDENTITY@ @LINPHONE_BUILDER_SIGNING_PASSPHRASE@ RESULT_VARIABLE CPACK_COMMAND_RESULT WORKING_DIRECTORY "@CMAKE_INSTALL_PREFIX@/.." ) if(CPACK_COMMAND_RESULT) - message(FATAL_ERROR "Failed to create AppImage package with this command : '@CMAKE_CURRENT_SOURCE_DIR@/../../tools/create_appimage.sh @APP_PROJECT_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@ @APP_PROJECT_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() if (@PERFORM_SIGNING@) diff --git a/linphone-app/src/config.h.cmake b/linphone-app/src/config.h.cmake index 92bc19c6c..1cc4b8df1 100644 --- a/linphone-app/src/config.h.cmake +++ b/linphone-app/src/config.h.cmake @@ -25,8 +25,8 @@ #cmakedefine APPLICATION_NAME "${APPLICATION_NAME}" #cmakedefine APPLICATION_VENDOR "${APPLICATION_VENDOR}" #cmakedefine APPLICATION_URL "${APPLICATION_URL}" +#cmakedefine APPLICATION_LICENCE "${APPLICATION_LICENCE}" +#cmakedefine COPYRIGHT_RANGE_DATE "${COPYRIGHT_RANGE_DATE}" #cmakedefine ENABLE_UPDATE_CHECK 1 #cmakedefine EXECUTABLE_NAME "${EXECUTABLE_NAME}" #cmakedefine MSPLUGINS_DIR "${MSPLUGINS_DIR}" -#cmakedefine APPLICATION_LICENCE "${APPLICATION_LICENCE}" -#cmakedefine COPYRIGHT_RANGE_DATE "${COPYRIGHT_RANGE_DATE}" \ No newline at end of file diff --git a/linphone-app/tools/create_appimage.sh b/linphone-app/tools/create_appimage.sh index 5b28080f5..d3399c01b 100755 --- a/linphone-app/tools/create_appimage.sh +++ b/linphone-app/tools/create_appimage.sh @@ -20,11 +20,12 @@ ## # Arguments : -# $1 = Output Filename -# $2 = Key of the code sign (optional but mendatory if code signing) -# $3 = Passphrase of the code sign (Optional) +# $1 = Executable Name +# $2 = Output Filename +# $3 = Key of the code sign (optional but mendatory if code signing) +# $4 = Passphrase of the code sign (Optional) -APP_NAME="linphone" +APP_NAME="$1" BIN_SOURCE_DIR="OUTPUT/" @@ -73,8 +74,8 @@ fi export QML_SOURCES_PATHS=${QML_SOURCES_PATHS}:${WORK_DIR}/.. echo "-- Generating AppDir for AppImage" -if [ -z "$2" ]; then - ./${WORK_DIR}/AppBin/linuxdeploy-x86_64.AppImage --appdir=${WORK_DIR}/AppDir -e ${WORK_DIR}/AppDir/usr/bin/linphone --output appimage --desktop-file=${WORK_DIR}/AppDir/usr/share/applications/linphone.desktop -i ${WORK_DIR}/AppDir/usr/share/icons/hicolor/scalable/apps/linphone.svg --plugin qt +if [ -z "$3" ]; then + ./${WORK_DIR}/AppBin/linuxdeploy-x86_64.AppImage --appdir=${WORK_DIR}/AppDir -e ${WORK_DIR}/AppDir/usr/bin/${APP_NAME} --output appimage --desktop-file=${WORK_DIR}/AppDir/usr/share/applications/${APP_NAME}.desktop -i ${WORK_DIR}/AppDir/usr/share/icons/hicolor/scalable/apps/${APP_NAME}.svg --plugin qt else if [ -f "${WORK_DIR}/AppBin/appimagetool-x86_64.AppImage" ]; then echo "appimagetool-x86_64.AppImage exists" @@ -82,15 +83,15 @@ else wget -P "${WORK_DIR}/AppBin" https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage chmod +x "${WORK_DIR}/AppBin/appimagetool-x86_64.AppImage" fi - ./${WORK_DIR}/AppBin/linuxdeploy-x86_64.AppImage --appdir=${WORK_DIR}/AppDir -e ${WORK_DIR}/AppDir/usr/bin/linphone --desktop-file=${WORK_DIR}/AppDir/usr/share/applications/linphone.desktop -i ${WORK_DIR}/AppDir/usr/share/icons/hicolor/scalable/apps/linphone.svg --plugin qt - #./linuxdeploy-x86_64.AppImage --appdir=${WORK_DIR}/ -e ${WORK_DIR}/app/bin/linphone --output appimage --desktop-file=${WORK_DIR}/app/share/applications/linphone.desktop -i ${WORK_DIR}/app/share/icons/hicolor/scalable/apps/linphone.svg + ./${WORK_DIR}/AppBin/linuxdeploy-x86_64.AppImage --appdir=${WORK_DIR}/AppDir -e ${WORK_DIR}/AppDir/usr/bin/${APP_NAME} --desktop-file=${WORK_DIR}/AppDir/usr/share/applications/${APP_NAME}.desktop -i ${WORK_DIR}/AppDir/usr/share/icons/hicolor/scalable/apps/${APP_NAME}.svg --plugin qt + #./linuxdeploy-x86_64.AppImage --appdir=${WORK_DIR}/ -e ${WORK_DIR}/app/bin/${APP_NAME} --output appimage --desktop-file=${WORK_DIR}/app/share/applications/${APP_NAME}.desktop -i ${WORK_DIR}/app/share/icons/hicolor/scalable/apps/${APP_NAME}.svg echo "-- Code Signing of AppImage" - if [ -z "$3" ]; then - ./${WORK_DIR}/AppBin/appimagetool-x86_64.AppImage ${WORK_DIR}/AppDir --sign --sign-key $2 + if [ -z "$4" ]; then + ./${WORK_DIR}/AppBin/appimagetool-x86_64.AppImage ${WORK_DIR}/AppDir --sign --sign-key $3 else - ./${WORK_DIR}/AppBin/appimagetool-x86_64.AppImage ${WORK_DIR}/AppDir --sign --sign-key $2 --sign-args "--pinentry-mode loopback --passphrase $3" + ./${WORK_DIR}/AppBin/appimagetool-x86_64.AppImage ${WORK_DIR}/AppDir --sign --sign-key $3 --sign-args "--pinentry-mode loopback --passphrase $4" fi fi mkdir -p "${BIN_SOURCE_DIR}/Packages" -mv Linphone*.AppImage "${BIN_SOURCE_DIR}/Packages/$1.AppImage" +mv *.AppImage "${BIN_SOURCE_DIR}/Packages/$2.AppImage" diff --git a/linphone-sdk b/linphone-sdk index 8ba537672..6f1485a2d 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 8ba537672473b72f0bd547f59e1472a2610f5f38 +Subproject commit 6f1485a2de0507a51087c81d6f457df8e6a496cd diff --git a/tools/app_notarization.sh b/tools/app_notarization.sh index 8e2128835..3d6debdea 100755 --- a/tools/app_notarization.sh +++ b/tools/app_notarization.sh @@ -3,7 +3,7 @@ #Notarization for Mac. Launch it from the build folder #rm notarize_result.plist -FILES=OUTPUT/Packages/Linphone*.dmg +FILES=OUTPUT/Packages/*.dmg for f in $FILES do linphone_file=$f