Add a program to get vc engine app id

Change-Id: Ib2a0c901a9034e9fe1c942749ca69500cc9512ab
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>
(cherry picked from commit b5bfc019092b25ed8845ae5b97d8b9d2962c2da5)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8819be3..22994bb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,9 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "${PREFIX}")
 SET(VERSION 0.2.10)
 
+FIND_PROGRAM(UNAME NAMES uname)
+EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
+
 ADD_DEFINITIONS("-DVOICE_LIBDIR=\"${LIBDIR}\"")
 ADD_DEFINITIONS("-Werror")
 
@@ -71,3 +74,16 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/vc-config.xml DESTINATION ${TZ_SYS_RO_SHARE}/v
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.vcserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/services)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/vc-server.conf DESTINATION /etc/dbus-1/session.d)
+
+## vc_getengine ##
+IF("${ARCH}" MATCHES "^arm.*")
+INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/armv7l/vc_getengine DESTINATION ${TZ_SYS_BIN})
+ELSEIF("${ARCH}" MATCHES "^i586.*")
+INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/i586/vc_getengine DESTINATION ${TZ_SYS_BIN})
+ELSEIF("${ARCH}" MATCHES "^i686.*")
+INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/i586/vc_getengine DESTINATION ${TZ_SYS_BIN})
+ELSEIF("${ARCH}" MATCHES "^aarch64.*")
+INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/aarch64/vc_getengine DESTINATION ${TZ_SYS_BIN})
+ELSEIF("${ARCH}" MATCHES "^x86_64.*")
+INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/x86_64/vc_getengine DESTINATION ${TZ_SYS_BIN})
+ENDIF()

diff --git a/bin/aarch64/vc_getengine b/bin/aarch64/vc_getengine
new file mode 100755 (executable)
index 0000000..126ccd9
Binary files /dev/null and b/bin/aarch64/vc_getengine differ

diff --git a/bin/armv7l/vc_getengine b/bin/armv7l/vc_getengine
new file mode 100755 (executable)
index 0000000..570f0cd
Binary files /dev/null and b/bin/armv7l/vc_getengine differ

diff --git a/bin/i586/vc_getengine b/bin/i586/vc_getengine
new file mode 100755 (executable)
index 0000000..35926fa
Binary files /dev/null and b/bin/i586/vc_getengine differ

diff --git a/bin/x86_64/vc_getengine b/bin/x86_64/vc_getengine
new file mode 100755 (executable)
index 0000000..5adce35
Binary files /dev/null and b/bin/x86_64/vc_getengine differ

diff --git a/org.tizen.voice.vcserver.service b/org.tizen.voice.vcserver.service
index c5006a2..aa51fd1 100644 (file)
--- a/org.tizen.voice.vcserver.service
+++ b/org.tizen.voice.vcserver.service
@@ -1,4 +1,5 @@
 [D-BUS Service]
 Name=org.tizen.voice.vcserver
 #Exec=/usr/bin/vc-daemon
-Exec=/bin/sh -c "launch_app org.tizen.vc-engine-default"
+#Exec=/bin/sh -c "launch_app org.tizen.vc-engine-default"
+Exec=/bin/sh -c "vc_getengine get system db/voice/vc/engine/default | awk '{print$5}' | xargs -t -i launch_app {}"

diff --git a/packaging/voice-control.spec b/packaging/voice-control.spec
index 6d0cc6d..908a6b2 100644 (file)
--- a/packaging/voice-control.spec
+++ b/packaging/voice-control.spec
@@ -9,7 +9,7 @@ Source1001: %{name}.manifest
 Source1002: %{name}-devel.manifest
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-
+Requires:  gawk
 BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(capi-appfw-app-control)
 BuildRequires:  pkgconfig(capi-appfw-app-manager)
@@ -96,11 +96,11 @@ cp %{SOURCE1001} %{SOURCE1002} .
 %build
 %if "%{tizen_profile_name}" == "tv"
 export CFLAGS="$CFLAGS -DTV_PRODUCT"
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
-        -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -D_TV_PRODUCT=TRUE
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DBINDIR=%{_bindir} -DINCLUDEDIR=%{_includedir} \
+        -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -D_TV_PRODUCT=TRUE -DTZ_SYS_BIN=%TZ_SYS_BIN
 %else
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
-        -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DBINDIR=%{_bindir} -DINCLUDEDIR=%{_includedir} \
+        -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -DTZ_SYS_BIN=%TZ_SYS_BIN
 %endif
 make %{?jobs:-j%jobs}
 
@@ -129,6 +129,7 @@ mkdir -p %{_libdir}/voice/vc
 %{_libdir}/libvc_widget.so
 %{_libdir}/libvc_manager.so
 %{_libdir}/libvc_engine.so
+%{_bindir}/vc_getengine
 %{TZ_SYS_RO_SHARE}/voice/vc/1.0/vc-config.xml
 %{TZ_SYS_RO_SHARE}/dbus-1/services/org.tizen.voice*
 %{TZ_SYS_RO_ETC}/package-manager/parserlib/metadata/libvc-engine-parser.so*