mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 03:18:07 +00:00
Custom application/executable name
This commit is contained in:
parent
0727b08818
commit
1ad2170336
6 changed files with 11 additions and 8 deletions
|
|
@ -83,7 +83,7 @@ ubuntu2004-makefile-gcc:
|
||||||
- export Qt6_DIR=${QTLIBDIR}/cmake/Qt6
|
- export Qt6_DIR=${QTLIBDIR}/cmake/Qt6
|
||||||
- echo "Using Qt $QT_LINUX_VER at ${QTLIBDIR}"
|
- echo "Using Qt $QT_LINUX_VER at ${QTLIBDIR}"
|
||||||
- cd build
|
- cd build
|
||||||
- cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS
|
- cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE -DLINPHONEAPP_APPLICATION_NAME="$APPLICATION_NAME" -DLINPHONEAPP_EXECUABLE_NAME="$EXECUTABLE_NAME" $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS
|
||||||
- cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS
|
- cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS
|
||||||
extends: .linux-desktop
|
extends: .linux-desktop
|
||||||
<<: *docker_image_platform_and_runner_tag
|
<<: *docker_image_platform_and_runner_tag
|
||||||
|
|
@ -127,7 +127,7 @@ ubuntu2004-makefile-gcc-package:
|
||||||
- eval "$(qtchooser -qt=$QT_LINUX_VER -print-env)"
|
- eval "$(qtchooser -qt=$QT_LINUX_VER -print-env)"
|
||||||
- export PATH=${QTTOOLDIR}:$PATH
|
- export PATH=${QTTOOLDIR}:$PATH
|
||||||
- cd build
|
- cd build
|
||||||
- cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS
|
- cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE -DLINPHONEAPP_APPLICATION_NAME="$APPLICATION_NAME" -DLINPHONEAPP_EXECUABLE_NAME="$EXECUTABLE_NAME" $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS
|
||||||
- cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS
|
- cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
export PATH=${QTTOOLDIR}:$PATH
|
export PATH=${QTTOOLDIR}:$PATH
|
||||||
export Qt6_DIR=${QTLIBDIR}/cmake/Qt6
|
export Qt6_DIR=${QTLIBDIR}/cmake/Qt6
|
||||||
echo "Using Qt $QT_LINUX_VER at ${QTLIBDIR}"
|
echo "Using Qt $QT_LINUX_VER at ${QTLIBDIR}"
|
||||||
cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS
|
cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE -DLINPHONEAPP_APPLICATION_NAME="$APPLICATION_NAME" -DLINPHONEAPP_EXECUABLE_NAME="$EXECUTABLE_NAME" $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS
|
||||||
cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS
|
cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS
|
||||||
|
|
||||||
.linux-desktop:
|
.linux-desktop:
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
echo $DEFAULT_MACOS_CMAKE_OPTIONS
|
echo $DEFAULT_MACOS_CMAKE_OPTIONS
|
||||||
echo $CMAKE_OPTIONS
|
echo $CMAKE_OPTIONS
|
||||||
echo $ADDITIONAL_BUILD_OPTIONS
|
echo $ADDITIONAL_BUILD_OPTIONS
|
||||||
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" $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_EXECUABLE_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
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@
|
||||||
#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
|
||||||
- Invoke-Expression "& cmake .. -G '$CMAKE_GENERATOR' -DLINPHONESDK_PLATFORM=$LINPHONESDK_PLATFORM -DENABLE_CSHARP_WRAPPER=YES -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $NINJA_BUILD_PARALLEL_LEVEL $NINJA_EXPLICIT_COMPILER_SET $DEFAULT_CMAKE_OPTIONS $DEFAULT_WINDOWS_CMAKE_OPTIONS $CMAKE_OPTIONS $CMAKE_ARCHITECTURE $SCHEDULE_CMAKE_OPTIONS $RELEASE_FILE"
|
- Invoke-Expression "& cmake .. -G '$CMAKE_GENERATOR' -DLINPHONESDK_PLATFORM=$LINPHONESDK_PLATFORM -DENABLE_CSHARP_WRAPPER=YES -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE -DLINPHONEAPP_APPLICATION_NAME='$APPLICATION_NAME' -DLINPHONEAPP_EXECUABLE_NAME='$EXECUTABLE_NAME' $NINJA_BUILD_PARALLEL_LEVEL $NINJA_EXPLICIT_COMPILER_SET $DEFAULT_CMAKE_OPTIONS $DEFAULT_WINDOWS_CMAKE_OPTIONS $CMAKE_OPTIONS $CMAKE_ARCHITECTURE $SCHEDULE_CMAKE_OPTIONS $RELEASE_FILE"
|
||||||
- echo $LastExitCode
|
- echo $LastExitCode
|
||||||
- 'if (-not ($LastExitCode -eq 0)) {throw "Error: Configure failed"}'
|
- 'if (-not ($LastExitCode -eq 0)) {throw "Error: Configure failed"}'
|
||||||
- $CLI_OUTPUT_INFO_NINJA
|
- $CLI_OUTPUT_INFO_NINJA
|
||||||
|
|
|
||||||
|
|
@ -144,6 +144,9 @@ function(add_cache _OPTION_LIST OPTION DESC VALUE)
|
||||||
set(${${_OPTION_LIST}} ${_OPTION_LIST} PARENT_SCOPE)
|
set(${${_OPTION_LIST}} ${_OPTION_LIST} PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
set(LINPHONEAPP_APPLICATION_NAME "Linphone6" CACHE STRING "Application name" )
|
||||||
|
set(LINPHONEAPP_EXECUTABLE_NAME "linphone6" CACHE STRING "Executable name" )
|
||||||
|
|
||||||
add_option(OPTION_LIST ENABLE_APP_LICENSE "Enable the license in packages." ON)
|
add_option(OPTION_LIST ENABLE_APP_LICENSE "Enable the license in packages." ON)
|
||||||
add_option(OPTION_LIST ENABLE_APP_OAUTH2 "Build with OAuth2 support for remote provisioning." OFF) # Experimental.
|
add_option(OPTION_LIST ENABLE_APP_OAUTH2 "Build with OAuth2 support for remote provisioning." OFF) # Experimental.
|
||||||
add_option(OPTION_LIST ENABLE_APP_PACKAGING "Enable packaging" OFF)
|
add_option(OPTION_LIST ENABLE_APP_PACKAGING "Enable packaging" OFF)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
set(APPLICATION_DESCRIPTION "A libre SIP client")
|
set(APPLICATION_DESCRIPTION "A libre SIP client")
|
||||||
set(APPLICATION_ID "com.belledonnecommunications.linphone60")
|
set(APPLICATION_ID "com.belledonnecommunications.${LINPHONEAPP_EXECUTABLE_NAME}")
|
||||||
set(APPLICATION_NAME Linphone6)
|
set(APPLICATION_NAME ${LINPHONEAPP_APPLICATION_NAME})
|
||||||
set(APPLICATION_URL "https://www.linphone.org")
|
set(APPLICATION_URL "https://www.linphone.org")
|
||||||
set(APPLICATION_VENDOR "Belledonne Communications")
|
set(APPLICATION_VENDOR "Belledonne Communications")
|
||||||
set(APPLICATION_LICENCE "GNU General Public License V3")
|
set(APPLICATION_LICENCE "GNU General Public License V3")
|
||||||
|
|
@ -8,4 +8,4 @@ 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(EXECUTABLE_NAME linphone6)
|
set(EXECUTABLE_NAME ${LINPHONEAPP_EXECUTABLE_NAME})
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue