From afd74c2978de340727b7890027acbe855def5821 Mon Sep 17 00:00:00 2001 From: asanoaozora Date: Fri, 17 Jun 2016 16:12:09 +0200 Subject: migration of poi add/remove POC to CommonAPI in progress --- src/navigation/README.md | 5 +- src/poi-service/CMakeLists.txt | 7 -- src/poi-service/README | 133 --------------------- src/poi-service/README.md | 37 ++++++ src/poi-service/build.sh | 46 +++++++ src/poi-service/poi-manager-server/CMakeLists.txt | 11 +- src/poi-service/poi-manager-server/README.md | 47 ++++++++ src/poi-service/poi-manager-server/build.sh | 69 +++++++++++ .../poi-manager-server/poi-manager-server-stub.cpp | 8 +- .../poi-manager-server/poi-manager-server-stub.h | 22 ++-- src/poi-service/rebuild_all.sh | 79 ------------ 11 files changed, 227 insertions(+), 237 deletions(-) delete mode 100644 src/poi-service/README create mode 100644 src/poi-service/README.md create mode 100755 src/poi-service/build.sh create mode 100644 src/poi-service/poi-manager-server/README.md create mode 100755 src/poi-service/poi-manager-server/build.sh delete mode 100755 src/poi-service/rebuild_all.sh (limited to 'src') diff --git a/src/navigation/README.md b/src/navigation/README.md index 3c026f3..7794076 100644 --- a/src/navigation/README.md +++ b/src/navigation/README.md @@ -40,7 +40,7 @@ sudo apt-get install python-pip python-dbus python-gobject python-pil sudo pip install --upgrade pip To test, launch the navigation middleware by entering: -./run-r +./run -r test files: ./test-route-calculation.py ./test-location-input.py @@ -79,4 +79,7 @@ So, for the time being, export NAVIT_GRAPHICS='sdl' is set into the run script There's an issue with the svg to png library so inkscape is used. It seems to be necessary to do: export NO_AT_BRIDGE=1 +## License + +Mozilla Public License Version 2.0 diff --git a/src/poi-service/CMakeLists.txt b/src/poi-service/CMakeLists.txt index 300cfae..83840f3 100644 --- a/src/poi-service/CMakeLists.txt +++ b/src/poi-service/CMakeLists.txt @@ -20,14 +20,11 @@ cmake_minimum_required(VERSION 2.8) message(STATUS ${PROJECT_NAME}) -option(WITH_FRANCA_DBUS_INTERFACE - "Build using the Franca interfaces" OFF) option(WITH_DBUS_INTERFACE "Build using the D-Bus interfaces" ON) option(WITH_DEBUG "Enable the debug messages" OFF) -message(STATUS "WITH_FRANCA_DBUS_INTERFACE = ${WITH_FRANCA_DBUS_INTERFACE}") message(STATUS "WITH_DBUS_INTERFACE = ${WITH_DBUS_INTERFACE}") message(STATUS "WITH_DEBUG = ${WITH_DEBUG}") @@ -46,7 +43,3 @@ add_subdirectory(${API_DIR}/poi-service "${DBUS_GENERATED_INCLUDE_DIR}/poi-servi add_subdirectory(poi-server) -if (WITH_FRANCA_DBUS_INTERFACE) - set(FRANCA_DIR "${API_DIR}/franca") - add_subdirectory(poi-manager-server) -endif() diff --git a/src/poi-service/README b/src/poi-service/README deleted file mode 100644 index a86ba0d..0000000 --- a/src/poi-service/README +++ /dev/null @@ -1,133 +0,0 @@ -Release date of the file: 15-01-2016 -Status: OK - -Project: -Search engine for Point Of Interest with a content access module mechanism to extend to additional sources of data -This project is one of the navigation-service common projects that implements the GENIVI navigation APIs. - -More: -The project is made of sub parts: -- poi-supplier that populates a sqlite3 based database from OSM data in xml format -- poi-server that implements the poi search API and access an embedded database -- poi-contentaccess-module that implements a content access module that access an additional database, and a simple HMI -- poi-client that implements a client with a test HMI -- poi-manager-server and poi-manager-client that implements a CommonAPI based proof of concept of an extension of the poi-contentaccess-module -See also other navigation projects like navigation or proof of concepts implemented for traffic-info and positioning - -What is in: -This folder contains scripts for building poi-server and poi-manager-server -FYI: poi-supplier, poi-contentaccess-module and poi-client are located under test/poi-service - -Author: -Philippe Colliot philippe.colliot@mpsa.com - -License: -See headers and LICENSE file - -Test target: -Ubuntu 14.04 LTS 32bits -Ubuntu 15.10 64bits - -To get the code: -Code is part of the navigation-service repository, so you need to clone the whole content: -git clone http://git.projects.genivi.org/lbs/navigation-service.git $WORKING-DIR - -============================================================================================= -How-to for the proof of concept -============================================================================================= - -========================================== -All-in-one script -========================================== -./rebuild_all.sh - -========================================== -How-to step by step, with explanations -========================================== ----Create and enter the build folder--- -mkdir ./build -cd build -cmake ../ -make -cd .. - -========================================== -How To Run -========================================== -./bin/poi-server -f ./resource/poi-database-sample.db - -============================================================================================= -How to for the common api based proof of concept (for testing add/remove stuff into a database) -============================================================================================= -NB: You need CommonAPI 3.1.2 and Franca 0.9.1 installed - -========================================== -All-in-one script -========================================== -./rebuild_all.sh -f - -========================================== -How-to step by step, with explanations -========================================== -You need to pass as parameter to the cmake the link to your patched dbus library (required by CommonAPI) - -cd build -cmake -DWITH_FRANCA_DBUS_INTERFACE=ON -DDBUS_LIB_PATH=yourPath -DCOMMONAPI_DBUS_TOOL_DIR= -DCOMMONAPI_TOOL_DIR= -DWITH_DEBUG=ON ../ -make -cd .. - -========================================== -How To Run -========================================== - -Copy the configuration file ./resource/commonapi-dbus.ini in a directory of your choice - -Set the environment variable COMMONAPI_DBUS_DEFAULT_CONFIG before starting the poi-manager-server. - -Example: -export COMMONAPI_DBUS_DEFAULT_CONFIG=/commonapi-dbus.ini - -cp ./resource/poi-database-managed.db ./bin -./bin/poi-manager-server -f ./bin/poi-database-managed.db - -========================================== -About CommonAPI issues -========================================== -It seems to have an issue with the .cmake files when two versions of CommonAPI are installed -(see into /usr/local/lib/cmake/) - -============= -For the Ubuntu 64 bits, due to the use of symbol versioning LIBDBUS_1_0 by CommonAPI-DBus, the patched version of dbus has to be >= 1.10.0 -(the patch to be applied has to be fix a little bit) - -============= -In case the .pc are not well generated, please add these files to /usr/local/lib/pkgconfig - -CommonAPI.pc - -prefix=/usr/local -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Common API C++ -Description: GENIVI Common API C++ Library -Version: 3.1.2 -Libs: -L${libdir} -lCommonAPI -Cflags: -I${includedir}/CommonAPI-3.1 - -CommonAPI-DBus.pc - -prefix=/usr/local -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Common API C++ D-Bus Middleware -Description: GENIVI Common API C++ D-Bus Middleware -Version: 3.1.2 -Requires: CommonAPI dbus-1 -Libs: -L${libdir} -Wl,--no-as-needed -lCommonAPI-DBus -Wl,--as-needed -Cflags: -I${includedir}/CommonAPI-3.1 - -============= diff --git a/src/poi-service/README.md b/src/poi-service/README.md new file mode 100644 index 0000000..c20cff7 --- /dev/null +++ b/src/poi-service/README.md @@ -0,0 +1,37 @@ +# POI service middleware + +## Synopsis +This folder contains the server part of the proof of concepts (POC) for the POI service interfaces. +These interfaces provide access to a search engine for Point Of Interest with a content access module mechanism to extend to additional sources of data. +NB: The client part is located under ../../test/poi-service +NB: See the README.md into the sub folder poi-manager-server for the CommonAPI based POC + +##Tested targets +Desktop: Tested under Ubuntu 16.04 LTS 64 bits +## About the POI service interfaces project +The project is made of sub parts: +- poi-supplier that populates a sqlite3 based database from OSM data in xml format +- poi-server that implements the poi search API and access an embedded database +- poi-contentaccess-module that implements a content access module that access an additional database, and a simple HMI +- poi-client that implements a client with a test HMI +- poi-manager-server and poi-manager-client that implements a proof of concept of an extension of the poi-contentaccess-module (separate build) + +## Prerequisites + +## How to build +A script allows either: +to clean and rebuild all (including invoking cmake) +```./build.sh -c``` +or to build updated parts +```./build.sh``` + + + +## How To Run +```./bin/poi-server -f ./resource/poi-database-sample.db``` + + +## License + +Mozilla Public License Version 2.0 + diff --git a/src/poi-service/build.sh b/src/poi-service/build.sh new file mode 100755 index 0000000..b6fe81c --- /dev/null +++ b/src/poi-service/build.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +debug="OFF" +dbus="ON" +clean=0 + +while getopts cdh opt +do + case $opt in + c) + clean=1 + ;; + d) + debug="ON" + ;; + h) + echo "Usage:" + echo "$0 [-cd]" + echo "-c: Rebuild with clean" + echo "-d: Enable the debug messages" + exit 1 + esac +done +set -e + +if [ "$clean" = 1 ] +then + echo 'clean up the build folder' + if [ -d "./build" ] + then + find ./build ! -name '*.cbp' -type f -exec rm -f {} + + fi +fi + + +mkdir -p build +cd build + +echo 'build poi-server' +if [ "$clean" = 1 ] +then + cmake -DWITH_DEBUG=$debug ../ +fi +make + + diff --git a/src/poi-service/poi-manager-server/CMakeLists.txt b/src/poi-service/poi-manager-server/CMakeLists.txt index 54e8e1e..cb00ca8 100644 --- a/src/poi-service/poi-manager-server/CMakeLists.txt +++ b/src/poi-service/poi-manager-server/CMakeLists.txt @@ -16,6 +16,8 @@ # @licence end@ ########################################################################### project(poi-manager-server) +cmake_minimum_required(VERSION 2.8) + message(STATUS ${PROJECT_NAME}) option(DBUS_LIB_PATH @@ -26,12 +28,17 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x") set(PARENT_API poiservice) set(ROOT_API navigation) -set(API_VERSION_MAJOR 0) +set(API_VERSION_MAJOR 4) set(API_VERSION "v${API_VERSION_MAJOR}") set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") set(PRJ_SRC_GEN_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION}/org/genivi/${ROOT_API}/${PARENT_API}) -set(PRJ_SRC_GEN_NAVIGATION_TYPES_PATH ${COMMONAPI_GEN_DIR}/org/genivi/${ROOT_API}) +set(PRJ_SRC_GEN_NAVIGATION_TYPES_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION}/org/genivi/${ROOT_API}) set(PRJ_SRC_GEN_POISERVICE_TYPES_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION}/org/genivi/${ROOT_API}/${PARENT_API}) +set(API_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../api") +set(FRANCA_DIR "${API_DIR}/franca") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin) +set(COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../poi-common") # DBus Path if(DBUS_LIB_PATH) diff --git a/src/poi-service/poi-manager-server/README.md b/src/poi-service/poi-manager-server/README.md new file mode 100644 index 0000000..b35ee26 --- /dev/null +++ b/src/poi-service/poi-manager-server/README.md @@ -0,0 +1,47 @@ +# POI service middleware: CommonAPI based POC + +## Synopsis +This folder contains the server part of the proof of concepts (POC) for the POI manager service interfaces, based on CommonAPI +These interfaces provide access to a search engine for Point Of Interest with a content access module mechanism to extend to additional sources of data. +NB: The client part is located under ../../test/poi-manager-client + +##Tested targets +Desktop: Tested under Ubuntu 16.04 LTS 64 bits + +## Prerequisites +You need CommonAPI 3.1.5 and Franca 0.9.1 installed +For the Ubuntu 64 bits, due to the use of symbol versioning LIBDBUS_1_0 by CommonAPI-DBus, the patched version of DBus has to be >= 1.10.0 +NB: the patch common-api-dbus-runtime/src/dbus-patches/capi-dbus-add-support-for-custom-marshalling.patch failed a little bit, it's needed to update the dbus/dbus-string.h manually + +## How to build +First it's required to set some paths: +``` +export DBUS_LIB_PATH= +export COMMONAPI_DBUS_TOOL_DIR= +export COMMONAPI_TOOL_DIR= +``` +A script allows either: +to clean and rebuild all (including invoking cmake) +```./build.sh -c``` +or to build updated parts +```./build.sh``` + +## How To Run +First it's required to set a config file: +Copy the configuration file ../resource/commonapi-dbus.ini in a directory of your choice + +Set the environment variable COMMONAPI_DBUS_DEFAULT_CONFIG before starting the poi-manager-server. + +Example: +```export COMMONAPI_DBUS_DEFAULT_CONFIG=/commonapi-dbus.ini``` + +Copy the database for testing: + +```cp ../resource/poi-database-managed.db ./bin``` + +And launch the server (use d-feet to check if it's running or build the client) +```./bin/poi-manager-server -f ./bin/poi-database-managed.db``` + +## License + +Mozilla Public License Version 2.0 diff --git a/src/poi-service/poi-manager-server/build.sh b/src/poi-service/poi-manager-server/build.sh new file mode 100755 index 0000000..9769fad --- /dev/null +++ b/src/poi-service/poi-manager-server/build.sh @@ -0,0 +1,69 @@ +#!/bin/bash + +commonapi_tools_option="" +clean=0 + +while getopts cdh opt +do + case $opt in + c) + clean=1 + ;; + d) + debug="ON" + ;; + h) + echo "Usage:" + echo "$0 [-cd]" + echo "-c: Rebuild with clean" + echo "-d: Enable the debug messages" + exit 1 + esac +done +set -e + +if [ ! $COMMONAPI_TOOL_DIR ] +then + echo 'Set the dir of the common api tools' + echo 'export COMMONAPI_TOOL_DIR=' + exit 1 +fi + +if [ ! $COMMONAPI_DBUS_TOOL_DIR ] +then + echo 'Set the dir of the common api dbus tools' + echo 'export COMMONAPI_DBUS_TOOL_DIR=' + exit 1 +fi + +if [ ! $DBUS_LIB_PATH ] +then + echo 'Set the dir of the patched dbus' + echo 'export DBUS_LIB_PATH=' + exit 1 +fi + +commonapi_tools_option="-DDBUS_LIB_PATH="$DBUS_LIB_PATH" -DCOMMONAPI_DBUS_TOOL_DIR="$COMMONAPI_DBUS_TOOL_DIR" -DCOMMONAPI_TOOL_DIR="$COMMONAPI_TOOL_DIR + + +if [ "$clean" = 1 ] +then + echo 'clean up the build folder' + if [ -d "./build" ] + then + find ./build ! -name '*.cbp' -type f -exec rm -f {} + + fi +fi + + +mkdir -p build +cd build + +echo 'build poi-manager-server' +if [ "$clean" = 1 ] +then + cmake $commonapi_tools_option -DWITH_DEBUG=$debug ../ +fi +make + + diff --git a/src/poi-service/poi-manager-server/poi-manager-server-stub.cpp b/src/poi-service/poi-manager-server/poi-manager-server-stub.cpp index 137cf9b..a4cfb39 100644 --- a/src/poi-service/poi-manager-server/poi-manager-server-stub.cpp +++ b/src/poi-service/poi-manager-server/poi-manager-server-stub.cpp @@ -1396,7 +1396,7 @@ void PoiManagerServerStub::removePOIs(const std::shared_ptr } } -void PoiManagerServerStub::poiSearchStarted(const std::shared_ptr _client, ::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, uint16_t _maxSize, ::org::genivi::navigation::NavigationTypes::Coordinate3D _location, std::vector< ::v0_1::org::genivi::navigation::poiservice::POIServiceTypes::CategoryAndRadius> _poiCategories, std::vector< ::v0_1::org::genivi::navigation::poiservice::POIServiceTypes::AttributeDetails> _poiAttributes, std::string _inputString, int32_t _sortOption, poiSearchStartedReply_t _reply) +void PoiManagerServerStub::poiSearchStarted(const std::shared_ptr _client, NavigationTypes::Handle _poiSearchHandle, uint16_t _maxSize, NavigationTypes::Coordinate3D _location, std::vector< POIServiceTypes::CategoryAndRadius> _poiCategories, std::vector< POIServiceTypes::AttributeDetails> _poiAttributes, std::string _inputString, int32_t _sortOption, poiSearchStartedReply_t _reply) { POIServiceTypes::CategoryAndRadius categoryAndRadius; size_t index; @@ -1443,7 +1443,7 @@ void PoiManagerServerStub::poiSearchStarted(const std::shared_ptr _client, ::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, poiSearchCanceledReply_t _reply) +void PoiManagerServerStub::poiSearchCanceled(const std::shared_ptr _client, NavigationTypes::Handle _poiSearchHandle, poiSearchCanceledReply_t _reply) { std::vector poiIDList; @@ -1454,12 +1454,12 @@ void PoiManagerServerStub::poiSearchCanceled(const std::shared_ptr _client, POIServiceTypes::ContentAccessModuleID _camId, ::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, std::vector< ::v0_1::org::genivi::navigation::poiservice::POIServiceTypes::AttributeID> _attributes, resultListRequestedReply_t _reply) +void PoiManagerServerStub::resultListRequested(const std::shared_ptr _client, POIServiceTypes::ContentAccessModuleID _camId, NavigationTypes::Handle _poiSearchHandle, std::vector< POIServiceTypes::AttributeID> _attributes, resultListRequestedReply_t _reply) { } -void PoiManagerServerStub::poiDetailsRequested(const std::shared_ptr _client, std::vector< ::v0_1::org::genivi::navigation::poiservice::POIServiceTypes::POI_ID> _source_id, poiDetailsRequestedReply_t _reply) +void PoiManagerServerStub::poiDetailsRequested(const std::shared_ptr _client, std::vector< POIServiceTypes::POI_ID> _source_id, poiDetailsRequestedReply_t _reply) { } diff --git a/src/poi-service/poi-manager-server/poi-manager-server-stub.h b/src/poi-service/poi-manager-server/poi-manager-server-stub.h index b835a40..1d3961b 100644 --- a/src/poi-service/poi-manager-server/poi-manager-server-stub.h +++ b/src/poi-service/poi-manager-server/poi-manager-server-stub.h @@ -29,10 +29,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "poi-common-database.h" @@ -41,9 +41,9 @@ #include "poi-common-math.h" using namespace std; -using namespace v0::org::genivi::navigation::poiservice; -using namespace org::genivi::navigation; -using namespace org::genivi; +using namespace v4::org::genivi::navigation::poiservice; +using namespace v4::org::genivi::navigation; +using namespace v4::org::genivi; class sqlRequest { @@ -203,10 +203,10 @@ public: void removeCategories(const std::shared_ptr _client, std::vector< CommonTypes::CategoryID> _categories, removeCategoriesReply_t _reply); void addPOIs(const std::shared_ptr _client, CommonTypes::CategoryID _unique_id, std::vector< POIServiceTypes::PoiAddedDetails> _poiList, addPOIsReply_t _reply); void removePOIs(const std::shared_ptr _client, std::vector< POIServiceTypes::POI_ID> _ids, removePOIsReply_t _reply); - void poiSearchStarted(const std::shared_ptr _client, ::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, uint16_t _maxSize, ::org::genivi::navigation::NavigationTypes::Coordinate3D _location, std::vector< ::v0_1::org::genivi::navigation::poiservice::POIServiceTypes::CategoryAndRadius> _poiCategories, std::vector< ::v0_1::org::genivi::navigation::poiservice::POIServiceTypes::AttributeDetails> _poiAttributes, std::string _inputString, int32_t _sortOption, poiSearchStartedReply_t _reply); - void poiSearchCanceled(const std::shared_ptr _client, ::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, poiSearchCanceledReply_t _reply); - void resultListRequested(const std::shared_ptr _client, POIServiceTypes::ContentAccessModuleID _camId, ::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, std::vector< ::v0_1::org::genivi::navigation::poiservice::POIServiceTypes::AttributeID> _attributes, resultListRequestedReply_t _reply); - void poiDetailsRequested(const std::shared_ptr _client, std::vector< ::v0_1::org::genivi::navigation::poiservice::POIServiceTypes::POI_ID> _source_id, poiDetailsRequestedReply_t _reply); + void poiSearchStarted(const std::shared_ptr _client, NavigationTypes::Handle _poiSearchHandle, uint16_t _maxSize, NavigationTypes::Coordinate3D _location, std::vector< POIServiceTypes::CategoryAndRadius> _poiCategories, std::vector< POIServiceTypes::AttributeDetails> _poiAttributes, std::string _inputString, int32_t _sortOption, poiSearchStartedReply_t _reply); + void poiSearchCanceled(const std::shared_ptr _client, NavigationTypes::Handle _poiSearchHandle, poiSearchCanceledReply_t _reply); + void resultListRequested(const std::shared_ptr _client, POIServiceTypes::ContentAccessModuleID _camId, NavigationTypes::Handle _poiSearchHandle, std::vector< POIServiceTypes::AttributeID> _attributes, resultListRequestedReply_t _reply); + void poiDetailsRequested(const std::shared_ptr _client, std::vector< POIServiceTypes::POI_ID> _source_id, poiDetailsRequestedReply_t _reply); void run(); diff --git a/src/poi-service/rebuild_all.sh b/src/poi-service/rebuild_all.sh deleted file mode 100755 index 5d4861e..0000000 --- a/src/poi-service/rebuild_all.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -debug="OFF" -franca="OFF" -dbus="ON" -commonapi_tools_option="" -clean=0 - -while getopts cdf opt -do - case $opt in - c) - clean=1 - ;; - d) - debug="ON" - ;; - f) - franca="ON" - dbus="OFF" - ;; - \?) - echo "Usage:" - echo "$0 [-cdf]" - echo "-c: Rebuild with clean" - echo "-d: Enable the debug messages" - echo "-f: Build using the Franca interfaces" - exit 1 - esac -done -set -e - -if [ "$franca" = "ON" ] -then - if [ ! $COMMONAPI_TOOL_DIR ] - then - echo 'Set the dir of the common api tools' - echo 'export COMMONAPI_TOOL_DIR=' - exit 1 - fi - - if [ ! $COMMONAPI_DBUS_TOOL_DIR ] - then - echo 'Set the dir of the common api dbus tools' - echo 'export COMMONAPI_DBUS_TOOL_DIR=' - exit 1 - fi - - if [ ! $DBUS_LIB_PATH ] - then - echo 'Set the dir of the patched dbus' - echo 'export DBUS_LIB_PATH=' - exit 1 - fi - - commonapi_tools_option="-DDBUS_LIB_PATH="$DBUS_LIB_PATH" -DCOMMONAPI_DBUS_TOOL_DIR="$COMMONAPI_DBUS_TOOL_DIR" -DCOMMONAPI_TOOL_DIR="$COMMONAPI_TOOL_DIR -fi - -if [ "$clean" = 1 ] -then - echo 'clean up the build folder' - if [ -d "./build" ] - then - find ./build ! -name '*.cbp' -type f -exec rm -f {} + - fi -fi - - -mkdir -p build -cd build - -echo 'build poi-server' -if [ "$clean" = 1 ] -then - cmake -DWITH_FRANCA_DBUS_INTERFACE=$franca -DWITH_DBUS_INTERFACE=$dbus $commonapi_tools_option -DWITH_DEBUG=$debug ../ -fi -make - - -- cgit v1.2.1