Merge lp:~thomas-voss/location-service/clean-up-cmake-setup into lp:location-service

[Thomas Voß]

Clean up and trim down cmake setup.

Clean up and trim down cmake setup.

[Simon Fels (morphis)]

LGTM

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-05-10 11:09:37 +0000
+++ CMakeLists.txt	2017-05-15 13:20:09 +0000
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
-project(ubuntu-location-service)
+project(locationd)
 
 if (DEFINED SNAPPY_UBUNTU_CORE)
   add_definitions(-DSNAPPY_UBUNTU_CORE)
@@ -9,7 +9,7 @@
 # We haven't received version information via the packaging setup.
 # For that, we try to determine sensible values on our own, ensuring
 # plain old invocations to cmake still work as expected.
-if (NOT DEFINED UBUNTU_LOCATION_SERVICE_VERSION_MAJOR)
+if (NOT DEFINED LOCATIOND_VERSION_MAJOR)
   find_program(LSB_RELEASE lsb_release)
   execute_process(
     COMMAND ${LSB_RELEASE} -c -s
@@ -23,19 +23,17 @@
   #   - errors
   # we define the version to be 2.0.0
   if (${DISTRO_CODENAME} STREQUAL "vivid")
-    set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 3)
-    set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
-    set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)
+    set(LOCATIOND_VERSION_MAJOR 3)
+    set(LOCATIOND_VERSION_MINOR 0)
+    set(LOCATIOND_VERSION_PATCH 0)
   else ()
-    set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 4)
-    set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
-    set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)
+    set(LOCATIOND_VERSION_MAJOR 4)
+    set(LOCATIOND_VERSION_MINOR 0)
+    set(LOCATIOND_VERSION_PATCH 0)
   endif()
 endif()
 
-message(STATUS "${CMAKE_PROJECT_NAME} ${UBUNTU_LOCATION_SERVICE_VERSION_MAJOR}.${UBUNTU_LOCATION_SERVICE_VERSION_MINOR}.${UBUNTU_LOCATION_SERVICE_VERSION_PATCH}")
-
-set(UBUNTU_LOCATION_SERVICE_TRUST_STORE_SERVICE_NAME "UbuntuLocationService")
+message(STATUS "${CMAKE_PROJECT_NAME} ${LOCATIOND_VERSION_MAJOR}.${LOCATIOND_VERSION_MINOR}.${LOCATIOND_VERSION_PATCH}")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -Wextra -fPIC")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra -fPIC -pthread")
@@ -43,10 +41,6 @@
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-include(cmake/EnableCoverageReport.cmake)
-include(cmake/FindGFlags.cmake)
-include(cmake/FindGLog.cmake)
-include(cmake/PrePush.cmake)
 include(CTest)
 
 include(GNUInstallDirs)
@@ -67,20 +61,6 @@
 pkg_check_modules(UBUNTU_PLATFORM_HARDWARE_API ubuntu-platform-hardware-api)
 pkg_check_modules(GIO gio-2.0)
 pkg_check_modules(GIO_UNIX gio-unix-2.0)
-#####################################################################
-# Enable code coverage calculation with gcov/gcovr/lcov
-# Usage:
-#  * Switch build type to coverage (use ccmake or cmake-gui)
-#  * Invoke make, make test, make coverage
-#  * Find html report in subdir coveragereport
-#  * Find xml report feasible for jenkins in coverage.xml
-#####################################################################
-IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" )
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" )
-  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
-  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
-ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
 
 option (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS "Disable errors when local typedefs are unused" ON)
 if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
@@ -96,9 +76,9 @@
 endif()
 
 if (CLANG_FORMAT_COMMAND)
