cleaned up building

diff --git a/packaging/wrt-plugins-ivi.spec b/packaging/wrt-plugins-ivi.spec
index 892ed73..80382ae 100644 (file)
--- a/packaging/wrt-plugins-ivi.spec
+++ b/packaging/wrt-plugins-ivi.spec
@@ -1,24 +1,24 @@
 Name:       wrt-plugins-ivi
 Summary:    JavaScript plugins for WebRuntime for IVI
-Version:    0.5.0
+Version:    0.6.0
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
 
-BuildRequires:  pkgconfig(capi-web-favorites)
-BuildRequires:  pkgconfig(libpcrecpp)
-BuildRequires:  pkgconfig(tapi)
-BuildRequires:  pkgconfig(network)
+#BuildRequires:  pkgconfig(capi-web-favorites)
+#BuildRequires:  pkgconfig(libpcrecpp)
+#BuildRequires:  pkgconfig(tapi)
+#BuildRequires:  pkgconfig(network)
 BuildRequires:  pkgconfig(ewebkit2)
 BuildRequires:  pkgconfig(dpl-efl)
 BuildRequires:  pkgconfig(dpl-event-efl)
-BuildRequires:  pkgconfig(wrt-plugins-types)
+#BuildRequires:  pkgconfig(wrt-plugins-types)
 BuildRequires:  pkgconfig(wrt-plugins-commons)
 BuildRequires:  pkgconfig(wrt-plugins-commons-javascript)
 BuildRequires:  wrt-plugins-tizen-devel
-BuildRequires:  pkgconfig(wrt-plugins-plugin-manager)
-BuildRequires:  pkgconfig(security-server)
+#BuildRequires:  pkgconfig(wrt-plugins-plugin-manager)
+#BuildRequires:  pkgconfig(security-server)
 BuildRequires:  dleyna
 BuildRequires:  expat-devel
 BuildRequires:  cmake
@@ -27,8 +27,6 @@ BuildRequires:  boost-devel
 BuildRequires:  boost-thread
 BuildRequires:  boost-system
 BuildRequires:  boost-filesystem
-BuildRequires:  pkgconfig(automotive-message-broker)
-BuildRequires:  libuuid-devel
 BuildRequires:  pkgconfig(json-glib-1.0)
 
 %description

diff --git a/pkgconfigs/wrt-plugins-tizen-speech.pc.in b/pkgconfigs/wrt-plugins-tizen-speech.pc.in
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/MediaServer/CMakeLists.txt b/src/MediaServer/CMakeLists.txt
index 1aa5596..5530051 100755 (executable)
--- a/src/MediaServer/CMakeLists.txt
+++ b/src/MediaServer/CMakeLists.txt
@@ -10,21 +10,10 @@ include(FindPkgConfig)
 
 PKG_CHECK_MODULES(amb REQUIRED gio-2.0 wrt-plugins-tizen-common)
 
