data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix packaging + update SDK

Browse source
This commit is contained in:
Julien Wadel 2025-02-03 09:10:30 +01:00
parent ac8e0f146c
commit ebba8f342f
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,8 @@
echo $DEFAULT_MACOS_CMAKE_OPTIONS echo $DEFAULT_MACOS_CMAKE_OPTIONS
echo $CMAKE_OPTIONS echo $CMAKE_OPTIONS
echo $ADDITIONAL_BUILD_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 .. -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 cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS -- $ADDITIONAL_BUILD_OPTIONS
ccache -s ccache -s

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

@ -51,6 +51,8 @@
- Write-Output $SET_EXIT_CODE_BASED_ON_SEARCH_STATUS - Write-Output $SET_EXIT_CODE_BASED_ON_SEARCH_STATUS
- Write-Output $SHOW_SEARCH_STATUS_SCRIPT - Write-Output $SHOW_SEARCH_STATUS_SCRIPT
- Write-Output $LAUNCH_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 #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 #If we don't use it, '-A Win32' will be interpreted as "-A ' Win32'" thus making the build fail
- echo $LastExitCode - echo $LastExitCode

2
cmake/install/install.cmake
View file

@ -304,7 +304,7 @@ if(${ENABLE_APP_PACKAGING})
install(SCRIPT "${CMAKE_BINARY_DIR}/cmake/install/packaging.cmake") install(SCRIPT "${CMAKE_BINARY_DIR}/cmake/install/packaging.cmake")
if(LINPHONE_SDK_MAKE_RELEASE_FILE_URL) 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}") 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() endif()
include(CPack) include(CPack)
endif() endif()

2
external/linphone-sdk vendored

@ -1 +1 @@
Subproject commit 5711bcc198fdc48665e36bd78fe987b33c281c81 Subproject commit a27a9c8c7df88b1c1939500e34b6008dc06fa75b