-  file(GLOB_RECURSE UBUNTU_LOCATION_SERVICE_INTERFACE_HEADER_FILES ${CMAKE_SOURCE_DIR}/include/*.h)
-  file(GLOB_RECURSE UBUNTU_LOCATION_SERVICE_IMPLEMENTATION_FILES ${CMAKE_SOURCE_DIR}/src/*.h ${CMAKE_SOURCE_DIR}/src/*.cpp)
-  add_custom_target(formatcode ${CLANG_FORMAT_COMMAND} -i ${UBUNTU_LOCATION_SERVICE_INTERFACE_HEADER_FILES} ${UBUNTU_LOCATION_SERVICE_IMPLEMENTATION_FILES} SOURCES _clang-format)
+  file(GLOB_RECURSE LOCATIOND_INTERFACE_HEADER_FILES ${CMAKE_SOURCE_DIR}/include/*.h)
+  file(GLOB_RECURSE LOCATIOND_IMPLEMENTATION_FILES ${CMAKE_SOURCE_DIR}/src/*.h ${CMAKE_SOURCE_DIR}/src/*.cpp)
+  add_custom_target(formatcode ${CLANG_FORMAT_COMMAND} -i ${LOCATIOND_INTERFACE_HEADER_FILES} ${LOCATIOND_IMPLEMENTATION_FILES} SOURCES _clang-format)
 endif()
 
 include_directories(
@@ -124,7 +104,7 @@
   ${CMAKE_BINARY_DIR}/src
 )
 
-file(GLOB_RECURSE UBUNTU_LOCATION_SERVICE_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR} *.h)
+file(GLOB_RECURSE LOCATIOND_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 
 add_subdirectory(3rd-party/ichnaea)
 
@@ -135,5 +115,3 @@
 add_subdirectory(po)
 add_subdirectory(src)
 add_subdirectory(tests)
-
-enable_coverage_report(service)

=== removed file 'cmake/EnableCoverageReport.cmake'
--- cmake/EnableCoverageReport.cmake	2013-05-29 09:21:16 +0000
+++ cmake/EnableCoverageReport.cmake	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-# - Creates a special coverage build type and target on GCC.
-#
-# Defines a function ENABLE_COVERAGE_REPORT which generates the coverage target
-# for selected targets. Optional arguments to this function are used to filter
-# unwanted results using globbing expressions. Moreover targets with tests for
-# the source code can be specified to trigger regenerating the report if the
-# test has changed
-#
-# ENABLE_COVERAGE_REPORT(TARGETS target... [FILTER filter...] [TESTS test targets...])
-#
-# To generate a coverage report first build the project with
-# CMAKE_BUILD_TYPE=coverage, then call make test and afterwards make coverage.
-#
-# The coverage report is based on gcov. Depending on the availability of lcov
-# a HTML report will be generated and/or an XML report of gcovr is found.
-# The generated coverage target executes all found solutions. Special targets
-# exist to create e.g. only the xml report: coverage-xml. 
-#
-# Copyright (C) 2010 by Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
-#
-# This program is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General
-# Public License as published by the Free Software Foundation;
-# either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-
-INCLUDE(ParseArguments)
-
-FIND_PACKAGE(Lcov)
-FIND_PACKAGE(gcovr)
-
-FUNCTION(ENABLE_COVERAGE_REPORT)
-    
-    # argument parsing
-    PARSE_ARGUMENTS(ARG "FILTER;TARGETS;TESTS" "" ${ARGN})
-    
-    SET(COVERAGE_RAW_FILE "${CMAKE_BINARY_DIR}/coverage.raw.info")
-    SET(COVERAGE_FILTERED_FILE "${CMAKE_BINARY_DIR}/coverage.info")
-    SET(COVERAGE_REPORT_DIR "${CMAKE_BINARY_DIR}/coveragereport")
-    SET(COVERAGE_XML_FILE "${CMAKE_BINARY_DIR}/coverage.xml")
-    SET(COVERAGE_XML_COMMAND_FILE "${CMAKE_BINARY_DIR}/coverage-xml.cmake")
-    
-    # decide if there is any tool to create coverage data
-    SET(TOOL_FOUND FALSE)
-    IF(LCOV_FOUND OR GCOVR_FOUND)
-        SET(TOOL_FOUND TRUE)
-    ENDIF()
-    IF(NOT TOOL_FOUND)
-        MESSAGE(STATUS "Cannot enable coverage targets because neither lcov nor gcovr are found.")
-    ENDIF()
-    
-    STRING(TOLOWER "${CMAKE_BUILD_TYPE}" COVERAGE_BUILD_TYPE)
-    IF(CMAKE_COMPILER_IS_GNUCXX AND TOOL_FOUND AND "${COVERAGE_BUILD_TYPE}" MATCHES "coverage")
-    
-        MESSAGE(STATUS "Coverage support enabled for targets: ${ARG_TARGETS}")
-    
-        # create coverage build type
-        SET(CMAKE_CXX_FLAGS_COVERAGE ${CMAKE_CXX_FLAGS_DEBUG} PARENT_SCOPE)
-        SET(CMAKE_C_FLAGS_COVERAGE ${CMAKE_C_FLAGS_DEBUG} PARENT_SCOPE)
-        SET(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} coverage PARENT_SCOPE)
-    
-        # instrument targets
-        SET_TARGET_PROPERTIES(${ARG_TARGETS} PROPERTIES COMPILE_FLAGS --coverage
-                                                        LINK_FLAGS --coverage)
-    
-        # html report
-        IF (LCOV_FOUND)
-        
-            MESSAGE(STATUS "Enabling HTML coverage report")
-    
-            # set up coverage target
-            
-            ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_RAW_FILE}
-                               COMMAND ${LCOV_EXECUTABLE} -c -d ${CMAKE_BINARY_DIR} -o ${COVERAGE_RAW_FILE}
-                               WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                               COMMENT "Collecting coverage data"
-                               DEPENDS ${ARG_TARGETS} ${ARG_TESTS}
-                               VERBATIM)
-            
-            # filter unwanted stuff
-            LIST(LENGTH ARG_FILTER FILTER_LENGTH)
-            IF(${FILTER_LENGTH} GREATER 0)
-                SET(FILTER COMMAND ${LCOV_EXECUTABLE})
-                FOREACH(F ${ARG_FILTER})
-                    SET(FILTER ${FILTER} -r ${COVERAGE_FILTERED_FILE} ${F})
-                ENDFOREACH()
-                SET(FILTER ${FILTER} -o ${COVERAGE_FILTERED_FILE})
-            ELSE()
-                SET(FILTER "")
-            ENDIF()
-            
-            ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_FILTERED_FILE}
-                               COMMAND ${LCOV_EXECUTABLE} -e ${COVERAGE_RAW_FILE} "${CMAKE_SOURCE_DIR}*"  -o ${COVERAGE_FILTERED_FILE}
-                               ${FILTER}
-                               DEPENDS ${COVERAGE_RAW_FILE}
-                               COMMENT "Filtering recorded coverage data for project-relevant entries"
-                               VERBATIM)
-            ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_REPORT_DIR}
-                               COMMAND ${CMAKE_COMMAND} -E make_directory ${COVERAGE_REPORT_DIR}
-                               COMMAND ${GENHTML_EXECUTABLE} --legend --show-details -t "${PROJECT_NAME} test coverage" -o ${COVERAGE_REPORT_DIR} ${COVERAGE_FILTERED_FILE}
-                               DEPENDS ${COVERAGE_FILTERED_FILE}
-                               COMMENT "Generating HTML coverage report in ${COVERAGE_REPORT_DIR}"
-                               VERBATIM)
-                               
-            ADD_CUSTOM_TARGET(coverage-html
-                              DEPENDS ${COVERAGE_REPORT_DIR})
-                              
-        ENDIF()
-        
-        # xml coverage report
-        IF(GCOVR_FOUND)
-        
-            MESSAGE(STATUS "Enabling XML coverage report")
-        
-            # gcovr cannot write directly to a file so the execution needs to
-            # be wrapped in a cmake file that generates the file output
-            FILE(WRITE ${COVERAGE_XML_COMMAND_FILE}
-                 "SET(ENV{LANG} en)\n")
-            FILE(APPEND ${COVERAGE_XML_COMMAND_FILE}
-                "EXECUTE_PROCESS(COMMAND \"${GCOVR_EXECUTABLE}\" --exclude=tests.* --exclude=obj-.* --exclude=cmake.* -x -r \"${CMAKE_SOURCE_DIR}\" OUTPUT_FILE \"${COVERAGE_XML_FILE}\" WORKING_DIRECTORY \"${CMAKE_BINARY_DIR}\")\n")
-        
-            ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_XML_FILE}
-                               COMMAND ${CMAKE_COMMAND} ARGS -P ${COVERAGE_XML_COMMAND_FILE}
-                               COMMENT "Generating coverage XML report"
-                               VERBATIM)
-                               
-            ADD_CUSTOM_TARGET(coverage-xml
-                              DEPENDS ${COVERAGE_XML_FILE})
-        
-        ENDIF()
-        
-        # provide a global coverage target executing both steps if available
-        SET(GLOBAL_DEPENDS "")
-        IF(LCOV_FOUND)
-            LIST(APPEND GLOBAL_DEPENDS ${COVERAGE_REPORT_DIR})
-        ENDIF()
-        IF(GCOVR_FOUND)
-            LIST(APPEND GLOBAL_DEPENDS ${COVERAGE_XML_FILE})
-        ENDIF()
-        IF(LCOV_FOUND OR GCOVR_FOUND)
-            ADD_CUSTOM_TARGET(coverage
-                              DEPENDS ${GLOBAL_DEPENDS})
-        ENDIF()
-                          
-    ENDIF()
-
-ENDFUNCTION()   

=== removed file 'cmake/FindLcov.cmake'
--- cmake/FindLcov.cmake	2013-05-28 14:20:45 +0000
+++ cmake/FindLcov.cmake	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# - Find lcov 
-# Will define:
-#
-# LCOV_EXECUTABLE - the lcov binary
-# GENHTML_EXECUTABLE - the genhtml executable
-#
-# Copyright (C) 2010 by Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
-#
-# This program is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General
-# Public License as published by the Free Software Foundation;
-# either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PROGRAM(LCOV_EXECUTABLE lcov)
-FIND_PROGRAM(GENHTML_EXECUTABLE genhtml)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lcov DEFAULT_MSG LCOV_EXECUTABLE GENHTML_EXECUTABLE)
-
-# only visible in advanced view
-MARK_AS_ADVANCED(LCOV_EXECUTABLE GENHTML_EXECUTABLE)

=== removed file 'cmake/Findgcovr.cmake'
--- cmake/Findgcovr.cmake	2013-05-28 14:20:45 +0000
+++ cmake/Findgcovr.cmake	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-# - Find gcovr scrip 
-# Will define:
-#
-# GCOVR_EXECUTABLE - the gcovr script
-#
-# Uses:
-#
-# GCOVR_ROOT - root to search for the script
-#
-# Copyright (C) 2011 by Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
-#
-# This program is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General
-# Public License as published by the Free Software Foundation;
-# either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PROGRAM(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(gcovr DEFAULT_MSG GCOVR_EXECUTABLE)
-
-# only visible in advanced view
-MARK_AS_ADVANCED(GCOVR_EXECUTABLE)

=== removed file 'cmake/ParseArguments.cmake'
--- cmake/ParseArguments.cmake	2013-05-28 14:20:45 +0000
+++ cmake/ParseArguments.cmake	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-# Parse arguments passed to a function into several lists separated by
-# upper-case identifiers and options that do not have an associated list e.g.:
-#
-# SET(arguments
-#   hello OPTION3 world
-#   LIST3 foo bar
-#   OPTION2
-#   LIST1 fuz baz
-#   )
-# PARSE_ARGUMENTS(ARG "LIST1;LIST2;LIST3" "OPTION1;OPTION2;OPTION3" ${arguments})
-#
-# results in 7 distinct variables:
-#  * ARG_DEFAULT_ARGS: hello;world
-#  * ARG_LIST1: fuz;baz
-#  * ARG_LIST2:
-#  * ARG_LIST3: foo;bar
-#  * ARG_OPTION1: FALSE
-#  * ARG_OPTION2: TRUE
-#  * ARG_OPTION3: TRUE
-#
-# taken from http://www.cmake.org/Wiki/CMakeMacroParseArguments 
-
-MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
-    SET(DEFAULT_ARGS)
-    FOREACH(arg_name ${arg_names})    
-        SET(${prefix}_${arg_name})
-    ENDFOREACH(arg_name)
-    FOREACH(option ${option_names})
-        SET(${prefix}_${option} FALSE)
-    ENDFOREACH(option)
-    
-    SET(current_arg_name DEFAULT_ARGS)
-    SET(current_arg_list)
-    FOREACH(arg ${ARGN})            
-        SET(larg_names ${arg_names})    
-        LIST(FIND larg_names "${arg}" is_arg_name)                   
-        IF (is_arg_name GREATER -1)
-            SET(${prefix}_${current_arg_name} ${current_arg_list})
-            SET(current_arg_name ${arg})
-            SET(current_arg_list)
-        ELSE (is_arg_name GREATER -1)
-            SET(loption_names ${option_names})    
-            LIST(FIND loption_names "${arg}" is_option)            
-            IF (is_option GREATER -1)
-                SET(${prefix}_${arg} TRUE)
-            ELSE (is_option GREATER -1)
-                SET(current_arg_list ${current_arg_list} ${arg})
-            ENDIF (is_option GREATER -1)
-        ENDIF (is_arg_name GREATER -1)
-    ENDFOREACH(arg)
-    SET(${prefix}_${current_arg_name} ${current_arg_list})
-ENDMACRO(PARSE_ARGUMENTS)

=== removed file 'cmake/PrePush.cmake'
--- cmake/PrePush.cmake	2013-05-28 14:20:45 +0000
+++ cmake/PrePush.cmake	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-#######################################################################
-# A convenience target that carries out the following steps:
-#   - Apply astyle to all source files of interest.
-#   - Build & test in a chroot, comparable setup to CI/Autolanding
-#     and ppa builders. Will fail if new files have not been added.
-#   - Build & test for android.
-#
-# NOTE: This target is very sensitive to the availability of all
-#       all required dependencies. For that, we prefer to fail the
-#       target if deps are missing to make the problem very visible.
-#
-# TODO:
-#   - Wire up the style-check target once we have reached a state
-#     where trunk actually passes the style check.
-#######################################################################
-add_custom_target(
-  pre-push
-
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}  
-)
-
-#######################################################################
-#      Add target for running astyle with the correct options         #
-#######################################################################
-find_program(ASTYLE_EXECUTABLE astyle)
-
-if (ASTYLE_EXECUTABLE)
-  add_custom_target(
-    astyle 
-    ${ASTYLE_EXECUTABLE} --style=allman -s4 --indent=spaces=4 --pad-header --align-pointer=type --recursive ${CMAKE_SOURCE_DIR}/include/*.h
-    COMMAND ${ASTYLE_EXECUTABLE} --recursive --style=allman -s4 --indent=spaces=4 --pad-header --align-pointer=type ${CMAKE_SOURCE_DIR}/tests/*.cpp
-    VERBATIM
-  )
-endif (ASTYLE_EXECUTABLE)
-
-#######################################################################
-#      Add target for creating a source tarball with bzr export       #
-#######################################################################
-add_custom_target(
-  pre-push-source-tarball
-
-  COMMAND rm -rf pre-push-build-area
-  COMMAND mkdir pre-push-build-area
-  COMMAND bzr export --root pre-push pre-push-build-area/${PROJECT_NAME}_${DBUS_CPP_VERSION_MAJOR}.${DBUS_CPP_VERSION_MAJOR}.${DBUS_CPP_VERSION_MAJOR}.orig.tar.bz2 ${CMAKE_SOURCE_DIR}
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-  COMMENT "Preparing source tarball for pre-push build & test"
-)
-
-#######################################################################
-#      Add target for extracting source tarball for pdebuild          #
-#######################################################################
-add_custom_target(
-  extract-pre-push-tarball
-  COMMAND tar -xf {PROJECT_NAME}_${DBUS_CPP_VERSION_MAJOR}.${DBUS_CPP_VERSION_MAJOR}.${DBUS_CPP_VERSION_MAJOR}.orig.tar.bz2
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/pre-push-build-area VERBATIM
-)
-
-#######################################################################
-#  Builds & tests the last committed revision of the current branch   #
-#######################################################################
-find_program(PDEBUILD_EXECUTABLE pdebuild)
-if(NOT PDEBUILD_EXECUTABLE)
-  message(STATUS "pdebuild NOT found, pre-push is going to FAIL")
-endif()
-
-add_custom_target(
-  pdebuild
-  COMMAND ${PDEBUILD_EXECUTABLE}
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/pre-push-build-area/pre-push 
-  COMMENT "Building & testing in chroot'd environment"
-  VERBATIM  
-)
-
-#######################################################################
-# pdebuild: make tarball -> extract to build area -> pdebuild         #
-# android-build: invoke cross-compile script                          #
-#######################################################################
-add_dependencies(extract-pre-push-tarball pre-push-source-tarball)
-add_dependencies(pdebuild extract-pre-push-tarball)
-
-add_dependencies(pre-push pdebuild android-build)

=== modified file 'data/ubuntu-location-service-connectivity.pc.in'
--- data/ubuntu-location-service-connectivity.pc.in	2014-05-19 12:07:44 +0000
+++ data/ubuntu-location-service-connectivity.pc.in	2017-05-15 13:20:09 +0000
@@ -6,7 +6,7 @@
 Name: ubuntu-location-service-connectivity
 Description: A location service aggregating position/velocity/heading
  updates and exporting them over dbus, wifi and cell id query interfaces.
-Version: @UBUNTU_LOCATION_SERVICE_VERSION_MAJOR@.@UBUNTU_LOCATION_SERVICE_VERSION_MINOR@.@UBUNTU_LOCATION_SERVICE_VERSION_PATCH@
+Version: @LOCATIOND_VERSION_MAJOR@.@LOCATIOND_VERSION_MINOR@.@LOCATIOND_VERSION_PATCH@
 Libs: -L${libdir} -lubuntu-location-service-connectivity
-Cflags: -I${includedir}/ubuntu-location-service-@UBUNTU_LOCATION_SERVICE_VERSION_MAJOR@
+Cflags: -I${includedir}/ubuntu-location-service-@LOCATIOND_VERSION_MAJOR@
 Requires: dbus-cpp

=== modified file 'data/ubuntu-location-service.pc.in'
--- data/ubuntu-location-service.pc.in	2016-06-26 21:17:03 +0000
+++ data/ubuntu-location-service.pc.in	2017-05-15 13:20:09 +0000
@@ -6,6 +6,6 @@
 Name: @CMAKE_PROJECT_NAME@
 Description: A location service aggregating position/velocity/heading
  updates and exporting them over dbus.
-Version: @UBUNTU_LOCATION_SERVICE_VERSION_MAJOR@.@UBUNTU_LOCATION_SERVICE_VERSION_MINOR@.@UBUNTU_LOCATION_SERVICE_VERSION_PATCH@
+Version: @LOCATIOND_VERSION_MAJOR@.@LOCATIOND_VERSION_MINOR@.@LOCATIOND_VERSION_PATCH@
 Libs: -L${libdir} -lubuntu-location-service
 Requires: dbus-cpp

=== modified file 'src/location/CMakeLists.txt'
--- src/location/CMakeLists.txt	2017-05-12 07:43:46 +0000
+++ src/location/CMakeLists.txt	2017-05-15 13:20:09 +0000
@@ -43,7 +43,7 @@
 add_library(
   ubuntu-location-service SHARED
 
-  ${UBUNTU_LOCATION_SERVICE_PUBLIC_HEADERS}
+  ${LOCATIOND_PUBLIC_HEADERS}
 
   fusion_provider_selection_policy.cpp
   non_selecting_provider_selection_policy.cpp
@@ -182,8 +182,8 @@
   PROPERTIES
   LINK_FLAGS "${ldflags} -Wl,--version-script,${symbol_map}"
   LINK_DEPENDS ${symbol_map}
-  VERSION ${UBUNTU_LOCATION_SERVICE_VERSION_MAJOR}.${UBUNTU_LOCATION_SERVICE_VERSION_MINOR}.${UBUNTU_LOCATION_SERVICE_VERSION_PATCH}
-  SOVERSION ${UBUNTU_LOCATION_SERVICE_VERSION_MAJOR}
+  VERSION ${LOCATIOND_VERSION_MAJOR}.${LOCATIOND_VERSION_MINOR}.${LOCATIOND_VERSION_PATCH}
+  SOVERSION ${LOCATIOND_VERSION_MAJOR}
 )
 
 set_target_properties(
@@ -192,8 +192,8 @@
   PROPERTIES
   LINK_FLAGS "${ldflags} -Wl,--version-script,${symbol_map}"
   LINK_DEPENDS ${symbol_map}
-  VERSION ${UBUNTU_LOCATION_SERVICE_VERSION_MAJOR}.${UBUNTU_LOCATION_SERVICE_VERSION_MINOR}.${UBUNTU_LOCATION_SERVICE_VERSION_PATCH}
-  SOVERSION ${UBUNTU_LOCATION_SERVICE_VERSION_MAJOR}
+  VERSION ${LOCATIOND_VERSION_MAJOR}.${LOCATIOND_VERSION_MINOR}.${LOCATIOND_VERSION_PATCH}
+  SOVERSION ${LOCATIOND_VERSION_MAJOR}
 )
 
 add_definitions(${ENABLED_PROVIDER_TARGETS_DEFINITIONS})

=== modified file 'src/location/config.h.in'
--- src/location/config.h.in	2016-07-13 14:06:18 +0000
+++ src/location/config.h.in	2017-05-15 13:20:09 +0000
@@ -20,10 +20,7 @@
 
 namespace location
 {
-static constexpr const char* trust_store_service_name
-{
-    "@UBUNTU_LOCATION_SERVICE_TRUST_STORE_SERVICE_NAME@"
-};
+
 }
 
 #endif // LOCATION_CONFIG_H_

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-05-09 12:06:57 +0000
+++ tests/CMakeLists.txt	2017-05-15 13:20:09 +0000
@@ -2,17 +2,6 @@
 
 add_definitions(-DCORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE -DBOOST_ASIO_DISABLE_MOVE)
 
-option(
-    LOCATION_SERVICE_ENABLE_DBUS_TEST_RUNNER 
-    "Rely on dbus test runner to start a private session for testing purposes" 
-    ON
-)
-
-if (LOCATION_SERVICE_ENABLE_DBUS_TEST_RUNNER)
-    find_program(DBUS_TEST_RUNNER_EXECUTABLE dbus-test-runner)
-    message(STATUS "Executing test suite under dbus-test-runner")
-endif (LOCATION_SERVICE_ENABLE_DBUS_TEST_RUNNER)
-
 # Build mongoose as static library to leverage in location reporter testing
 add_library(mongoose mongoose.c)
 # Explicitly select c99 when compiling mongoose