diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml index 8f2ff9999..ecceb20e5 100644 --- a/.gitlab-ci-files/macosx-desktop.yml +++ b/.gitlab-ci-files/macosx-desktop.yml @@ -18,6 +18,8 @@ echo $DEFAULT_MACOS_CMAKE_OPTIONS echo $CMAKE_OPTIONS echo $ADDITIONAL_BUILD_OPTIONS + echo $MAKE_RELEASE_FILE_URL + echo $RELEASE_FILE cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_OSX_DEPLOYMENT_TARGET=12.3 -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_MACOS_CMAKE_OPTIONS -DLINPHONE_BUILDER_SIGNING_IDENTITY="$MACOS_SIGNING_IDENTITY" -DLINPHONEAPP_APPLICATION_NAME="$APPLICATION_NAME" -DLINPHONEAPP_EXECUTABLE_NAME="$EXECUTABLE_NAME" $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $RELEASE_FILE cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS -- $ADDITIONAL_BUILD_OPTIONS ccache -s diff --git a/.gitlab-ci-files/windows-desktop.yml b/.gitlab-ci-files/windows-desktop.yml index 9ee55c2df..ec2fa509d 100644 --- a/.gitlab-ci-files/windows-desktop.yml +++ b/.gitlab-ci-files/windows-desktop.yml @@ -51,6 +51,8 @@ - Write-Output $SET_EXIT_CODE_BASED_ON_SEARCH_STATUS - Write-Output $SHOW_SEARCH_STATUS_SCRIPT - Write-Output $LAUNCH_SEARCH_STATUS_SCRIPT + - Write-Output $MAKE_RELEASE_FILE_URL + - Write-Output $RELEASE_FILE #We are forced to use Invoke-Expression to explain to powershell that we don't want it to touch to spaces in arguments #If we don't use it, '-A Win32' will be interpreted as "-A ' Win32'" thus making the build fail - echo $LastExitCode diff --git a/cmake/install/install.cmake b/cmake/install/install.cmake index 66bb9a845..a1f90e99c 100644 --- a/cmake/install/install.cmake +++ b/cmake/install/install.cmake @@ -304,7 +304,7 @@ if(${ENABLE_APP_PACKAGING}) install(SCRIPT "${CMAKE_BINARY_DIR}/cmake/install/packaging.cmake") if(LINPHONE_SDK_MAKE_RELEASE_FILE_URL) bc_make_release_file("${LINPHONEAPP_VERSION}" "${LINPHONE_SDK_MAKE_RELEASE_FILE_URL}/${CPACK_PACKAGE_FILE_NAME}.${PACKAGE_EXT}") - file(RENAME "${CMAKE_INSTALL_PREFIX}/RELEASE" "${CMAKE_INSTALL_PREFIX}/Packages/RELEASE") + file(COPY "${CMAKE_INSTALL_PREFIX}/RELEASE" DESTINATION "${CMAKE_INSTALL_PREFIX}/Packages/") endif() include(CPack) endif() diff --git a/external/linphone-sdk b/external/linphone-sdk index 5711bcc19..a27a9c8c7 160000 --- a/external/linphone-sdk +++ b/external/linphone-sdk @@ -1 +1 @@ -Subproject commit 5711bcc198fdc48665e36bd78fe987b33c281c81 +Subproject commit a27a9c8c7df88b1c1939500e34b6008dc06fa75b