From 91336e3fc232b74de70de2f8d5786583303531d5 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 12 Mar 2018 10:42:38 +0100 Subject: [PATCH] Add linphone-desktop-rpm target. --- cmake_builder/linphoneqt.cmake | 1 + prepare.py | 22 +++++++++++++++++++--- submodules/cmake-builder | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/cmake_builder/linphoneqt.cmake b/cmake_builder/linphoneqt.cmake index 5f5064149..9aea35232 100644 --- a/cmake_builder/linphoneqt.cmake +++ b/cmake_builder/linphoneqt.cmake @@ -25,6 +25,7 @@ lcb_external_source_paths("..") lcb_dependencies("linphone" "ms2plugins" "minizip") lcb_groupable(YES) lcb_package_source(YES) +lcb_spec_file("linphoneqt.spec") lcb_cmake_options("-DENABLE_UPDATE_CHECK=${ENABLE_UPDATE_CHECK}") if(UNIX AND NOT APPLE) diff --git a/prepare.py b/prepare.py index 709ce26f8..c374676e0 100755 --- a/prepare.py +++ b/prepare.py @@ -73,6 +73,21 @@ class DesktopRaspberryTarget(prepare.Target): ] +class DesktopRpmTarget(prepare.Target): + + def __init__(self, group_builders=False): + prepare.Target.__init__(self, 'desktop-rpm') + current_path = os.path.dirname(os.path.realpath(__file__)) + self.config_file = 'configs/config-desktop-rpm.cmake' + self.output = 'OUTPUT/' + self.name + self.external_source_path = os.path.join(current_path, 'submodules') + external_builders_path = os.path.join(current_path, 'cmake_builder') + self.additional_args = [ + "-DLINPHONE_BUILDER_EXTERNAL_BUILDERS_PATH=" + external_builders_path, + "-DLINPHONE_BUILDER_TARGET=linphoneqt" + ] + + class NoUITarget(prepare.Target): def __init__(self, group_builders=False): @@ -119,10 +134,11 @@ class PythonRaspberryTarget(prepare.Target): desktop_targets = { 'desktop': DesktopTarget(), - 'python': PythonTarget(), 'desktop-raspberry': DesktopRaspberryTarget(), - 'python-raspberry': PythonRaspberryTarget(), - 'no-ui' : NoUITarget() + 'desktop-rpm': DesktopRpmTarget(), + 'no-ui' : NoUITarget(), + 'python': PythonTarget(), + 'python-raspberry': PythonRaspberryTarget() } class DesktopPreparator(prepare.Preparator): diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 13ef108c9..5c17f93e1 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 13ef108c9e14364872ccefcfcdca0d906449da6d +Subproject commit 5c17f93e15d591ba67ccbf93b52ab6f0ce964ada