-find_library(uuid_LIBRARY uuid DOC "Uuid libraries")
-find_path(uuid_INCLUDE_DIR uuid/uuid.h DOC "Libtool headers")
-
-if(uuid_LIBRARY)
-        message(STATUS "uuid found")
-else(uuid_LIBRARY)
-        message(FATAL_ERROR "uuid missing.  please install uuid-dev")
-endif(uuid_LIBRARY)
-
-
 
 INCLUDE_DIRECTORIES(
        ${INCLUDE_COMMON}
        ${amb_INCLUDE_DIRS}
-       ${uuid_INCLUDE_DIR}
 )
 
 SET(CMAKE_INSTALL_RPATH
@@ -52,7 +41,6 @@ ADD_LIBRARY(${TARGET_IMPL_NAME} SHARED ${SRCS_IMPL} ${SRCS_PROXY})
 TARGET_LINK_LIBRARIES(${TARGET_IMPL_NAME}
        ${LIBS_COMMON}
        ${amb_LIBRARIES}
-       ${uuid_LIBRARY}
        -L/usr/lib/wrt-plugins/tizen-tizen/
 )
 

diff --git a/src/Speech/CMakeLists.txt b/src/Speech/CMakeLists.txt
index 34b8fee..6ce8e23 100644 (file)
--- a/src/Speech/CMakeLists.txt
+++ b/src/Speech/CMakeLists.txt
@@ -10,21 +10,9 @@ include(FindPkgConfig)
 
 PKG_CHECK_MODULES(REQUIRED gio-2.0 wrt-plugins-tizen-common json-glib-1.0)
 
-find_library(uuid_LIBRARY uuid DOC "Uuid libraries")
-find_path(uuid_INCLUDE_DIR uuid/uuid.h DOC "Libtool headers")
-
-if(uuid_LIBRARY)
-        message(STATUS "uuid found")
-else(uuid_LIBRARY)
-        message(FATAL_ERROR "uuid missing.  please install uuid-dev")
-endif(uuid_LIBRARY)
-
-
-
 INCLUDE_DIRECTORIES(
        ${INCLUDE_COMMON}
        ${amb_INCLUDE_DIRS}
-       ${uuid_INCLUDE_DIR}
 )
 
 SET(CMAKE_INSTALL_RPATH
@@ -43,7 +31,6 @@ ADD_LIBRARY(${TARGET_IMPL_NAME} SHARED ${SRCS_IMPL})
 
 TARGET_LINK_LIBRARIES(${TARGET_IMPL_NAME}
        ${LIBS_COMMON}
-       ${uuid_LIBRARY}
        -L/usr/lib/wrt-plugins/tizen-tizen/
 )
 

diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt
index 8de5167..fb4af8b 100644 (file)
--- a/src/Vehicle/CMakeLists.txt
+++ b/src/Vehicle/CMakeLists.txt
@@ -8,23 +8,11 @@ add_definitions(-std=c++11)
 
 include(FindPkgConfig)
 
-PKG_CHECK_MODULES(amb REQUIRED automotive-message-broker gio-2.0 wrt-plugins-tizen-common json-glib-1.0)
-
-find_library(uuid_LIBRARY uuid DOC "Uuid libraries")
-find_path(uuid_INCLUDE_DIR uuid/uuid.h DOC "Libtool headers")
-
-if(uuid_LIBRARY)
-        message(STATUS "uuid found")
-else(uuid_LIBRARY)
-        message(FATAL_ERROR "uuid missing.  please install uuid-dev")
-endif(uuid_LIBRARY)
-
-
+PKG_CHECK_MODULES(amb REQUIRED gio-2.0 wrt-plugins-tizen-common json-glib-1.0)
 
 INCLUDE_DIRECTORIES(
        ${INCLUDE_COMMON}
        ${amb_INCLUDE_DIRS}
-       ${uuid_INCLUDE_DIR}
 )
 
 SET(CMAKE_INSTALL_RPATH
@@ -43,7 +31,6 @@ ADD_LIBRARY(${TARGET_IMPL_NAME} SHARED ${SRCS_IMPL})
 TARGET_LINK_LIBRARIES(${TARGET_IMPL_NAME}
        ${LIBS_COMMON}
        ${amb_LIBRARIES}
-       ${uuid_LIBRARY}
        -L/usr/lib/wrt-plugins/tizen-tizen/
 )
 

diff --git a/src/Vehicle/JSVehicle.cpp b/src/Vehicle/JSVehicle.cpp
index 1b4063e..cfc4f62 100644 (file)
--- a/src/Vehicle/JSVehicle.cpp
+++ b/src/Vehicle/JSVehicle.cpp
@@ -340,5 +340,29 @@ JSValueRef JSVehicle::set(JSContextRef context,
        return JSValueMakeUndefined(context);
 }
 
+JSValueRef JSVehicle::getHistory(JSContextRef context,
+                               JSObjectRef object,
+                               JSObjectRef thisObject,
+                               size_t argumentCount,
+                               const JSValueRef arguments[],
+                               JSValueRef* exception)
+{
+       LoggerD("Entered");
+       VehiclePrivObject* privateObject = static_cast<VehiclePrivObject*>(JSObjectGetPrivate(thisObject));
+       if (NULL == privateObject)
+       {
+               LoggerE("private object is null");
+               //return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+       }
+
+       VehiclePtr vehicle(privateObject->getObject());
+
+       ArgumentValidator validator(context, argumentCount, arguments);
+
+       std::string objectName = validator.toString(0);
+       
+       
+}
+
 }
 }

diff --git a/src/Vehicle/JSVehicle.h b/src/Vehicle/JSVehicle.h
index b12edbf..89d437a 100644 (file)
--- a/src/Vehicle/JSVehicle.h
+++ b/src/Vehicle/JSVehicle.h
@@ -66,6 +66,13 @@ private:
                                size_t argumentCount,
                                const JSValueRef arguments[],
                                JSValueRef* exception);
+       
+       static JSValueRef getHistory(JSContextRef context,
+                               JSObjectRef object,
+                               JSObjectRef thisObject,
+                               size_t argumentCount,
+                               const JSValueRef arguments[],
+                               JSValueRef* exception);
 
        /**
                 * This structure contains properties and callbacks that define a type of object.

diff --git a/src/Vehicle/Vehicle.cpp b/src/Vehicle/Vehicle.cpp
index c6e053f..4784035 100644 (file)
--- a/src/Vehicle/Vehicle.cpp
+++ b/src/Vehicle/Vehicle.cpp
@@ -367,7 +367,7 @@ GVariant* VehicleMaster::listObjects()
        
        GError *error = nullptr;
        
-       GVariant* supportedList = g_dbus_proxy_call_sync(managerProxy, "list", NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
+       GVariant* supportedList = g_dbus_proxy_call_sync(managerProxy, "List", NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
 
        if(error)
        {