diff options
author | <philippe colliot> | 2015-11-24 12:57:50 +0100 |
---|---|---|
committer | <philippe colliot> | 2015-11-24 12:57:50 +0100 |
commit | 4bd633ece3b3540a12405d23c9cc2651f85d9e2f (patch) | |
tree | fd13ab26617bd9ce29d7142600f23588f5e89cf4 | |
parent | 1c63b16f25c315e97185816320d445c3008181e5 (diff) | |
download | poi-service-4bd633ece3b3540a12405d23c9cc2651f85d9e2f.tar.gz |
Some updates and scripts added
36 files changed, 95 insertions, 53 deletions
diff --git a/api/franca/navigation/navigationcore/Guidance.fidl b/api/franca/navigation/navigationcore/Guidance.fidl index 9d39c38..9d39c38 100755..100644 --- a/api/franca/navigation/navigationcore/Guidance.fidl +++ b/api/franca/navigation/navigationcore/Guidance.fidl diff --git a/api/franca/navigation/navigationcore/GuidanceTypes.fidl b/api/franca/navigation/navigationcore/GuidanceTypes.fidl index be47331..be47331 100755..100644 --- a/api/franca/navigation/navigationcore/GuidanceTypes.fidl +++ b/api/franca/navigation/navigationcore/GuidanceTypes.fidl diff --git a/api/franca/navigation/navigationcore/LocationInputTypes.fidl b/api/franca/navigation/navigationcore/LocationInputTypes.fidl index 41c4e92..41c4e92 100755..100644 --- a/api/franca/navigation/navigationcore/LocationInputTypes.fidl +++ b/api/franca/navigation/navigationcore/LocationInputTypes.fidl diff --git a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl index b79e391..b79e391 100755..100644 --- a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl +++ b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl diff --git a/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl b/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl index a14215c..a14215c 100755..100644 --- a/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl +++ b/api/franca/navigation/navigationcore/MapMatchedPositionTypes.fidl diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl index 6caeedc..6caeedc 100755..100644 --- a/api/franca/navigation/navigationcore/Routing.fidl +++ b/api/franca/navigation/navigationcore/Routing.fidl diff --git a/api/franca/navigation/navigationcore/RoutingTypes.fidl b/api/franca/navigation/navigationcore/RoutingTypes.fidl index daa43b4..daa43b4 100755..100644 --- a/api/franca/navigation/navigationcore/RoutingTypes.fidl +++ b/api/franca/navigation/navigationcore/RoutingTypes.fidl diff --git a/api/franca/navigation/poiservice/ContentAccessModule.fidl b/api/franca/navigation/poiservice/ContentAccessModule.fidl index 0bbdfe1..0bbdfe1 100755..100644 --- a/api/franca/navigation/poiservice/ContentAccessModule.fidl +++ b/api/franca/navigation/poiservice/ContentAccessModule.fidl diff --git a/api/franca/navigation/poiservice/POIContentManager.fidl b/api/franca/navigation/poiservice/POIContentManager.fidl index 6e16736..6e16736 100755..100644 --- a/api/franca/navigation/poiservice/POIContentManager.fidl +++ b/api/franca/navigation/poiservice/POIContentManager.fidl diff --git a/api/franca/navigation/poiservice/ServiceContentAccess.fidl b/api/franca/navigation/poiservice/ServiceContentAccess.fidl index c5cbb12..c5cbb12 100755..100644 --- a/api/franca/navigation/poiservice/ServiceContentAccess.fidl +++ b/api/franca/navigation/poiservice/ServiceContentAccess.fidl diff --git a/api/generate_all.sh b/api/generate_all.sh index e446c5e..c1258c2 100755 --- a/api/generate_all.sh +++ b/api/generate_all.sh @@ -4,6 +4,8 @@ if [ ! $COMMON_API_ROOT_DIR ] then echo 'Set the root dir of the common api tools' echo 'export COMMON_API_ROOT_DIR=<path>' + echo 'COMMON_API_ROOT_DIR/common-api-dbus-tools' + echo 'COMMON_API_ROOT_DIR/common-api-tools' exit 1 fi @@ -14,5 +16,5 @@ mkdir build cd build echo 'generate all the templates for CommonAPI' -cmake -DCOMMONAPI_DBUS_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-dbus-tools/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/genivi/common-api-tools/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 ../franca/ +cmake -DCOMMONAPI_DBUS_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-dbus-tools/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-tools/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 ../franca/ diff --git a/api/map-viewer/genivi-mapviewer-configuration.xml b/api/map-viewer/genivi-mapviewer-configuration.xml index 39254bc..39254bc 100755..100644 --- a/api/map-viewer/genivi-mapviewer-configuration.xml +++ b/api/map-viewer/genivi-mapviewer-configuration.xml diff --git a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml index a41ce76..a41ce76 100755..100644 --- a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml +++ b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml diff --git a/api/map-viewer/genivi-mapviewer-session.xml b/api/map-viewer/genivi-mapviewer-session.xml index 2c74e29..2c74e29 100755..100644 --- a/api/map-viewer/genivi-mapviewer-session.xml +++ b/api/map-viewer/genivi-mapviewer-session.xml diff --git a/api/map-viewer/introspect.xsd b/api/map-viewer/introspect.xsd index 76ed7ef..76ed7ef 100755..100644 --- a/api/map-viewer/introspect.xsd +++ b/api/map-viewer/introspect.xsd diff --git a/api/navigation-core/genivi-navigationcore-configuration.xml b/api/navigation-core/genivi-navigationcore-configuration.xml index bb45f32..bb45f32 100755..100644 --- a/api/navigation-core/genivi-navigationcore-configuration.xml +++ b/api/navigation-core/genivi-navigationcore-configuration.xml diff --git a/api/navigation-core/genivi-navigationcore-constants.xml b/api/navigation-core/genivi-navigationcore-constants.xml index 6cee92d..6cee92d 100755..100644 --- a/api/navigation-core/genivi-navigationcore-constants.xml +++ b/api/navigation-core/genivi-navigationcore-constants.xml diff --git a/api/navigation-core/genivi-navigationcore-guidance.xml b/api/navigation-core/genivi-navigationcore-guidance.xml index e03fc45..e03fc45 100755..100644 --- a/api/navigation-core/genivi-navigationcore-guidance.xml +++ b/api/navigation-core/genivi-navigationcore-guidance.xml diff --git a/api/navigation-core/genivi-navigationcore-locationinput.xml b/api/navigation-core/genivi-navigationcore-locationinput.xml index ddecb39..ddecb39 100755..100644 --- a/api/navigation-core/genivi-navigationcore-locationinput.xml +++ b/api/navigation-core/genivi-navigationcore-locationinput.xml diff --git a/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml b/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml index 880d577..880d577 100755..100644 --- a/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml +++ b/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml diff --git a/api/navigation-core/genivi-navigationcore-routing.xml b/api/navigation-core/genivi-navigationcore-routing.xml index 74bfe80..74bfe80 100755..100644 --- a/api/navigation-core/genivi-navigationcore-routing.xml +++ b/api/navigation-core/genivi-navigationcore-routing.xml diff --git a/api/navigation-core/genivi-navigationcore-session.xml b/api/navigation-core/genivi-navigationcore-session.xml index 2d3da24..2d3da24 100755..100644 --- a/api/navigation-core/genivi-navigationcore-session.xml +++ b/api/navigation-core/genivi-navigationcore-session.xml diff --git a/api/navigation-core/introspect.xsd b/api/navigation-core/introspect.xsd index 76ed7ef..76ed7ef 100755..100644 --- a/api/navigation-core/introspect.xsd +++ b/api/navigation-core/introspect.xsd diff --git a/api/poi-service/introspect.xsd b/api/poi-service/introspect.xsd index 76ed7ef..76ed7ef 100755..100644 --- a/api/poi-service/introspect.xsd +++ b/api/poi-service/introspect.xsd diff --git a/api/traffic-incidents-service/introspect.xsl b/api/traffic-incidents-service/introspect.xsl index 29cc34c..29cc34c 100755..100644 --- a/api/traffic-incidents-service/introspect.xsl +++ b/api/traffic-incidents-service/introspect.xsl diff --git a/api/traffic-incidents-service/org.genivi.trafficincidentsservice.trafficincidentfeed.xml b/api/traffic-incidents-service/org.genivi.trafficincidentsservice.trafficincidentfeed.xml index 31ce4b6..31ce4b6 100755..100644 --- a/api/traffic-incidents-service/org.genivi.trafficincidentsservice.trafficincidentfeed.xml +++ b/api/traffic-incidents-service/org.genivi.trafficincidentsservice.trafficincidentfeed.xml diff --git a/api/traffic-incidents-service/org.genivi.trafficincidentsservice.trafficincidents.xml b/api/traffic-incidents-service/org.genivi.trafficincidentsservice.trafficincidents.xml index 655336f..655336f 100755..100644 --- a/api/traffic-incidents-service/org.genivi.trafficincidentsservice.trafficincidents.xml +++ b/api/traffic-incidents-service/org.genivi.trafficincidentsservice.trafficincidents.xml diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt index ea3666d..5751e99 100644 --- a/src/navigation/CMakeLists.txt +++ b/src/navigation/CMakeLists.txt @@ -19,7 +19,7 @@ project(navigation) cmake_minimum_required(VERSION 2.8) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") -option(WITH_FRANCA_INTERFACE +option(WITH_FRANCA_DBUS_INTERFACE "Build using the Franca interfaces" OFF) option(WITH_DBUS_INTERFACE "Build using the D-Bus interfaces" ON) @@ -36,7 +36,7 @@ option(NAVIT_NULL_VEHICLE option(NAVIT_QTPAINTER "qtqpainter for navit" 0) -message(STATUS "WITH_FRANCA_INTERFACE = ${WITH_FRANCA_INTERFACE}") +message(STATUS "WITH_FRANCA_DBUS_INTERFACE = ${WITH_FRANCA_DBUS_INTERFACE}") message(STATUS "WITH_DBUS_INTERFACE = ${WITH_DBUS_INTERFACE}") message(STATUS "WITH_DEBUG = ${WITH_DEBUG}") message(STATUS "YOCTO_CONFIG = ${YOCTO_CONFIG}") diff --git a/src/poi-service/CMakeLists.txt b/src/poi-service/CMakeLists.txt index d36eca8..dcb7f2b 100644 --- a/src/poi-service/CMakeLists.txt +++ b/src/poi-service/CMakeLists.txt @@ -20,14 +20,14 @@ cmake_minimum_required(VERSION 2.8) message(STATUS ${PROJECT_NAME}) -option(WITH_FRANCA_INTERFACE +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_INTERFACE = ${WITH_FRANCA_INTERFACE}") +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 +46,7 @@ add_subdirectory(${API_DIR}/poi-service "${DBUS_GENERATED_INCLUDE_DIR}/poi-servi add_subdirectory(poi-server) -if (WITH_FRANCA_INTERFACE) +if (WITH_FRANCA_DBUS_INTERFACE) set(FRANCA_DIR "${API_DIR}/franca/navigation") add_subdirectory(poi-manager-server) endif() diff --git a/src/poi-service/README b/src/poi-service/README index cf1b54b..41f347d 100644 --- a/src/poi-service/README +++ b/src/poi-service/README @@ -56,18 +56,35 @@ How To Build poi-manager-server =============================== NB: You need CommonAPI 3.1.2 and Franca 0.9.1 installed -============= -If the CommonAPI stuff has been generated into /usr/local/ -Check if the links are well set into /usr/local/lib -if not do it yourself -cd /usr/local/lib -rm libCommonAPI-DBus.so.3 -rm libCommonAPI.so.3 -ln -s libCommonAPI-DBus.so.3.1.2 libCommonAPI-DBus.so.3 -ln -s libCommonAPI.so.3.1.2 libCommonAPI.so.3 +You need to pass as parameter to the cmake the link to your patched dbus library (required by CommonAPI) + +NB: For the 64 bits version, replace 'x86' with 'x86_64' in the command below: + +cd build +cmake -DWITH_FRANCA_DBUS_INTERFACE=ON -DDBUS_LIB_PATH=yourPath -DCOMMONAPI_DBUS_TOOL_GENERATOR=<common-api-dbus-tools folder>/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=<common-api-tools folder>/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 -DWITH_DEBUG=ON ../ +make +cd .. + +=============================== +How To Run poi-manager-server +=============================== + +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=<your path>/commonapi-dbus.ini + +cp ./resource/poi-database-managed.db ./bin +./bin/poi-manager-server -f ./bin/poi-database-managed.db -The folder /usr/local/include/CommonAPI-3.1/CommonAPI must contain 3.1.2 include files +=============================== +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/) ============= In case the .pc are not well generated, please add these files to /usr/local/lib/pkgconfig @@ -100,27 +117,3 @@ Libs: -L${libdir} -Wl,--no-as-needed -lCommonAPI-DBus -Wl,--as-needed Cflags: -I${includedir}/CommonAPI-3.1 ============= -You need to pass as parameter to the cmake the link to your patched dbus library (required by CommonAPI) - -NB: For the 64 bits version, replace 'x86' with 'x86_64' in the command below: - -cd build -cmake -DWITH_FRANCA_INTERFACE=ON -DDBUS_LIB_PATH=yourPath -DCOMMONAPI_DBUS_TOOL_GENERATOR=<common-api-dbus-tools folder>/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=<common-api-tools folder>/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 -DWITH_DEBUG=ON ../ -make -cd .. - -=============================== -How To Run poi-manager-server -=============================== - -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=<your path>/commonapi-dbus.ini - -cp ./resource/poi-database-managed.db ./bin -./bin/poi-manager-server -f ./bin/poi-database-managed.db - - diff --git a/src/poi-service/poi-manager-server/CMakeLists.txt b/src/poi-service/poi-manager-server/CMakeLists.txt index 26de5a1..8a86f4c 100644 --- a/src/poi-service/poi-manager-server/CMakeLists.txt +++ b/src/poi-service/poi-manager-server/CMakeLists.txt @@ -18,22 +18,21 @@ project(poi-manager-server) message(STATUS ${PROJECT_NAME}) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") +set(CMAKE_VERBOSE_MAKEFILE on) +set(CMAKE_CXX_FLAGS "-Wall -std=c++0x") set(PARENT_API poiservice) set(ROOT_API navigation) set(API_VERSION_MAJOR 0) set(API_VERSION_MINOR 1) set(API_VERSION "v${API_VERSION_MAJOR}_${API_VERSION_MINOR}") -set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/franca-gen") +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_POISERVICE_TYPES_PATH ${COMMONAPI_GEN_DIR}/v1_0/org/genivi/${ROOT_API}/${PARENT_API}) set(DBUS_LIB_PATH "/usr/local/lib") -set(CMAKE_VERBOSE_MAKEFILE off) - # DBus Path if (DBUS_LIB_PATH) message(STATUS "DBUS_LIB_PATH = " ${DBUS_LIB_PATH}) diff --git a/src/poi-service/rebuild_all.sh b/src/poi-service/rebuild_all.sh new file mode 100755 index 0000000..b927def --- /dev/null +++ b/src/poi-service/rebuild_all.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ ! $COMMON_API_ROOT_DIR ] +then + echo 'Set the root dir of the common api tools' + echo 'You are supposed to build common-api-dbus-tools and common-api-tools under the same root dir' + echo 'export COMMON_API_ROOT_DIR=<path>' + exit 1 +fi + +echo 'delete the build folder' +rm -rf build + +mkdir build +cd build + +echo 'build with CommonAPI' +cmake -DWITH_FRANCA_DBUS_INTERFACE=ON -DWITH_DBUS_INTERFACE=OFF -DCOMMONAPI_DBUS_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-dbus-tools/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-tools/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 -DWITH_DEBUG=ON . ../ + +make + + diff --git a/test/poi-service/CMakeLists.txt b/test/poi-service/CMakeLists.txt index a664a34..c77a9d6 100644 --- a/test/poi-service/CMakeLists.txt +++ b/test/poi-service/CMakeLists.txt @@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 2.8) message(STATUS ${PROJECT_NAME}) -option(WITH_FRANCA_INTERFACE +option(WITH_FRANCA_DBUS_INTERFACE "Build using the Franca interfaces" OFF) option(WITH_DBUS_INTERFACE "Build using the D-Bus interfaces" ON) @@ -29,7 +29,7 @@ option(WITH_DEBUG option(WITH_DATABASE_SUPPLIER "Build the database supplier" OFF) -message(STATUS "WITH_FRANCA_INTERFACE = ${WITH_FRANCA_INTERFACE}") +message(STATUS "WITH_FRANCA_DBUS_INTERFACE = ${WITH_FRANCA_DBUS_INTERFACE}") message(STATUS "WITH_DBUS_INTERFACE = ${WITH_DBUS_INTERFACE}") message(STATUS "WITH_DEBUG = ${WITH_DEBUG}") message(STATUS "WITH_DATABASE_SUPPLIER = ${WITH_DATABASE_SUPPLIER}") @@ -63,7 +63,7 @@ add_subdirectory(poi-client) add_subdirectory(poi-contentaccess-module) -if(WITH_FRANCA_INTERFACE) +if(WITH_FRANCA_DBUS_INTERFACE) set(FRANCA_DIR "${API_DIR}/franca/navigation") add_subdirectory(poi-manager-client) endif() diff --git a/test/poi-service/README b/test/poi-service/README index 184b05c..026bb3c 100644 --- a/test/poi-service/README +++ b/test/poi-service/README @@ -1,4 +1,4 @@ -Release date of the file: 18-11-2015 +Release date of the file: 24-11-2015 Status: OK Project: @@ -121,7 +121,7 @@ cd build NB: For the 64 bits version, replace 'x86' with 'x86_64' in the command below: -cmake -DWITH_FRANCA_INTERFACE=ON -DCOMMONAPI_DBUS_TOOL_GENERATOR=<common-api-dbus-tools folder>/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=<common-api-tools folder>/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 -DWITH_DEBUG=ON . ../ +cmake -DWITH_FRANCA_DBUS_INTERFACE=ON -DCOMMONAPI_DBUS_TOOL_GENERATOR=<common-api-dbus-tools folder>/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=<common-api-tools folder>/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 -DWITH_DEBUG=ON . ../ make diff --git a/test/poi-service/poi-manager-client/CMakeLists.txt b/test/poi-service/poi-manager-client/CMakeLists.txt index a5d847c..ba00c2f 100644 --- a/test/poi-service/poi-manager-client/CMakeLists.txt +++ b/test/poi-service/poi-manager-client/CMakeLists.txt @@ -18,22 +18,21 @@ project(poi-manager-client) message(STATUS ${PROJECT_NAME}) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") +set(CMAKE_VERBOSE_MAKEFILE on) +set(CMAKE_CXX_FLAGS "-Wall -std=c++0x") set(PARENT_API poiservice) set(ROOT_API navigation) set(API_VERSION_MAJOR 0) set(API_VERSION_MINOR 1) set(API_VERSION "v${API_VERSION_MAJOR}_${API_VERSION_MINOR}") -set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/franca-gen") +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_POISERVICE_TYPES_PATH ${COMMONAPI_GEN_DIR}/v1_0/org/genivi/${ROOT_API}/${PARENT_API}) set(DBUS_LIB_PATH "/usr/local/lib") -set(CMAKE_VERBOSE_MAKEFILE off) - # DBus Path if (DBUS_LIB_PATH) message(STATUS "DBUS_LIB_PATH = " ${DBUS_LIB_PATH}) diff --git a/test/poi-service/rebuild_all.sh b/test/poi-service/rebuild_all.sh new file mode 100755 index 0000000..0ed9518 --- /dev/null +++ b/test/poi-service/rebuild_all.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +if [ ! $COMMON_API_ROOT_DIR ] +then + echo 'Set the root dir of the common api tools' + echo 'You are supposed to build common-api-dbus-tools and common-api-tools under the same root dir' + echo 'export COMMON_API_ROOT_DIR=<path>' + exit 1 +fi + +echo 'build the poi server' +cd ../../src/poi-service +./rebuild_all.sh +cd ../../test/poi-service + +echo 'build the poi client' + +echo 'delete the build folder' +rm -rf build +mkdir build +cd build + +echo 'build with CommonAPI' +cmake -DWITH_FRANCA_DBUS_INTERFACE=ON -DWITH_DATABASE_SUPPLIER=ON -DCOMMONAPI_DBUS_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-dbus-tools/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-tools/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 -DWITH_DEBUG=ON . ../ + +make + |