From 810baf5d8672d1afde7e89ad91e9d9b3c97b4d4b Mon Sep 17 00:00:00 2001 From: Hayato Nakamura Date: Thu, 19 Sep 2013 20:19:57 +0900 Subject: [PATCH] Support for ico-uxf-utilities-0.2.04 Change-Id: Ifba59243662f2d1cd579a14811e8104e2c95baf0 Signed-off-by: Hayato Nakamura --- packaging/ico-vic-amb-plugin.changes | 4 ++++ packaging/ico-vic-amb-plugin.spec | 2 +- src/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 4 ++-- tool/CMakeLists.txt | 2 +- tool/ico_set_vehicleinfo.c | 2 ++ 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packaging/ico-vic-amb-plugin.changes b/packaging/ico-vic-amb-plugin.changes index 3bbf445..44a94ca 100644 --- a/packaging/ico-vic-amb-plugin.changes +++ b/packaging/ico-vic-amb-plugin.changes @@ -1,3 +1,7 @@ +* Thu Sep 19 2013 Shibata Makoto accepted/tizen/20130910.205130@cf82076 +- 0.9.02 release. +-- Support for ico-uxf-utilities-0.2.04. + * Tue Sep 17 2013 Kevron Rees - Install ico_set_vehicleinfo to /usr/bin instead of /usr/local/bin diff --git a/packaging/ico-vic-amb-plugin.spec b/packaging/ico-vic-amb-plugin.spec index 1faf169..8e5b106 100644 --- a/packaging/ico-vic-amb-plugin.spec +++ b/packaging/ico-vic-amb-plugin.spec @@ -1,6 +1,6 @@ Name: ico-vic-amb-plugin Summary: Automotive Message Broker is a vehicle network abstraction system. -Version: 0.9.0 +Version: 0.9.2 Release: 1.1 Group: System Environment/Daemons License: LGPL v2.1 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1cb067f..61c8d77 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,7 +6,7 @@ set(vehicleplugin_headers common.h abstractconfig.h ambconfig.h convert.h standa set(vehicleplugin_sources abstractconfig.cc ambconfig.cc convert.cc standardmessage.cc eventmessage.cc datamessage.cc mwinterface.cc controlwebsocket.cc viccommunicator.cc ambinterface.cc) add_library(vehicleplugin MODULE ${vehicleplugin_sources}) set_target_properties(vehicleplugin PROPERTIES PREFIX "") -target_link_libraries(vehicleplugin amb websockets -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} -lico-util-com) +target_link_libraries(vehicleplugin amb websockets -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} -lico-util) install(TARGETS vehicleplugin LIBRARY DESTINATION lib/automotive-message-broker) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3fee0b3..37e1738 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -4,8 +4,8 @@ include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs} ${gio_INCLUDE_DIRS} set(testVehiclePluginMW_sources ../src/abstractconfig.cc ../src/ambconfig.cc ../src/standardmessage.cc ../src/eventmessage.cc ../src/datamessage.cc controlwebsocketclient.cc scenarioengine.cc mwscenario.cc) add_executable(testVehiclePluginMW ${testVehiclePluginMW_sources}) -target_link_libraries(testVehiclePluginMW amb pthread websockets -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${gio_LIBRARIES} ${gio-unix_LIBRARIES} -lico-util-com) +target_link_libraries(testVehiclePluginMW amb pthread websockets -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${gio_LIBRARIES} ${gio-unix_LIBRARIES} -lico-util) set(testVehiclePluginWSApp_sources ../src/abstractconfig.cc ../src/ambconfig.cc ../src/standardmessage.cc ../src/eventmessage.cc ../src/datamessage.cc configamb.cc standardjsonmessage.cc controlwebsocketclient.cc controlwebsocketclientapp.cc scenarioengine.cc websocketscenario.cc) add_executable(testVehiclePluginWSApp ${testVehiclePluginWSApp_sources}) -target_link_libraries(testVehiclePluginWSApp amb pthread websockets -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${gio_LIBRARIES} ${gio-unix_LIBRARIES} -lico-util-com) +target_link_libraries(testVehiclePluginWSApp amb pthread websockets -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${gio_LIBRARIES} ${gio-unix_LIBRARIES} -lico-util) diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt index b6e9539..b885335 100644 --- a/tool/CMakeLists.txt +++ b/tool/CMakeLists.txt @@ -3,4 +3,4 @@ include(CheckIncludeFiles) set(ico_set_vehicleinfo_sources ico_set_vehicleinfo.c) include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs} /usr/include/ico-util) add_executable(ico_set_vehicleinfo ${ico_set_vehicleinfo_sources}) -target_link_libraries(ico_set_vehicleinfo websockets -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} -lico-util-com) +target_link_libraries(ico_set_vehicleinfo websockets -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} -lico-util) diff --git a/tool/ico_set_vehicleinfo.c b/tool/ico_set_vehicleinfo.c index 16f0c91..711b280 100644 --- a/tool/ico_set_vehicleinfo.c +++ b/tool/ico_set_vehicleinfo.c @@ -64,6 +64,8 @@ static const struct { { "lightStatus", "LIGHTSTATUS", {TYPE_BOOL, TYPE_BOOL, TYPE_BOOL, TYPE_BOOL} }, { "light", "LIGHTSTATUS", {TYPE_BOOL, TYPE_BOOL, TYPE_BOOL, TYPE_BOOL} }, { "WATER_TEMP", "WATER_TEMP", {TYPE_INT32, TYPE_NULL, 0, 0} }, + { "EXTERIORBRIGHTNESS", "EXTERIORBRIGHTNESS", {TYPE_UINT16, TYPE_NULL, 0, 0} }, + { "EXTERIOR", "EXTERIORBRIGHTNESS", {TYPE_UINT16, TYPE_NULL, 0, 0} }, { "\0", "\0", {TYPE_NULL, 0,0,0} } }; struct KeyDataMsg_t -- 2.7.4